zhangyu 4 anni fa
parent
commit
e580a381d9

+ 4 - 4
config/index.js

@@ -210,8 +210,8 @@ module.exports = {
         }
       },
       '/api': {
-        // target: 'http://192.168.64.17:28888/',
-        target: 'http://192.168.64.14:28888/',
+        target: 'http://192.168.64.17:28888/',
+        // target: 'http://192.168.64.14:28888/',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -293,8 +293,8 @@ module.exports = {
         // 目标 API 地址
         // target: 'http://192.168.12.238:8080/',
         // target: 'http://60.205.177.43:28888',
-        target: 'http://192.168.64.14:28888',
-        // target: 'http://192.168.64.17:28888',
+        // target: 'http://192.168.64.14:28888',
+        target: 'http://192.168.64.17:28888',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL

+ 1 - 1
src/api/scan/request.js

@@ -1900,7 +1900,7 @@ export function linkShaft(param, success) {
 
 //系统所在的竖井,竖井一对多,累计添加,此方法不会覆盖以前记录
 export function linkSySh(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-sh/link-sy-sh`;
+  let url = `${baseUrl}${rel}/sy-in-sh/link-sy-sh`;
   http.postJson(url, param, success)
 }
 

+ 2 - 2
src/components/ledger/cenote/dialog/addSystemDialog.vue

@@ -98,8 +98,8 @@ export default {
     savaRelation() {
       if(this.selections.length){
         let params = {
-          ShaftId: this.params.ShaftID,
-          SysIdList: this.selections.map(item => {
+          shaftId: this.params.ShaftID,
+          sysIdList: this.selections.map(item => {
             return item.id
           })
         }

+ 3 - 3
src/components/ledger/cenote/table/systemTable.vue

@@ -11,15 +11,15 @@
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.SysLocalName||scope.row.SysName||''}}
+              {{scope.row.localName||scope.row.name||''}}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="SysLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.CategoryNames.CategoryName}}
+              {{scope.row.categoryNames.categoryName}}
             </div>
           </template>
         </el-table-column>

+ 1 - 1
src/components/ledger/details/detail/cruxDialog.vue

@@ -99,7 +99,7 @@ export default {
         setDataDictionary(param, res => {
           this.dialogFormVisible = false
           this.$emit('cruxSuccess')
-          this.$message('保存成功')
+          this.$message.success('保存成功')
 
         });
 

+ 5 - 30
src/views/ledger/facility/details/index.vue

@@ -227,6 +227,9 @@ export default {
               })
             }
           }
+					if (this.instance.hasOwnProperty(item.path)) {
+						item.value = this.instance[item.path]
+					}
         })
         let params = { //获取动态参数
           groupCode: this.group_code,
@@ -271,15 +274,8 @@ export default {
     },
     handleEnclosure() {
       //图片文件处理,脱离radio控制
-      let isList = this.pointData
       let isArr = []
-      isList.map(j => {
-        if (this.instance.hasOwnProperty(j.path)) {
-          j.value = this.instance[j.path]
-          return j
-        }
-      })
-      isArr = isList.filter(k => k.value)
+      isArr = this.pointData.filter(k => k.value)
       this.handlePicList(isArr)
       this.handleFileList(isArr)
     },
@@ -298,31 +294,10 @@ export default {
 
       if (val == 1) { //需采集信息
         arr = this.pointData.filter(i => i.visible)
-        // //  图片和的处理
-        // this.handlePicList(arr)
-        // //  文件处理
-        // this.handleFileList(arr)
-
       } else if (val == 2) { //有值信息点
-        let list = this.pointData
-        list.map(j => {
-          if (this.instance.hasOwnProperty(j.path)) {
-            return {
-              ...j,
-              value: this.instance[j.path]
-            }
-
-
-          }
-        })
-        arr = list.filter(k => k.value)
-        // this.handlePicList(arr, 2)
-        // this.handleFileList(arr, 2)
-
+        arr = this.pointData.filter(k => k.value)
       } else { //全部信息点
         arr = this.pointData
-        // this.handlePicList(arr)
-        // this.handleFileList(arr)
       }
       this.displayData(arr)
     },

+ 24 - 24
src/views/ledger/report/index.vue

@@ -162,64 +162,64 @@ export default {
       zoneSpaceCount: null,// 业务空间总数
       zoneType: [// 分区类型
         {
-          "Code": "GeneralZone",
-          "Name": "默认分区",
+          "code": "GeneralZone",
+          "name": "默认分区",
           "Rel_type": "99"
         },
         {
-          "Name": "供电分区",
+          "name": "供电分区",
           "Rel_type": "1",
-          "Code": "PowerSupplyZone"
+          "code": "PowerSupplyZone"
         },
         {
-          "Name": "照明分区",
+          "name": "照明分区",
           "Rel_type": "2",
-          "Code": "LightingZone"
+          "code": "LightingZone"
         },
         {
-          "Name": "网络分区",
+          "name": "网络分区",
           "Rel_type": "3",
-          "Code": "NetworkZone"
+          "code": "NetworkZone"
         },
         {
-          "Code": "AirConditioningZone",
-          "Name": "空调分区",
+          "code": "AirConditioningZone",
+          "name": "空调分区",
           "Rel_type": "4"
         },
         {
-          "Name": "采暖分区",
+          "name": "采暖分区",
           "Rel_type": "5",
-          "Code": "HeatingZone"
+          "code": "HeatingZone"
         },
         {
-          "Name": "洁净分区",
+          "name": "洁净分区",
           "Rel_type": "6",
-          "Code": "CleanZone"
+          "code": "CleanZone"
         },
         {
-          "Name": "生活给水分区",
+          "name": "生活给水分区",
           "Rel_type": "7",
-          "Code": "DomesticWaterSupplyZone"
+          "code": "DomesticWaterSupplyZone"
         },
         {
-          "Code": "FireZone",
-          "Name": "防火分区",
+          "code": "FireZone",
+          "name": "防火分区",
           "Rel_type": "8"
         },
         {
-          "Name": "安防分区",
+          "name": "安防分区",
           "Rel_type": "9",
-          "Code": "SecurityZone"
+          "code": "SecurityZone"
         },
         {
-          "Name": "租户分区",
+          "name": "租户分区",
           "Rel_type": "10",
-          "Code": "TenantZone"
+          "code": "TenantZone"
         },
         {
-          "Name": '功能分区',
+          "name": '功能分区',
           'Rel_type': '11',
-          "Code": 'FunctionZone'
+          "code": 'FunctionZone'
         }
       ],
       partProtion: [],// 业务空间-各分区占比数据