From 035ae011994018a6ab7774836d31e49dcd362f57 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 12 六月 2023 15:54:12 +0800
Subject: [PATCH] 发布管理,添加模型发布类型;发布管理界面优化;目录管理上传文件改为上传目录,目录下载改为文件夹下载,默认选中最后一个菜单节点;钻孔柱状图效果修改;矢量数据入库修改

---
 src/views/datamanage/dataStatistics.vue |   63 ++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/views/datamanage/dataStatistics.vue b/src/views/datamanage/dataStatistics.vue
index 69757b6..bbf3498 100644
--- a/src/views/datamanage/dataStatistics.vue
+++ b/src/views/datamanage/dataStatistics.vue
@@ -1,14 +1,15 @@
 <template>
   <div class="dataStatistics">
-    <My-bread
-      :list="[
+    <My-bread :list="[
         `${$t('dataManage.dataManage')}`,
         `${$t('dataManage.dataStatistics')}`,
-      ]"
-    ></My-bread>
+      ]"></My-bread>
     <el-divider />
     <div class="contentBox">
-      <div class="content_Left subpage_Div"  style="border: 1px solid #dcdfe6;">
+      <div
+        class="content_Left subpage_Div"
+        style="border: 1px solid #dcdfe6;"
+      >
         <el-tree
           :data="treeData"
           @node-click="handleNodeClick"
@@ -19,34 +20,40 @@
         >
         </el-tree>
       </div>
-      <div class="content_Right subpage_Div" style="border: 1px solid #dcdfe6;">
-        <div class="iquery subpage_Div" style="padding-bottom: 14px">
+      <div
+        class="content_Right subpage_Div"
+        style="border: 1px solid #dcdfe6;"
+      >
+        <div
+          class="iquery subpage_Div"
+          style="padding-bottom: 14px"
+        >
           <div>
             <el-button
               icon="el-icon-c-scale-to-original"
               size="small"
               type="warning"
               @click="setCountFlagChange(1)"
-              >{{ $t("shuJuGuanLi.butten.Report") }}</el-button
-            >
+            >{{ $t("shuJuGuanLi.butten.Report") }}</el-button>
             <el-button
               icon="el-icon-pie-chart"
               size="small"
               type="primary"
               @click="setCountFlagChange(2)"
-              >{{ $t("shuJuGuanLi.butten.Histogram") }}</el-button
-            >
+            >{{ $t("shuJuGuanLi.butten.Histogram") }}</el-button>
             <el-button
               icon="el-icon-download"
               size="small"
               type="success"
               @click="setCountFlagChange(3)"
-              >{{ $t("shuJuGuanLi.butten.Download") }}</el-button
-            >
+            >{{ $t("shuJuGuanLi.butten.Download") }}</el-button>
           </div>
         </div>
         <div class="dividing-line"></div>
-        <div class="contentTable subpage_Div" v-show="setCountFlag">
+        <div
+          class="contentTable subpage_Div"
+          v-show="setCountFlag"
+        >
           <el-table
             :data="tableData"
             style="width: 100%"
@@ -167,9 +174,15 @@
             :formatter="showFormat"
           >
           </el-table-column>
-          <el-table-column width="120" :label="$t('common.operate')">
+          <el-table-column
+            width="120"
+            :label="$t('common.operate')"
+          >
             <template slot-scope="scope">
-              <el-button @click="setDownLoadRow(scope.row)" size="small">
+              <el-button
+                @click="setDownLoadRow(scope.row)"
+                size="small"
+              >
                 {{ $t("common.download") }}
               </el-button>
             </template>
@@ -278,7 +291,7 @@
           this.closeDownLoadFlag();
           done();
         })
-        .catch((_) => {});
+        .catch((_) => { });
     },
     closeDownLoadFlag() {
       this.showDownLoadFlag = false;
@@ -300,6 +313,7 @@
       }
     },
     async getQueryDownloadData() {
+      this.modelData = [];
       this.listData = {
         pageIndex: 1,
         pageSize: 10,
@@ -436,7 +450,7 @@
           startValue: dataAxis[Math.max(params.dataIndex - zoomSize / 2, 0)],
           endValue:
             dataAxis[
-              Math.min(params.dataIndex + zoomSize / 2, data.length - 1)
+            Math.min(params.dataIndex + zoomSize / 2, data.length - 1)
             ],
         });
       });
@@ -468,9 +482,10 @@
     },
     //鏌ヨ缁熻淇℃伅
     async setQueryCountData() {
-      var data;
+      var data, val;
       if (this.queryData.value == "countServices") {
         data = await dataCount_selectCountServices();
+
       } else if (this.queryData.value == "countSizes") {
         data = await dataCount_selectCountSizes();
       } else if (this.queryData.value == "countOperates") {
@@ -485,6 +500,16 @@
           data.result[i].count = data.result[i].sizes;
         }
       }
+
+      if (this.queryData.value == "countOperates") {
+        for (var i in data.result) {
+          if (data.result[i].m2) {
+            data.result[i].m1 = data.result[i].m1 + '\\' + data.result[i].m2
+          }
+
+        }
+      }
+
       this.tableData = data.result;
       this.$nextTick(() => {
         this.$refs.table.doLayout();

--
Gitblit v1.9.3