数据集管理，动态，静态数据集bug修改

src/views/modules/visi/com/dir-upLoad.vue

@@ -32,7 +32,7 @@
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
-          将文件夹拖到此处，或
+
           <em>点击上传</em>
         </div>
         <div class="tip" slot="tip">

src/views/modules/visi/create1.vue

@@ -861,7 +861,7 @@ export default {
                   measurepointId: headers[i].id,
                   flag: '未选中',
                   seen: false,
-                  prop: headers[i].name
+                  prop: tablists.data.pinyin[i]
                 }
                 console.log('list:' + list)
                 subEquipment.filedList.push(list)

src/views/modules/visi/create2.vue

@@ -620,7 +620,7 @@ export default {
         if (node.level > 1) {
           // 获取hbase 表头信息
           this.$http({
-            url: this.$http.adornUrl('/universaltable/getOtherLeafItem?tableId=' + node.data.levelId + '&id=' + node.data.subEquipmentid),
+            url: this.$http.adornUrl('/universaltable/getOtherLeafItem?tableId=' + node.data.levelId + '&id=' + node.data.coalid),
             method: 'post'
           }).then(tablists => {
             let headers = tablists.data.data
@@ -634,7 +634,7 @@ export default {
                   // fieldId: response.data[i].fieldId,
                   measurepointId: headers[i].id,
                   flag: '未选中',
-                  prop: headers[i].name,
+                  prop: tablists.data.pinyin[i],
                   seen: false
                 }
                 console.log('list:' + list)
@@ -691,7 +691,10 @@ export default {
           if (this.detailTitle.worldName !== this.subEquipments[i].imageTable.tableName) {
             let l = []
             for (let j = 0; j < this.subEquipments[i].filedList.length; j++) {
-              let o = this.subEquipments[i].filedList[j] + '_after'
+              let o = this.subEquipments[i].filedList[j]
+              if (o.prop != "time") {
+                o.prop = o.prop + '_after'
+              }
               l.push(o)
             }
             // this.tablelists = this.subEquipments[i].filedList
@@ -894,7 +897,7 @@ export default {
             for (let sign = 0; sign < coalContent.length; sign++) {
               var coal = {
                 name: coalContent[sign].name,
-                subEquipmentid: coalContent[sign].id,
+                coalid: coalContent[sign].id,
                 limit: 'coal',
                 hbaseTableName: '',
                 icon: 'iconfont icon-xitongfuwu',
@@ -917,7 +920,7 @@ export default {
         if (node.data.isdisabled === 1) return resolve([])
         else {
           this.$http({
-            url: this.$http.adornUrl('/universaltable/getRootLevel?id=' + node.data.subEquipmentid),
+            url: this.$http.adornUrl('/universaltable/getRootLevel?id=' + node.data.coalid),
             method: 'post'
           }).then(({data}) => {
             console.log('第二层非叶子节点信息：' + JSON.stringify(data))
@@ -926,7 +929,7 @@ export default {
             for (let j = 0; j < coalContent.length; j++) {
               let coal = {
                 name: coalContent[j].name,
-                subEquipmentid: coalContent[j].id,
+                coalid: coalContent[j].id,
                 limit: 'coal',
                 hbaseTableName: coalContent[j].hbaseTableName,
                 icon: 'icon iconfont icon-xitongfuwu',
@@ -945,7 +948,7 @@ export default {
         for (let i = 2; i < 50; i++) {
           if (node.level === i) {
             this.$http({
-              url: this.$http.adornUrl('/universaltable/getSonLevel?tableId=' + node.data.levelId + '&id=' + node.data.subEquipmentid),
+              url: this.$http.adornUrl('/universaltable/getSonLevel?tableId=' + node.data.levelId + '&id=' + node.data.coalid),
               method: 'post'
             }).then(({data}) => {
               console.log('第三次非叶子节点信息：' + JSON.stringify(data.data))
@@ -954,7 +957,7 @@ export default {
               for (let j = 0; j < coalContent.length; j++) {
                 let coal = {
                   name: coalContent[j].name,
-                  subEquipmentid: coalContent[j].id,
+                  coalid: coalContent[j].id,
                   limit: 'coal',
                   hbaseTableName: coalContent[j].hbaseTableName,
                   icon: 'icon iconfont icon-xitongfuwu',

src/views/modules/visi/dataset.vue

@@ -119,7 +119,7 @@
           <el-button v-if="isAuth('sys:schedule:resume')" type="text" size="small" @click="dy_resumeHandle(scope.row)">恢复</el-button>
           <el-button v-if="isAuth('sys:schedule:run')" type="text" size="small" @click="dy_runHandle(scope.row)">执行</el-button>
           <el-button v-if="isAuth('sys:schedule:log')" type="text" size="small" @click="dy_logHandle(scope.row)">日志</el-button>
-          <el-button type="text" size="small" @click="downloadDataset(scope.row.datasetName)">下载</el-button>
+          <el-button type="text" size="small" @click="downloadDataset(scope.row.datasetName, scope.row.categoryName)">下载</el-button>
 <!--           <el-button type="text" size="small" @click="openDataPreProcessDialog(scope.row.datasetName)">预处理</el-button>-->
         </template>
       </el-table-column>
@@ -572,9 +572,12 @@ export default {
         type: 'warning'
       }).then(() => {
         var urls = this.$http.adornUrl('/dataset/downloadDataset')
+        console.log("这里是状态1")
         if (this.status === '2') {
           urls = this.$http.adornUrl('/datasetdy/downloadDataset')
+          console.log("这里是状态2")
         }
+        console.log(categoryName)
         if (categoryName === "文件夹") {
           this.$http({
             url: urls,
@@ -591,7 +594,7 @@ export default {
             }
             const byteArray = new Uint8Array(byteNumbers);
             const blob = new Blob([byteArray], { type: 'application/zip' });
-            // 创建一个临时URL  
+            // 创建一个临时URL
             const url = window.URL.createObjectURL(blob);
             // 创建一个a标签并设置下载属性
             const link = document.createElement('a');