Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/relateTable/index.vue

@@ -1080,7 +1080,6 @@ export default {
             orderByColumn: this.tableItemForm.orderByColumn,
             timeFormate: this.tableItemForm.timeFormate,
             primaryKey: this.tableItemForm.selectFields,
-            rowId: this.tableItemForm.rowId,
             tId: this.tId,
             tableKey: tableKey,
             sortOrder: this.tableItemForm.isAsc,
@@ -1385,7 +1384,8 @@ export default {
               };
               console.log(this.addDragData);
               // return;
-              this.addDragData.forEach((item, index) => {
+              // this.addDragData.forEach((item, index) => {
+              this.tableDataList.forEach((item, index) => {
                 item.menuId = result.data;
                 // item.sqlKey = tableKeyObj.tableKey
                 let echo = JSON.parse(item.echoData);
@@ -1402,7 +1402,8 @@ export default {
               data.groupName = this.groupForm.groupName;
               data.groupDescription = this.groupForm.groupDescription;
               data.groupTableInfo = JSON.stringify(data.groupTableInfo);
-              data.dragTables = this.addDragData;
+              // data.dragTables = this.addDragData;
+              data.dragTables = this.tableDataList;
 
               // 添加表格组
               let res = await addGroup(data);
@@ -1427,7 +1428,8 @@ export default {
               dragTables: [],
               id: this.groupId,
             };
-            this.addDragData.forEach((item, index) => {
+            // this.addDragData.forEach((item, index) => {
+            this.tableDataList.forEach((item, index) => {
               // item.sqlKey = tableKeyObj.tableKey
               let echo = JSON.parse(item.echoData);
               // echo.formData = this.groupForm
@@ -1443,7 +1445,8 @@ export default {
             data.groupName = this.groupForm.groupName;
             data.groupDescription = this.groupForm.groupDescription;
             data.groupTableInfo = JSON.stringify(data.groupTableInfo);
-            data.dragTables = this.addDragData;
+            // data.dragTables = this.addDragData;
+            data.dragTables = this.tableDataList;
             console.log(data);
             let res = await updataGroup(data);
 

zkqy-ui/src/views/system/engineeringManage/index.vue

@@ -112,13 +112,11 @@
       <!-- <el-table-column label="工程key" align="center" prop="engineeringKey" /> -->
       <el-table-column label="工程名称" align="center" prop="engineeringName" />
       <!-- <el-table-column label="下载次数" align="center" prop="downloadNumber" /> -->
-      <el-table-column
-        label="下载时间"
-        align="center"
-        prop="downloadTime"
-      >
+      <el-table-column label="下载时间" align="center" prop="downloadTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.downloadTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+          <span>{{
+            parseTime(scope.row.downloadTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
@@ -310,6 +308,7 @@ export default {
             navigator.msSaveBlob(blob, fileName);
             this.loading = false;
           }
+          this.getList();
         }
       });
     },