Browse Source

修改竖井和租户的表头获取地址及逻辑修改

zhangyu 5 years ago
parent
commit
db1d230f28

+ 1 - 1
config/prod.env.js

@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     BASE_URL: '"http://172.16.0.239"', //测试iframe地址
     SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
+    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
 }

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -940,7 +940,7 @@ export default {
       let val = this.hot.colToProp(row.col);
       if (val == "caozuo") {
         window.open(`
-http://47.94.89.44:8058/asset?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
+http://adm.sagacloud.cn:8058/asset?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
         // this.iframeSrc =
         //   process.env.BASE_URL +
         //   ":8889/#/details?perjectId=" +

+ 2 - 2
src/components/ledger/handsontables/device.vue

@@ -1036,7 +1036,7 @@ export default {
       this.messKey = val
       this.systemId = infos.id
       if (val == "caozuo") {
-         window.open(`http://47.94.89.44:8058/spread?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
+         window.open(`http://adm.sagacloud.cn:8058/spread?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
          el.target.blur()
         // this.iframeSrc =
         //   process.env.BASE_URL +
@@ -1097,7 +1097,7 @@ export default {
           this.category = this.main[row.row]
           this.dialog.changeRea = true
         } else if(this.onlyRead) {
-          window.open(`http://47.94.89.44:8058/asset?id=${infos.linkId}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
+          window.open(`http://adm.sagacloud.cn:8058/asset?id=${infos.linkId}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
         }
       }
       if (val == "infos.EquipQRCode") {

+ 1 - 1
src/components/ledger/handsontables/system.vue

@@ -826,7 +826,7 @@ export default {
       }
       if (val == "caozuo") {
          window.open(`
-http://47.94.89.44:8058/system?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
+http://adm.sagacloud.cn:8058/system?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
         // this.iframeSrc =
         //   process.env.BASE_URL +
         //   ":8889/#/details?perjectId=" +

+ 9 - 12
src/utils/handsontable/notShow.js

@@ -582,9 +582,6 @@ const showTools = {
 
     showHeaderTypes(arr, typeArr, onlyRead, isWatch, allMess, falg = false) {
         let data = arr.map(item => {
-            if (item.FirstTag && !item.FirstTag == "") {
-                item.InfoPointCode = `${item.FirstTag}.${item.InfoPointCode}`
-            }
             if (falg) {
                 if (item.FirstTag == "控制参数" ||
                     item.FirstTag == "设定参数" ||
@@ -610,7 +607,7 @@ const showTools = {
 
                     if (item.InfoPointCode == "EquipQRCode") {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             renderer: text.lookQRCode,
                             readOnly: onlyRead
                         }
@@ -625,7 +622,7 @@ const showTools = {
                         item.InfoPointCode == "Drawing"
                     ) {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             renderer: text.picType,
                             readOnly: onlyRead
                         }
@@ -636,7 +633,7 @@ const showTools = {
                         item.InfoPointCode == "Archive" ||
                         item.InfoPointCode == "CheckReport") {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             renderer: text.fileType,
                             readOnly: onlyRead
                         }
@@ -644,7 +641,7 @@ const showTools = {
 
                     if (item.InputMode == "D1" || item.InputMode == "E1") { //单选
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             renderer: tools.customDropdownRenderer,
                             editor: "chosen",
                             readOnly: onlyRead,
@@ -654,7 +651,7 @@ const showTools = {
                         };
                     } else if (item.InputMode == "D2") {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             renderer: tools.customDropdownRenderer,
                             editor: "chosen",
                             readOnly: onlyRead,
@@ -665,7 +662,7 @@ const showTools = {
                         };
                     } else if (item.InputMode == "A1" || item.InputMode == "A2") {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             type: "numeric",
                             readOnly: onlyRead,
                             numericFormat: {
@@ -676,7 +673,7 @@ const showTools = {
                         };
                     } else if (item.InputMode == "C5") {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             type: "date",
                             dateFormat: "YYYY-MM-DD",
                             readOnly: onlyRead,
@@ -684,13 +681,13 @@ const showTools = {
                         };
                     } else if (item.InputMode == "Own" && !onlyRead) {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             renderer: text.idType,
                             readOnly: onlyRead
                         }
                     } else {
                         return {
-                            data: item.InfoPointCode,
+                            data: item.Path,
                             readOnly: onlyRead
                         };
                     }

+ 1 - 1
src/utils/point_edit/handson_header.js

@@ -155,7 +155,7 @@ const headers = {
 }
 
 let common = [{
-        InfoPointName: "原始点位描述",
+        InfoPointName: "*原始点位描述",
         InfoPointCode: "Description",
         InputMode: "B1",
         Visible: true,

+ 1 - 1
src/utils/scan/tools.js

@@ -455,7 +455,7 @@ tools.formatDataSource = function (data) {
         if(options) {
             options.forEach((item) =>{
                 arr.push({
-                    Code: item.id,
+                    Code: item.code,
                     Name: item.name
                 }) 
             })

+ 6 - 8
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -31,7 +31,7 @@ import text from "@/utils/handsontable/mainText"
 import session from "@/framework/utils/storage"
 
 import handsonTable from "@/components/common/handsontable"
-import { getCenoteTableHeader, createCenoteTableData } from "@/api/scan/request"
+import { getDataDictionary, getCenoteTableHeader, createCenoteTableData } from "@/api/scan/request"
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {
@@ -67,14 +67,12 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          "CollectFlag": this.allMess
-        }
+        PageNumber: 1,
+        PageSize: 500,
+        Filters: `type='Shaft'`
       }
-      await getCenoteTableHeader(param, res => {
-        this.tableHeader = res.Content
+      await getDataDictionary(param).then( res => {
+        this.tableHeader = res.data.Content
         this.initTable()
       })
     },

+ 17 - 15
src/views/ledger/cenotelist/index.vue

@@ -71,7 +71,7 @@ import text from "@/utils/handsontable/mainText"
 
 import cenoteType from "@/components/ledger/lib/cenoteType";
 import handsonTable from "@/components/common/handsontable";
-import { getCenoteTableHeader, getCenoteTableData, updataCenoteTableData, deleteCenoteTableData, saveCenoteRelateSpace } from "@/api/scan/request"
+import { getDataDictionary, getCenoteTableHeader, getCenoteTableData, updataCenoteTableData, deleteCenoteTableData, saveCenoteRelateSpace } from "@/api/scan/request"
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {
@@ -124,14 +124,12 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          "CollectFlag": this.allMess
-        }
+        PageNumber: 1,
+        PageSize: 500,
+        Filters: `type='Shaft'`
       }
-      await getCenoteTableHeader(param, res => {
-        this.tableHeader = res.Content;
+      await getDataDictionary(param).then( res => {
+        this.tableHeader = res.data.Content;
         this.getTableData()
       })
     },
@@ -174,14 +172,18 @@ export default {
       })
       //生成对应修改数据
       data.map((item, index) => {
-        let keyarr = change[index][1].split(".")
-        if (keyarr && keyarr.length > 1) {
-          item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
-        } else {
-          item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
-        }
+        // param.data.Projection.map(value => {
+        //   let itemData = tools.dataForKey(item, value)
+        //   tools.setDataForKey(item, value, itemData == "" ? null : itemData)
+        // })
+        // let keyarr = change[index][1].split(".")
+        // if (keyarr && keyarr.length > 1) {
+        //   item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
+        // } else {
+        //   item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
+        // }
         param.data.Content.push(item);
-      });
+      })
 
       await updataCenoteTableData(param, (res) => {
         

+ 1 - 1
src/views/ledger/facility/parts/index.vue

@@ -356,7 +356,7 @@ export default {
       let val = this.tableExample.colToProp(row.col);
       if (val == "caozuo") {
         window.open(
-          `http://47.94.89.44:8058/spread?id=${infos.EquipID}&pid=${
+          `http://adm.sagacloud.cn:8058/spread?id=${infos.EquipID}&pid=${
             this.projectId
           }&secret=${this.secret}`,
           "_blank"

+ 1 - 1
src/views/ledger/facility/partsmanage/index.vue

@@ -701,7 +701,7 @@ export default {
       let val = this.tableExample.colToProp(row.col);
       if (val == "caozuo") {
         window.open(
-          `http://47.94.89.44:8058/spread?id=${infos.EquipID}&pid=${
+          `http://adm.sagacloud.cn:8058/spread?id=${infos.EquipID}&pid=${
             this.projectId
           }&secret=${this.secret}`,
           "_blank"

+ 14 - 14
src/views/rent/rentlist/index.vue

@@ -71,7 +71,7 @@ import text from "@/utils/handsontable/mainText"
 
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import handsonTable from "@/components/common/handsontable"
-import { getRentTableHeader, getRentTableData, updataRentTableData, deleteRentTableData, saveRentRelateSpace } from "@/api/scan/request"
+import { getDataDictionary, getRentTableHeader, getRentTableData, updataRentTableData, deleteRentTableData, saveRentRelateSpace } from "@/api/scan/request"
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {
@@ -124,14 +124,14 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          "CollectFlag": this.allMess
-        }
+        // ProjId: this.projectId,
+        // secret: this.secret,
+        PageNumber: 1,
+        PageSize: 500,
+        Filters: `type='Tenant'`
       }
-      await getRentTableHeader(param, res => {
-        this.tableHeader = res.Content;
+      await getDataDictionary(param).then( res => {
+        this.tableHeader = res.data.Content;
         this.getTableData()
       })
     },
@@ -174,12 +174,12 @@ export default {
       })
       //生成对应修改数据
       data.map((item, index) => {
-        let keyarr = change[index][1].split(".")
-        if (keyarr && keyarr.length > 1) {
-          item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
-        } else {
-          item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
-        }
+        // let keyarr = change[index][1].split(".")
+        // if (keyarr && keyarr.length > 1) {
+        //   item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
+        // } else {
+        //   item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
+        // }
         param.data.Content.push(item);
       });
 

+ 8 - 8
src/views/rent/rentlist/rentadd/index.vue

@@ -31,7 +31,7 @@ import text from "@/utils/handsontable/mainText"
 import session from "@/framework/utils/storage"
 
 import handsonTable from "@/components/common/handsontable"
-import { getRentTableHeader, createRentTableData } from "@/api/scan/request"
+import { getDataDictionary, getRentTableHeader, createRentTableData } from "@/api/scan/request"
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {
@@ -66,14 +66,14 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          "CollectFlag": this.allMess
-        }
+        // ProjId: this.projectId,
+        // secret: this.secret,
+        PageNumber: 1,
+        PageSize: 500,
+        Filters: `type='Tenant'`
       }
-      await getRentTableHeader(param, res => {
-        this.tableHeader = res.Content
+      await getDataDictionary(param).then( res => {
+        this.tableHeader = res.data.Content
         this.initTable()
       })
     },