Browse Source

应用参数调整

wu 3 weeks ago
parent
commit
68fe4495aa
2 changed files with 15 additions and 5 deletions
  1. 1 1
      src/views/basic/dynamicModel/list/Form.vue
  2. 14 4
      src/views/basic/previewApp/index.vue

+ 1 - 1
src/views/basic/dynamicModel/list/Form.vue

@@ -675,7 +675,7 @@ export default {
       })
       //获取提交数据时 查询存在于子表数据集合的key 将主子表数据区分开
       for (const key in data) {
-        if (this.secondaryDbLinkIdList.includes(key) && Array.isArray(data[key])) {
+        if ((this.secondaryDbLinkIdList.includes(key) || this.secondaryDbLinkIdList.includes(Number(key))) && Array.isArray(data[key])) {
           foreignObj[key] = data[key]
         } else {
           primaryObj[key] = data[key]

+ 14 - 4
src/views/basic/previewApp/index.vue

@@ -36,7 +36,7 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="form" icon="el-icon-s-order">新建表单</el-dropdown-item>
               <el-dropdown-item command="group" icon="el-icon-folder-opened">新建分组</el-dropdown-item>
-              <el-dropdown-item command="task" icon="el-icon-s-flag">复制日志</el-dropdown-item>
+              <el-dropdown-item command="task" icon="el-icon-s-flag">操作日志</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -160,11 +160,11 @@
   </span>
     </el-dialog>
     <!--  查询日志-->
-    <el-dialog title="复制日志" :visible.sync="taskDialogVisible" width="800px" append-to-body>
+    <el-dialog title="操作日志" :visible.sync="taskDialogVisible" width="800px" append-to-body>
       <el-table size="mini" :data="taskList" border style="width: 100%"  height="500">
         <el-table-column prop="taskName" label="任务名称"></el-table-column>
-        <el-table-column prop="appName" label="目标应用"></el-table-column>
-        <el-table-column prop="targetAppName" label="复制表单"></el-table-column>
+        <el-table-column prop="appName" label="应用名称"></el-table-column>
+        <el-table-column prop="targetAppName" label="目标应用"></el-table-column>
         <el-table-column label="数据库状态">
           <template slot-scope="scope">
             <span>{{ scope.row.dbResult === null ? '正在复制' : scope.row.dbResult === 0 ? '成功' : '失败' }}</span>
@@ -185,6 +185,16 @@
             <span>{{ scope.row.fromResult === null ? '正在复制' : scope.row.fromResult === 0 ? '成功' : '失败' }}</span>
           </template>
         </el-table-column>
+        <el-table-column property="execSql" label="错误日志">
+          <template slot-scope="scope">
+            <span v-if="scope.row.errorInfo">
+              <span v-if="scope.row.errorInfo.length < 40"> {{ scope.row.errorInfo }} </span>
+              <el-popover v-else placement="top-start" title="错误日志" width="600" trigger="click" :content="scope.row.errorInfo">
+               <div class="eventLog" slot="reference">{{ scope.row.errorInfo.slice(0, 20) }}...</div>
+              </el-popover>
+            </span>
+          </template>
+        </el-table-column>
       </el-table>
     </el-dialog>