Explorar o código

0821 麻了 不想写了 订正了一些bug

allen %!s(int64=3) %!d(string=hai) anos
pai
achega
5a41a4f074

+ 1 - 0
package.json

@@ -36,6 +36,7 @@
     "papaparse": "^5.3.1",
     "svg-sprite-loader": "3.7.3",
     "v-echarts": "^1.0.2",
+    "v-fit-columns": "^0.2.0",
     "vue": "2.5.16",
     "vue-codemirror": "^4.0.6",
     "vue-cookie": "1.1.4",

+ 2 - 2
src/main.js

@@ -28,8 +28,8 @@ if (process.env.NODE_ENV !== 'production') {
 // 挂载全局
 Vue.prototype.$http = httpRequest // ajax请求方法
 Vue.prototype.isAuth = isAuth     // 权限方法
-Vue.prototype.$message = Message                //vue实例上挂载Message                
-Vue.prototype.$messagebox = MessageBox             //vue实例上挂载MessageBox  
+Vue.prototype.$message = Message                // vue实例上挂载Message
+Vue.prototype.$messagebox = MessageBox             // vue实例上挂载MessageBox
 
 // 保存整站vuex本地储存初始状态
 window.SITE_CONFIG['storeState'] = cloneDeep(store.state)

+ 157 - 110
src/views/modules/visi/create1.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div >
+  <div>
     <el-breadcrumb class="divi2" separator-class="el-icon-arrow-right">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/visi-dataset'}">数据集管理</el-breadcrumb-item>
@@ -9,23 +9,25 @@
     <el-divider class="divi"></el-divider>
     <div class="title_score">
       <!--   el-form 中添加   status-icon  可检测状态-->
-      <el-form :inline="true"  ref = "dataInfo"  :model="dataInfo" :rules="datarules" class="demo-form-inline">
+      <el-form :inline="true" ref="dataInfo" :model="dataInfo" :rules="datarules" class="demo-form-inline">
         <el-form-item label="数据集名称" prop="datasetName">
-          <el-input style="width: 260px;" v-model="dataInfo.datasetName" placeholder="请输入数据集内容" ></el-input>
+          <el-input style="width: 260px;" v-model="dataInfo.datasetName" placeholder="请输入数据集内容"></el-input>
         </el-form-item>
         <el-form-item label="类别" prop="classificationtag" style="margin-left: 20px">
           <el-select v-model="dataInfo.classificationtag"
                      filterable
                      allow-create
-                     ref = 'classfi'
+                     ref='classfi'
                      @change="demo1()">
-            <el-option style="width: 260px;" v-for="data in classification" :key="data.categoryId" :label="data.categoryName" :value="data.categoryId">
+            <el-option style="width: 260px;" v-for="data in classification" :key="data.categoryId"
+                       :label="data.categoryName" :value="data.categoryId">
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="备注" prop="remarks" style="margin-left: 20px" >
-          <el-input style="width: 300px;" v-model = "dataInfo.remarks"  ref = 'remarks' clearable placeholder="备注"  ></el-input>
+        <el-form-item label="备注" prop="remarks" style="margin-left: 20px">
+          <el-input style="width: 300px;" v-model="dataInfo.remarks" ref='remarks' clearable
+                    placeholder="备注"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getPythonKafkaTmp()">获得代码模板</el-button>
@@ -39,10 +41,10 @@
             <div class="leftDivTitle"><!-- 控制左边树形区域的上方的div -->
               <el-tag style="  width: 100%;text-align: center;height: 31px">系统数据</el-tag>
             </div>
-            <div class="leftDivTree"  > <!-- 控制左边树形区域的下方的div -->
+            <div class="leftDivTree"> <!-- 控制左边树形区域的下方的div -->
               <el-tree
                 v-if="showTree"
-                id = 'tree'
+                id='tree'
                 node-key="subEquipmentid"
                 :props="treeDefaultProps"
                 ref="tree"
@@ -51,7 +53,7 @@
                 draggable
                 :allow-drag="allowdrag"
                 :allow-drop="allowDrop"
-                @node-drag-end = "treeNodeDragEnd">
+                @node-drag-end="treeNodeDragEnd">
                 <!--            @node-click="treeNodeClick">-->
                 <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>
@@ -62,22 +64,22 @@
             </div>
           </div>
           <div style="height: 35.7%;margin-top: 3.1%">
-              <el-tag style="  width: 100%;text-align: center;border-top:0.2px solid #000;height: 31px">本地数据</el-tag>
-            <div class="leftDivTree"  > <!-- 控制左边树形区域的下方的div -->
+            <el-tag style="  width: 100%;text-align: center;border-top:0.2px solid #000;height: 31px">本地数据</el-tag>
+            <div class="leftDivTree"> <!-- 控制左边树形区域的下方的div -->
               <el-tree
                 v-if="showTree"
-                id = 'static_tree'
+                id='static_tree'
                 :data="static_treedata"
                 :props="treeDefaultProps"
 
                 draggable
                 :allow-drag="st_allowdrag"
                 :allow-drop="st_allowDrop"
-                @node-drag-end = "st_treeNodeDragEnd">
+                @node-drag-end="st_treeNodeDragEnd">
                 <!--            @node-click="treeNodeClick">-->
                 <span class="custom-tree-node" slot-scope="{ node, data }">
               <span>
-                  <i :class="data.icon" style="margin-right: 8px" ></i>{{ node.label }}
+                  <i :class="data.icon" style="margin-right: 8px"></i>{{ node.label }}
               </span>
           </span>
               </el-tree>
@@ -97,14 +99,14 @@
                 <i @mouseover="yuLanMouseOver"
                    @mouseleave="yuLanMouseLeave" id="yuLan" @click="preview"
                    style="height: 25px;width: 25px; margin: 10px 5px 10px 10px;font-size: 23px;"
-                   class = 'iconfont icon-preview'>
+                   class='iconfont icon-preview'>
                 </i>
               </el-tooltip>
               <el-tooltip content="日志" effect="dark">
                 <i @mouseover="riZhiMouseOver"
                    @mouseleave="riZhiMouseLeave" id="riZhi" @click=shourizhi()
                    style="height: 25px;width: 25px; margin: 10px 5px 10px 10px;font-size: 23px;"
-                   class = 'iconfont icon-tishi'>
+                   class='iconfont icon-tishi'>
                 </i>
               </el-tooltip>
             </div>
@@ -113,19 +115,23 @@
             <div class="dy_datasourceDiv" id="dy_drag" @dragover="dragDragOver" @dragleave="dragDragLeave">
               <el-divider><i class=" icon iconfont icon-xitong2"></i></el-divider>
               <div v-for="subEquipment in subEquipments" :key="subEquipment.key" style="display: inline-block">
-                <div style="margin-left: 10px; margin-top:10px" @mouseover="subEquipment.quXiao = true" @mouseleave="subEquipment.quXiao = false">
+                <div style="margin-left: 10px; margin-top:10px" @mouseover="subEquipment.quXiao = true"
+                     @mouseleave="subEquipment.quXiao = false">
                   <i draggable="true" v-if="subEquipment.table"
                      style="margin: 5px 10px 10px 15px;vertical-align: middle"
                      :class=subEquipment.icon
                      @click="handleClick(subEquipment.id)"
                      @dblclick="dblClick(subEquipment.id)">
                   </i>
-                  <i style="position: absolute;" :id = subEquipment.id v-if="subEquipment.quXiao"
+                  <i style="position: absolute;" :id=subEquipment.id v-if="subEquipment.quXiao"
                      @mouseover="quXiaoMouseOver(subEquipment.id)"
                      @mouseleave="quXiaoMouseLeave(subEquipment.id)"
                      @click="quXiao(subEquipment.id)"
                      class="iconfont icon-quxiao"></i>
-                  <span class="demonstration"  style="vertical-align: middle;display: block;font-size: 1px; margin-top: 5px;text-align: center">{{ subEquipment.imageTable.tableName }}</span>
+                  <span class="demonstration"
+                        style="vertical-align: middle;display: block;font-size: 1px; margin-top: 5px;text-align: center">{{
+                      subEquipment.imageTable.tableName
+                    }}</span>
                 </div>
               </div>
             </div>
@@ -133,7 +139,8 @@
             <div class="st_datasourceDiv" id="statle_drag" @dragover="st_dragDragOver" @dragleave="st_dragDragLeave">
               <el-divider><i class=" icon iconfont icon-local"></i></el-divider>
               <div v-for="localUp in localUps" :key="localUp.key" style="display: inline-block">
-                <div style="margin-left: 10px; margin-top:10px" @mouseover="localUp.quXiao = true" @mouseleave="localUp.quXiao = false">
+                <div style="margin-left: 10px; margin-top:10px" @mouseover="localUp.quXiao = true"
+                     @mouseleave="localUp.quXiao = false">
                   <i draggable="true" v-if="true"
                      style="margin: 5px 10px 10px 15px;vertical-align: middle"
                      :class=localUp.icon
@@ -141,12 +148,15 @@
                      @dblclick="st_dblClick(localUp)">
                   </i>
 
-                  <i style="position: absolute;" :id = localUp.id v-if="localUp.quXiao"
+                  <i style="position: absolute;" :id=localUp.id v-if="localUp.quXiao"
                      @mouseover="quXiaoMouseOver(localUp.id)"
                      @mouseleave="quXiaoMouseLeave(localUp.id)"
                      @click="st_quXiao(localUp)"
                      class="iconfont icon-quxiao"></i>
-                  <span class="demonstration"  style="    text-align: center;display: block;font-size: 1px; margin-top: 5px;">{{ localUp.indexContent }}</span>
+                  <span class="demonstration"
+                        style="    text-align: center;display: block;font-size: 1px; margin-top: 5px;">{{
+                      localUp.indexContent
+                    }}</span>
 
                 </div>
               </div>
@@ -161,21 +171,23 @@
           </div><!-- 控制中间区域的数据输入区的div -->
         </div>
         <div class="rightDiv" v-if="true"> <!-- 控制右侧属性区域的div -->
-          <el-tag style="  width: 100%;text-align: center;border-bottom: 0.2px solid #000000;" >{{detailTitle.worldName}}</el-tag>
-              <el-table
-                :data="tableData"
-                :row-style="{height:'0'}"
-                :cell-style="{padding:'0'}"
-                v-loading = "dataListLoading"
-                size="100%"
-                height=95%
-                border
-              >
-                <el-table-column v-for="tablelist in tablelists" :key="tablelist.id"
-                                 :prop='tablelist.prop'
-                                 :label="tablelist.label">
-                </el-table-column>
-              </el-table>
+          <el-tag style="  width: 100%;text-align: center;border-bottom: 0.2px solid #000000;">
+            {{ detailTitle.worldName }}
+          </el-tag>
+          <el-table
+            :data="tableData"
+            :row-style="{height:'0'}"
+            :cell-style="{padding:'0'}"
+            v-loading="dataListLoading"
+            size="100%"
+            height=95%
+            border
+          >
+            <el-table-column v-for="tablelist in tablelists" :key="tablelist.id"
+                             :prop='tablelist.prop'
+                             :label="tablelist.label">
+            </el-table-column>
+          </el-table>
         </div>
       </div>
       <div class="pop"><!-- 各种弹窗 -->
@@ -188,7 +200,16 @@
                    append-to-body>
           <div style="text-align: center;margin-top: -20px;">
             <span style="width: 10%">子设备名称 :   </span>
-            <el-input v-model="detailTitle.worldName" style="margin-left: 20px; height:10%;width: 40%"></el-input>
+            <span  style="margin-right: 20px">{{detailTitle.worldName}}</span>
+            <el-date-picker
+              v-show="localUps.length === 0"
+              v-model="selectTime"
+              value-format="timestamp"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
           </div>
           <div style="margin-top: 10px;margin-left: 25px;">
             <el-transfer
@@ -212,14 +233,14 @@
                    append-to-body>
           <el-tabs type="border-card">
             <el-tab-pane>
-              <span slot="label">{{predatasetName}}</span>
+              <span slot="label">{{ predatasetName }}</span>
               <!--              <i class="iconfont icon-xitong4"></i>-->
               <el-divider class="tableDivider"></el-divider>
               <el-table
                 :data="preTableDate"
                 height="250"
                 border
-                v-loading = 'prewListLoading'
+                v-loading='prewListLoading'
                 style="width: 100%">
                 <el-table-column v-for="preTalblelist in preTalbelists" :key="preTalblelist.id"
                                  :prop="preTalblelist.prop"
@@ -239,15 +260,15 @@
         <el-dialog custom-class="cron-box-dialog-first" :visible.sync="dialogVisible" v-if="dialogVisible">
           <mycron v-bind:extractionPeriod.sync="dataInfo.extractionPeriod"></mycron>
         </el-dialog>
-<!--        本地数据上传-->
-      <static-up-load-excel v-if="st_upShow.excel" ref="staticUploadExcel" > </static-up-load-excel>
+        <!--        本地数据上传-->
+        <static-up-load-excel v-if="st_upShow.excel" ref="staticUploadExcel"></static-up-load-excel>
         <staticup-load-csv v-if="st_upShow.word" ref="staticUploadCsv"></staticup-load-csv>
         <empty v-if="st_upShow.other" ref="othersUpload"></empty>
       </div>
     </div>
     <div style="text-align: right;margin-top: -135px;margin-right: 80px;position:relative;z-index: 999">
-      <el-button >取消</el-button>
-      <el-button type="primary" @click="stdySubmit(dataInfo) " >确定</el-button>
+      <el-button>取消</el-button>
+      <el-button type="primary" @click="stdySubmit(dataInfo) ">确定</el-button>
     </div>
     <PythonKafkaTmp v-if="pythonKafkaVisible" ref="pythonKafkaTmp" @refreshDataList="getDataList"></PythonKafkaTmp>
   </div>
@@ -261,8 +282,9 @@ import staticUpLoadExcel from './com/static_upLoad_excel'
 import staticupLoadCsv from './com/static_upLoad_csv'
 import empty from './com/empty'
 import PythonKafkaTmp from '../alg/python-kafka-tmp.vue'
-import { MessageBox } from 'element-ui'
-import { Message } from 'element-ui'
+import {MessageBox} from 'element-ui'
+import {Message} from 'element-ui'
+
 export default {
   // import引入的组件需要注入到对象中才能使用
   components: {mycron, staticUpLoadExcel, empty, PythonKafkaTmp, staticupLoadCsv},
@@ -281,7 +303,7 @@ export default {
         classificationtag: 1,
         remarks: ''
       },
-
+      selectTime: [],
       measurepoint: [], // 你要的数据在这儿
       pythonKafkaVisible: false,
       dataListLoading: false,
@@ -323,7 +345,7 @@ export default {
       showEqumField: false, // 控制子设备段显隐
       imsql: [], // 向后台提交是数据 包括:所属煤矿、系统、子系统、设备等 以及选择的字段,hbase的地址
       st_imsql: [], // 向后台提交是本地数据
-       // 记录当前双击的数据
+      // 记录当前双击的数据
       sign: {
         type: '',
         id: null
@@ -364,11 +386,11 @@ export default {
       },
       datarules: {
         datasetName: [
-          { required: true, message: '请输入数据集名称', trigger: 'blur' },
-          { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' }
+          {required: true, message: '请输入数据集名称', trigger: 'blur'},
+          {min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur'}
         ],
         extractionPeriod: [
-          { validator: checkExtractionPeriod, trigger: 'blur' }
+          {validator: checkExtractionPeriod, trigger: 'blur'}
         ]
       }
 
@@ -387,7 +409,7 @@ export default {
   },
   // 方法集合
   methods: {
-        // 手动给穿梭框内容添加title
+    // 手动给穿梭框内容添加title
     showChooseAddTitle (e) {
       // let dom = e.target;
       // if (dom.title) return;
@@ -470,6 +492,8 @@ export default {
       }
       var onlyStatic = true
       for (let j = 0; j < this.imsql.length; j++) {
+        this.imsql[j]['start'] = this.selectTime[0]
+        this.imsql[j]['end'] = this.selectTime[1]
         await this.$http({
           url: this.$http.adornUrl('/dataset/dynamic/makeDyDataSet'),
           method: 'post',
@@ -543,17 +567,23 @@ export default {
           })
         }
       }
+
       // 获取数据
       this.$http({
-        url: this.$http.adornUrl('/dataset/dynamic/getprecontent'),
+        url: this.$http.adornUrl('/dataset/dynamic/getprecontentlimit'),
         method: 'post',
-        data: this.$http.adornData(this.imsql, false)
+        data: this.$http.adornData({
+          'data': this.imsql,
+          'start': this.selectTime[0],
+          'end': this.selectTime[1]
+        }, false)
       }).then(preDatas => {
         this.$http({
           url: this.$http.adornUrl('/dataset/staticup/getstapre'),
           method: 'post',
           data: this.$http.adornData({
             'data': preDatas.data.preContent,
+            'limit': this.selectTime,
             'loacl': this.st_imsql
           }, false)
         }).then(res => {
@@ -631,7 +661,9 @@ export default {
     },
 
     allowdrag (node) {
-      if (node.data.limit === 'children') { return true }
+      if (node.data.limit === 'children') {
+        return true
+      }
     },
     allowDrop () {
       return false // 设置树节点内不可拖拽
@@ -644,7 +676,9 @@ export default {
       this.dragFlg = 0
     },
     st_allowdrag (node) {
-      if (node.data.limit === 'word' || node.data.limit === 'excel' || node.data.limit === 'pic' || node.data.limit === 'video') { return true }
+      if (node.data.limit === 'word' || node.data.limit === 'excel' || node.data.limit === 'pic' || node.data.limit === 'video') {
+        return true
+      }
     },
     st_allowDrop () {
       return false // 设置树节点内不可拖拽
@@ -727,7 +761,11 @@ export default {
           indexContent: '', // 图片上方的内容
           selectList: [], // 数据库中子设备字段名
           sureSelectList: [], // 选择的子设备字段名
-          filedList: [], // 数据库的字段名
+          filedList: [{
+            key: 0,
+            prop: 'time',
+            label: '时间'
+          }], // 数据库的字段名
           icon: 'icon iconfont icon-xitong1', // 图标
           sql: {
             id: '', // 记录对应的节点id
@@ -761,7 +799,7 @@ export default {
           if (headers) {
             for (let i = 0; i < headers.length; i++) {
               var list = {
-                key: i,
+                key: i + 1,
                 measurepointId: headers[i].measurepointId,
                 prop: headers[i].name_en,
                 label: headers[i].name_zh
@@ -817,6 +855,7 @@ export default {
           // 处理两次单击同一个设备
           if (this.detailTitle.worldName !== this.subEquipments[i].imageTable.tableName) {
             this.tablelists = this.subEquipments[i].filedList
+
             this.detailTitle.worldName = this.subEquipments[i].imageTable.tableName
             this.tableData = []
             // 获取右侧表格数据
@@ -828,7 +867,6 @@ export default {
               if (contextResponse.data.code === 500) {
                 this.tableData = []
               } else {
-                // console.log(contextResponse)
                 const subeqpmContent = JSON.parse(JSON.stringify(contextResponse.data.equmentAll))
 
                 this.tableData = subeqpmContent
@@ -861,21 +899,6 @@ export default {
           this.selectData = [] // 将原始字段置空
           this.sureSelect = this.subEquipments[i].sureSelectList
           this.selectData = this.subEquipments[i].filedList
-          // if (this.subEquipments[i].selectList.length === 0) { // 判断是否已有字段数据
-
-          //   this.axios.post(this.base_url + 'getcolumns', this.subEquipments[i].sql).then(response => {
-          //     for (let j = 0; j < response.data.length; j++) {
-          //       this.selectData.push({
-          //         key: j,
-          //         label: response.data[j].name
-          //       })
-          //     }
-          //   })
-          //   this.subEquipments[i].selectList = this.selectData
-          // } else {
-
-          //   this.selectData = this.subEquipments[i].selectList
-          // }
           break
         }
       }
@@ -999,7 +1022,8 @@ export default {
                 })
               }
             })
-          }).catch(() => {})
+          }).catch(() => {
+          })
         }
       })
     },
@@ -1078,7 +1102,7 @@ export default {
       this.$http({
         url: this.$http.adornUrl('/category/select'),
         method: 'get'
-      }).then(({ data }) => {
+      }).then(({data}) => {
         var ss = []
         for (var i = 0; i < data.list.length; i++) {
           ss[i] = data.list[i]
@@ -1191,14 +1215,22 @@ export default {
     this.classificationList()
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
-  created () {},
-  beforeCreate () {}, // 生命周期 - 创建之前
-  beforeMount () {}, // 生命周期 - 挂载之前
-  beforeUpdate () {}, // 生命周期 - 更新之前
-  updated () {}, // 生命周期 - 更新之后
-  beforeDestroy () {}, // 生命周期 - 销毁之前
-  destroyed () {}, // 生命周期 - 销毁完成
-  activated () {} // 如果页面有keep-alive缓存功能,这个函数会触发
+  created () {
+  },
+  beforeCreate () {
+  }, // 生命周期 - 创建之前
+  beforeMount () {
+  }, // 生命周期 - 挂载之前
+  beforeUpdate () {
+  }, // 生命周期 - 更新之前
+  updated () {
+  }, // 生命周期 - 更新之后
+  beforeDestroy () {
+  }, // 生命周期 - 销毁之前
+  destroyed () {
+  }, // 生命周期 - 销毁完成
+  activated () {
+  } // 如果页面有keep-alive缓存功能,这个函数会触发
 }
 </script>
 <style scoped>
@@ -1217,7 +1249,7 @@ export default {
   background-color: #dcdfe6;
 }
 
-.title_score{
+.title_score {
   margin-top: 30px;
   margin-left: 180px;
 }
@@ -1228,20 +1260,23 @@ export default {
   position: relative;
   margin: 1px 25px 0px 100px;
 }
-.allDiv{
+
+.allDiv {
   width: 100%;
   height: 80%;
   border-left: 0.2px solid #000;
 }
-.leftDiv{
+
+.leftDiv {
   width: 20%;
   height: 100%;
   float: left;
-  border-bottom:0.2px solid #000;
-  border-top:0.2px solid #000;
+  border-bottom: 0.2px solid #000;
+  border-top: 0.2px solid #000;
   /*//overflow-y: auto;*/
 }
-.leftDivTree{
+
+.leftDivTree {
   width: 100%;
   height: 93.7%;
   overflow: scroll;
@@ -1252,6 +1287,7 @@ export default {
   min-width: 100%;
 
 }
+
 .custom-tree-node {
   flex: 1;
   display: flex;
@@ -1260,56 +1296,63 @@ export default {
   font-size: 14px;
   padding-right: 8px;
 }
-.midDiv{
+
+.midDiv {
   width: 49.5%;
   height: 100%;
   float: left;
-  border-top:0.2px solid #000;
-  border-bottom:0.2px solid #000;
-  border-left:0.2px solid #000;
+  border-top: 0.2px solid #000;
+  border-bottom: 0.2px solid #000;
+  border-left: 0.2px solid #000;
   overflow-y: scroll;
 }
-.midDivTop{
-  height:6.3%;
+
+.midDivTop {
+  height: 6.3%;
   width: 100%;
 }
-.midDivTopImg{
+
+.midDivTopImg {
   /*padding-top: 5px;*/
   /*height: 31px;*/
 }
 
-.midDivData{
+.midDivData {
   width: 100%;
   height: 93.7%;
   margin-top: -10px;
   background: url("../../../assets/datasetImg/background.png");
 }
+
 .dy_datasourceDiv {
   width: 100%;
   height: 60%;
 }
+
 .st_datasourceDiv {
   width: 100%;
   height: 32.3%;
 }
-.dy_datasourceDiv  .el-divider--horizontal
-{
+
+.dy_datasourceDiv .el-divider--horizontal {
   margin: 0;
 }
-.st_datasourceDiv .el-divider--horizontal
-{
+
+.st_datasourceDiv .el-divider--horizontal {
   margin: 0;
 }
-.rizhiDiv{
+
+.rizhiDiv {
   width: 49.3%;
-  height:15%;
+  height: 15%;
   position: absolute;
   margin-top: -5.8%;
   margin-left: 2px;
   /*overflow:auto*/
   /*bottom: 12.6px;*/
 }
-.rizhiDivtext{
+
+.rizhiDivtext {
   width: 100%;
   height: 75.5%;
   font-size: 1px;
@@ -1319,21 +1362,25 @@ export default {
   /*background: #ffff;*/
   white-space: pre-wrap;
 }
-.rightDiv{
+
+.rightDiv {
   width: 30%;
   height: 100%;
   float: left;
   overflow: auto;
   /*padding: 2px;*/
-  border:0.5px solid #000;
+  border: 0.5px solid #000;
 }
+
 .icon {
-  width: 1em; height: 1em;
+  width: 1em;
+  height: 1em;
   vertical-align: -0.15em;
   fill: currentColor;
   overflow: hidden;
 }
-.el-tree.iconfont{
+
+.el-tree.iconfont {
   margin-right: 100px;
 }
 </style>

+ 6 - 2
src/views/modules/visi/create2.vue

@@ -183,7 +183,7 @@
                    append-to-body>
           <div style="text-align: center;margin-top: -20px;">
             <span style="width: 10%">子设备名称 :   </span>
-            <el-input v-model="detailTitle.worldName" style="margin-left: 20px; height:10%;width: 40%"></el-input>
+            <span style="margin-right: 20px">{{detailTitle.worldName}}</span>
           </div>
           <div style="margin-top: 10px;margin-left: 25px;">
             <el-transfer
@@ -558,7 +558,11 @@ export default {
           indexContent: '', // 图片上方的内容
           selectList: [], // 数据库中子设备字段名
           sureSelectList: [], // 选择的子设备字段名
-          filedList: [], // 数据库的字段名
+          filedList: [{
+            key: -1,
+            prop: 'time',
+            label: '时间'
+          }], // 数据库的字段名
           icon: 'icon iconfont icon-xitong1', // 图标
           sql: {
             id: '', // 记录对应的节点id

+ 10 - 3
src/views/modules/visi/dataset.vue

@@ -120,7 +120,7 @@
           <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="openDataPreProcessDialog(scope.row.datasetName)">预处理</el-button>
+<!--           <el-button type="text" size="small" @click="openDataPreProcessDialog(scope.row.datasetName)">预处理</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -253,7 +253,9 @@ export default {
     // 筛选查询
     getDataList2 () {
       this.dataListLoading = true
-
+      if (this.classificationtag === '全部') {
+        this.classificationtag = null
+      }
       if (this.status === '1') {
         // 获取静态数据集
         this.st_dataList = []
@@ -313,9 +315,14 @@ export default {
     // 去重
     unique (arr) {
       var ss = []
+      ss[0] = {
+        'categoryId': 0,
+        'categoryName': '全部'
+      }
       for (var i = 0; i < arr.length; i++) {
         // ss[i] = arr[i].categoryName
-        ss[i] = arr[i]
+        console.log(arr[i])
+        ss[i + 1] = arr[i]
       }
       return Array.from(new Set(ss))
     },