From 7c515e10fcdffcff295a04533b5789a373aee59d Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 02 八月 2023 17:50:26 +0800
Subject: [PATCH] 1

---
 src/views/datamanage/uploadmanage.vue |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index 0aac1da..0e93057 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -288,6 +288,7 @@
             key="7"
           />
           <el-table-column
+            v-if="active == 'first'"
             prop="verName"
             :label="$t('dataManage.vmobj.versionNumber')"
             align="center"
@@ -319,6 +320,7 @@
             align="center"
             key="12"
           />
+
           <el-table-column
             v-if="active == 'first'"
             prop="createTime"
@@ -331,6 +333,20 @@
 
             </template>
           </el-table-column>
+          <el-table-column
+            prop="updateName"
+            :label="$t('dataManage.vmobj.updateonuser')"
+            align="center"
+            key="14"
+          />
+          <el-table-column
+            prop="updateTime"
+            :label="$t('dataManage.vmobj.updateontime')"
+            :formatter="formatData"
+            align="center"
+            key="15"
+          />
+
           <el-table-column
             min-width="150"
             :label="$t('common.operate')"
@@ -893,7 +909,7 @@
       <div
         v-loading="true"
         element-loading-background="rgba(0, 0, 0, 0.0) "
-        element-loading-text="鏁版嵁鍙戝竷涓�"
+        :element-loading-text="loadingText"
         style="margin: 0px 20px;widht:100%;height:calc(100% - 80px); "
       >
       </div>
@@ -1056,6 +1072,7 @@
       },
       stridOption: [],
       osgbLasOption: [],
+      loadingText: '鏁版嵁鍙戝竷涓�'
     }
   },
   methods: {
@@ -1109,6 +1126,7 @@
         srids: srids,
         zx: zs
       }
+      this.loadingText = '鏁版嵁鍙戝竷涓�';
       this.loadDialogVisible = true
       this.setOsgbCanel();
       const data = await publish_insert(obj);
@@ -1162,6 +1180,7 @@
         models: models
 
       }
+      this.loadingText = '鏁版嵁鍙戝竷涓�';
       this.loadDialogVisible = true
       this.insertModelVisible = false;
 
@@ -1201,7 +1220,9 @@
       this.options = std;
     },
     setloadDialogVisible() {
-      this.loadDialogVisible = false
+
+      this.loadDialogVisible = false;
+      this.loadingText = '鏁版嵁鍙戝竷涓�';
     },
     setinsertLayerCancel() {
       this.insertDialogVisible = false;
@@ -1252,6 +1273,7 @@
         type: this.formInline.type,
         noData: this.insertLayer.noData
       }
+      this.loadingText = '鏁版嵁鍙戝竷涓�';
       this.loadDialogVisible = true
       this.insertDialogVisible = false;
 
@@ -1346,7 +1368,7 @@
           ids: std,
           type: this.formInline.type
         }
-
+        this.loadingText = '鏁版嵁鍙戝竷涓�';
         this.loadDialogVisible = true
         this.insertDialogVisible = false;
 
@@ -1435,6 +1457,7 @@
         var that = this
         this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?')
           .then(_ => {
+
             that.deletePage()
           })
           .catch(_ => {
@@ -1443,6 +1466,8 @@
       }
     },
     async deletePage() {
+      this.loadingText = '鏁版嵁鍒犻櫎涓�';
+      this.loadDialogVisible = true;
       var std = [];
       for (var i in this.multipleSelection) {
         std.push(this.multipleSelection[i].id);
@@ -1458,6 +1483,7 @@
         });
         this.getTableData();
       }
+      this.loadDialogVisible = false;
     },
     //棰勮寮圭獥鎵撳紑
     setPreviewLayer(res) {

--
Gitblit v1.9.3