Browse Source

adm:fix> 添加深化点表导入

shaun-sheep 4 năm trước cách đây
mục cha
commit
9225be7075

+ 14 - 17
config/index.js

@@ -27,7 +27,7 @@ module.exports = {
       },
       '/data-platform-3': {
         // 目标 API 地址
-        target: 'http://api.sagacloud.cn/',
+        target: 'http://39.97.179.199:9909/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -35,11 +35,8 @@ module.exports = {
       },
       '/business-space': {
         // 目标 API 地址
-        target: 'http://api.sagacloud.cn',
-        changeOrigin: true,
-        pathRewrite: {
-          "^/business-space": "/dp-auxiliary/business-space/"
-        }
+        target: 'http://39.97.179.199:9909',
+        changeOrigin: true
       },
       '/pointconfig': {
         // 目标 API 地址
@@ -51,19 +48,19 @@ module.exports = {
       },
       '/venders-dp': {
         // 目标 API 地址
-        target: 'http://api.sagacloud.cn',
+        target: 'http://39.97.179.199:9909',
         changeOrigin: true,
-        pathRewrite: {
-          "^/venders-dp": "/dp-auxiliary/venders-dp/"
-        }
+        // pathRewrite: {
+        //   "^/venders-dp": "/dp-auxiliary/venders-dp/"
+        // }
       },
       '/venders': {
         // 目标 API 地址
-        target: 'http://api.sagacloud.cn',
+        target: 'http://39.97.179.199:9909',
         changeOrigin: true,
-        pathRewrite: {
-          "^/venders": "/dp-auxiliary/venders/"
-        }
+        // pathRewrite: {
+        //   "^/venders": "/dp-auxiliary/venders/"
+        // }
       },
       '/ScanBuilding': {
         // 目标 API 地址
@@ -83,10 +80,10 @@ module.exports = {
       },
       '/image-service': {
         // 目标 API 地址
-        target: 'http://api.sagacloud.cn',
+        target: 'http://39.97.179.199:8888',
         changeOrigin: true,
         pathRewrite: {
-          "^/image-service": "/dp-auxiliary/image-service/"
+          "^/image-service": "/image-service/"
         }
       },
       '/modelapi': {
@@ -100,7 +97,7 @@ module.exports = {
         target: 'http://mbi.sagacloud.cn:8080',
         changeOrigin: true,
         pathRewrite: {
-            "^/schedulerapi": "/scheduler/"
+          "^/schedulerapi": "/scheduler/"
         }
       },
     },

+ 0 - 1
src/components/ledger/handsontables/device.vue

@@ -389,7 +389,6 @@
                 }
                 getDataDictionary(params, (res) => {
                   this.tableHeader = res.Content
-                  console.log(this.tableHeader)
                   this.tableHeader.forEach((item) => {
                     if (item.Path) {
                       this.inputMap[item.Path] = item

+ 22 - 5
src/components/ledger/lib/cascader.vue

@@ -1,8 +1,9 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
-    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
-      @change="changeVal">
+    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable
+               :style="isWidth ? '' : 'width:160px;'" size="small"
+               @change="changeVal">
       <el-option v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
@@ -10,8 +11,9 @@
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
-import { getEquipBelongs, queryEquip } from "@/api/scan/request";
+import {mapGetters} from 'vuex';
+import {getEquipBelongs, queryEquip} from "@/api/scan/request";
+
 export default {
   name: "getCode",
   props: {
@@ -70,7 +72,7 @@ export default {
       this.$emit("change", value)
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
-    getData() {
+    getData(val) {
       let param2 = {
         Distinct: true,
         PageNumber: 1,
@@ -79,6 +81,20 @@ export default {
           "Category"
         ]
       }
+      if (val && val[0] != 'all') {
+        param2.Filters = ''
+        if (val[0] == "noKnow") {
+          param2.Filters += `;buildingId isNull`;
+        } else if (val[0] && val[0] != "all") {
+          param2.Filters += `;buildingId='${val[0]}'`;
+        }
+        if (val[1] == "noKnow") {
+          param2.Filters += `;floorId isNull`;
+        } else if (val[1] && val[1] != "all") {
+          param2.Filters += `;floorId='${val[1]}'`;
+        }
+        param2.Filters = param2.Filters.slice(1)
+      }
       let param1 = {
         data: {
           Distinct: true,
@@ -140,6 +156,7 @@ export default {
 #cascaderMap {
   float: left;
   margin-left: 10px;
+
   .buildFloor {
     color: #999999;
     font-size: 14px;

+ 33 - 10
src/views/ledger/facility/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="deviceList" >
+  <div id="deviceList">
     <router-link to="/ledger/facility/addfacility"></router-link>
     <router-view></router-view>
     <saga-title :mess="mess"></saga-title>
@@ -8,6 +8,11 @@
         <floor-cascader @change="changeFloor"></floor-cascader>
         <my-cascader ref="cascader" @change="changeDevice"></my-cascader>
         <el-button size="small" @click="handleLinkAssets" class="iconfont icon-batchassociation">批量关联资产</el-button>
+        <el-tooltip class="item" effect="dark" content="请选择建筑楼层和设备类" placement="top-start">
+          <el-button type="primary" class="deviceList-excel" :disabled="!((param.buildId != '' || param.buildId != 'all') && param.deviceId !='')">
+            深化点表导入
+          </el-button>
+        </el-tooltip>
       </div>
       <hanson-table @close="close" :graphyId="graphyId" ref="tableMain"></hanson-table>
     </div>
@@ -32,6 +37,7 @@ import {
   mapGetters,
   mapActions
 } from "vuex";
+
 export default {
   components: {
     sagaTitle,
@@ -67,12 +73,13 @@ export default {
       graphyId: null,
       dialog: {
         linkAssets: false
-      }
+      },
     };
   },
   computed: {
-    ...mapGetters("layout", [ "projectId", "projects", "secret", "userId" ])
+    ...mapGetters("layout", ["projectId", "projects", "secret", "userId"])
   },
+
   created() {
     this.param.ProjId = this.projectId
     this.param.secret = this.secret
@@ -91,22 +98,23 @@ export default {
       this.param.secret = this.secret
       this.getProjName()
       this.getCount()
-    }
+    },
+
   },
   methods: {
     getProjName() {
       this.projects.forEach((item) => {
-        if(item.id == this.projectId)
-        this.mess.perjectName = item.name
+        if (item.id == this.projectId)
+          this.mess.perjectName = item.name
       })
       // this.getEqCode()
     },
     close(val) {
       this.getCount()
-      if (val && this.$refs.cascader){
+      if (val && this.$refs.cascader) {
         this.$refs.cascader.changeVal(val.code)
       }
-        this.$refs.cascader.getData()
+      this.$refs.cascader.getData()
       //   this.$refs.tableMain.getHeaderData(this.param);
     },
     // getEqCode() {
@@ -151,6 +159,8 @@ export default {
     changeFloor(value) {
       if (value[0]) {
         this.param.buildId = value[0]
+      } else {
+        this.param.buildId = ''
       }
       if (value[1]) {
         this.param.floorId = value[1]
@@ -161,6 +171,8 @@ export default {
         if (this.$refs.tableMain)
           this.$refs.tableMain.getHeaderData(this.param);
       }
+      this.$refs.cascader.getData(value)
+
     },
 
     //修改设备族
@@ -170,6 +182,8 @@ export default {
         this.param.name = value.facility
         if (this.$refs.tableMain)
           this.$refs.tableMain.getHeaderData(this.param);
+      } else {
+        this.param.deviceId = ''
       }
     },
     // 批量关联资产
@@ -185,6 +199,7 @@ export default {
   height: 100%;
   background-color: #fff;
   position: relative;
+
   .table-main {
     position: absolute;
     top: 87px;
@@ -195,15 +210,23 @@ export default {
     // border-radius: 5px;
     // padding: 10px 0;
   }
+
   .search-header {
     overflow: hidden;
     padding-bottom: 10px;
     margin: 0 10px;
     border-bottom: 1px solid #bcbcbc;
-    .icon-batchassociation{
+
+    .deviceList-excel {
+      float: right;
+      margin-right: 15px;
+    }
+
+    .icon-batchassociation {
       float: right;
       font-size: 12px;
-      /deep/ span{
+
+      /deep/ span {
         margin-left: 5px;
       }
     }