Pārlūkot izejas kodu

Merge branch 'dataType' of http://39.106.8.246:3003/web/adm into dataType

haojianlong 4 gadi atpakaļ
vecāks
revīzija
558c330e99

+ 6 - 3
src/api/scan/httpUtil.js

@@ -1,4 +1,4 @@
-import { Message } from 'element-ui';
+import {Message} from 'element-ui';
 import fetch from './fetch'
 import storage from '@/framework/utils/storage'
 
@@ -52,12 +52,13 @@ export default {
     let ProjectId = localStorage.getItem("projectId")
     // let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
+    let group_code = localStorage.getItem("group_code")
     let vm = this;
     fetch({
       url: url,
       method: 'get',
       params: data,
-      headers: { 'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName }
+      headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName, 'group_code': group_code}
     }).then((response) => {
       successResponse(vm, response, success, failed)
     }).catch(error => {
@@ -68,12 +69,14 @@ export default {
     let ProjectId = localStorage.getItem("projectId")
     // let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
+    let group_code = localStorage.getItem("group_code")
+
     let vm = this;
     fetch({
       url: url,
       method: 'post',
       data: data,
-      headers: { 'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName }
+      headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName, 'group_code': group_code}
     }).then((response) => {
       successResponse(vm, response, success, failed)
     }).catch(error => {

+ 5 - 5
src/components/business_space/business/handsontable.vue

@@ -95,7 +95,7 @@ import {
   zoneQuery,
   zoneUpdate
 } from "@/api/scan/request";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import dialogZone from "../../ledger/addDialog/dialogZone";
 
 export default {
@@ -112,11 +112,11 @@ export default {
     spaceCascader,
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   data() {
@@ -643,7 +643,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

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

@@ -129,7 +129,7 @@ import {
   queryProperty,
   updateProperty
 } from "@/api/scan/request";
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/scan/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
@@ -143,7 +143,7 @@ import myPagination from "@/components/common/myPagination"
 import myCascader from "@/components/ledger/lib/assets"
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import dieCascader from "@/components/ledger/lib/partsDieList"
-import { mapGetters } from "vuex"
+import {mapGetters} from "vuex"
 //图片查看
 import lookPic from "@/components/ledger/lib/lookImages"
 import Handsontable from "handsontable-pro"
@@ -173,11 +173,11 @@ export default {
     buildFloor.getData(this.buildFloorData)
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", 'group_code']),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   data() {
@@ -400,7 +400,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

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

@@ -151,7 +151,7 @@ export default {
     buildFloor.getData(this.buildFloorData);
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead
         ? [
@@ -459,7 +459,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 7 - 13
src/components/ledger/handsontables/system.vue

@@ -64,13 +64,8 @@
   </div>
 </template>
 <script>
-import {
-  BeatchQueryParam,
-  querySysLinkBuild,
-  updateGeneralSys,
-  deleteGeneralSys
-} from "@/api/scan/request"
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, deleteGeneralSys, querySysLinkBuild, updateGeneralSys} from "@/api/scan/request"
+import {getDataDictionary} from "@/api/dict";
 
 import myCascader from "@/components/ledger/lib/system";
 import tools from "@/utils/scan/tools";
@@ -88,7 +83,7 @@ import text from "@/utils/handsontable/mainText"
 import 'handsontable-pro/dist/handsontable.full.css'
 import editSysfloor from "@/components/ledger/lib/editSysFloor";
 
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -103,11 +98,11 @@ export default {
     editSysfloor
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   data() {
@@ -283,7 +278,6 @@ export default {
     },
     //选择设备类型-添加设备
     changeAddType(val) {
-      console.log(val, '=====================')
       this.addData.Category = val.classCode;
       this.addData.CategoryName = val.name;
       this.addData.showType = this.showType;
@@ -331,7 +325,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 2 - 2
src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -34,7 +34,7 @@
         </el-table-column>
         <el-table-column prop="objectType" :label="`空间类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            {{ spaceType[scope.row.objectType] || '' }}
+            {{ spaceType[scope.row.classCode] || '' }}
           </template>
         </el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
@@ -167,7 +167,7 @@ export default {
         params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
       }
       if (this.Spacecategory) {
-        params.data.filters += `;objectType='${this.Spacecategory}'`;
+        params.data.filters += `;classCode='${this.Spacecategory}'`;
       }
       if (this.keycode != "") {
         params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}'`;

+ 94 - 72
src/framework/layout/layout-store.js

@@ -23,117 +23,135 @@ export default {
       "system:role:setOpts": true
     },
     projectId: 'Pj1101051029',
-    projects: [
+    group_code: '',
+    projects: [ // 14 全平台测试环境
       {
         id: "Pj1101051029",
         name: "北京万达广场",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "WD"
       },
       {
         id: "Pj1101050029",
         name: "东坝万达广场",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "WD"
       },
       {
         id: "Pj4403070003",
         name: "深圳龙岗万达广场",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "WD"
       },
       {
         id: "Pj5001120003",
         name: "香港置地约克北郡",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "XG"
       },
 
       {
         id: "Pj1101050013",
         name: "BIM测试项目_亚投行",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "BT"
+
       },
       {
         id: "Pj1101080259",
         name: "博锐尚格北京总部办公楼",
-        pwd: "saga123456"
-      },], // 14 全平台测试环境
-    // projects: [
+        pwd: "saga123456",
+        group_code: "BR"
+
+      },],
+    // projects: [// 39,18环境
     //   {
     //     id: "Pj1101051029",
     //     name: "北京万达广场",
-    //     pwd: "saga123456"
+    //     pwd: "saga123456",
+    //     group_code: "WD"
     //   }, {
     //     id: "Pj0001110001",
     //     name: "飞龙商场",
-    //     pwd: "saga123456"
-    //   },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
     //     id: "Pj1101050029",
     //     name: "东坝万达广场",
-    //     pwd: "saga123456"
-    //   },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
     //     id: "Pj4403070003",
     //     name: "深圳龙岗万达广场",
-    //     pwd: "saga123456"
-    //   },
-    //     {
-    //       id: "Pj4403050019",
-    //       name: "招商深圳太子广场汇港二期",
-    //       pwd: "saga123456"
-    //     },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj4403050019",
+    //     name: "招商深圳太子广场汇港二期",
+    //     pwd: "saga123456",
+    //     group_code: "ZS"
+    //   }, {
     //     id: "Pj5001120003",
     //     name: "香港置地约克北郡",
-    //     pwd: "saga123456"
-    //   },
-    //     {
-    //       id: "Pj3201110003",
-    //       name: "弘阳集团弘云智慧管理平台",
-    //       pwd: "saga123456"
-    //     }, {
-    //       id: "Pj3702020002",
-    //       name: "青岛海天中心",
-    //       pwd: "saga123456"
-    //     }, {
-    //       id: "Pj1101010006",
-    //       name: "亚投行",
-    //       pwd: "saga123456"
-    //     },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "XG"
+    //   }, {
+    //     id: "Pj3201110003",
+    //     name: "弘阳集团弘云智慧管理平台",
+    //     pwd: "saga123456",
+    //     group_code: "HY"
+    //   }, {
+    //     id: "Pj3702020002",
+    //     name: "青岛海天中心",
+    //     pwd: "saga123456",
+    //     group_code: "GX"
+    //   }, {
+    //     id: "Pj1101010006",
+    //     name: "亚投行",
+    //     pwd: "saga123456",
+    //     group_code: "BT"
+    //   }, {
     //     id: "Pj1101050013",
     //     name: "BIM测试项目_亚投行",
-    //     pwd: "saga123456"
-    //   },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "BT"
+    //   }, {
     //     id: "Pj1101080259",
     //     name: "博锐尚格北京总部办公楼",
-    //     pwd: "saga123456"
-    //   },
-    //     {
-    //       id: "Pj1101150002",
-    //       name: "华润生命科学园",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj3101150007",
-    //       name: "招商上海森兰花园城",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj5101080004",
-    //       name: "成都招商花园城",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj3201130004",
-    //       name: "招商南京燕子矶花园城",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj3702120001",
-    //       name: "金融中心",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj1101051130",
-    //       name: "万达模型测试项目2",
-    //       pwd: "saga123456"
-    //     }
-    // ],  // 39,18环境
+    //     pwd: "saga123456",
+    //     group_code: "BR"
+    //   }, {
+    //     id: "Pj1101150002",
+    //     name: "华润生命科学园",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj3101150007",
+    //     name: "招商上海森兰花园城",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj5101080004",
+    //     name: "成都招商花园城",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj3201130004",
+    //     name: "招商南京燕子矶花园城",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj3702120001",
+    //     name: "金融中心",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj1101051130",
+    //     name: "万达模型测试项目2",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }
+    // ],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码
@@ -168,6 +186,7 @@ export default {
       }
       return state.projectId
     },
+    group_code: state => state.group_code,
     breadcrumb: state => {
       if (!state.breadcrumb) {
         let arr = storage.get(KEY_PAGE_BRANDCRUMB)
@@ -204,6 +223,8 @@ export default {
       state.projects.map((item) => {
         if (item.id == val) {
           state.secret = item.pwd
+          state.group_code = item.group_code
+          localStorage.setItem('group_code', item.group_code)
           localStorage.setItem('secret', item.pwd)
         }
       })
@@ -245,7 +266,8 @@ export default {
                 state.projects.push({
                   id: proj.ProjId,
                   name: proj.ProjLocalName,
-                  pwd: proj.Secret ? proj.Secret : ""
+                  pwd: proj.Secret ? proj.Secret : "",
+                  // group_code
                 })
               )
             }

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

@@ -55,18 +55,17 @@
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
-import text from "@/utils/handsontable/mainText"
 import cenoteType from "@/components/ledger/lib/cenoteType";
 import handsonTable from "@/components/common/handsontable";
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 import {
-  queryCenoteTableData,
-  updataCenoteTableData,
+  BeatchQueryParam,
   deleteCenoteTableData,
+  queryCenoteTableData,
   saveCenoteRelateSpace,
-  BeatchQueryParam
+  updataCenoteTableData
 } from "@/api/scan/request"
-import { mapGetters, mapActions } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -117,11 +116,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", [
-      "projectId",
-      "secret",
-      "userId"
-    ]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
         [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
@@ -338,7 +333,7 @@ export default {
         },
         readOnly: true
       }, {
-        data: "OtheRelations",
+        data: "otheRelations",
         renderer: (instance, td, row, col, prop, value, cellProperties) => {
           td.style.color = "#409EFF";
           td.style.cursor = "pointer";
@@ -382,14 +377,14 @@ export default {
       let inputData = this.inputMap[val]
       let name = infos.localName ? infos.localName : infos.name
       this.shaftId = infos.id //要操作的数据id
-      //点击关联的空间
+      //点击关联的业务空间
       if (val === "spaceList") {
         this.$router.push({
           path: '/ledger/relatedSpace',
           query: { ShaftId: this.shaftId, name: name, onlyRead: this.onlyRead }
         })
         return false
-      } else if (val === "OtheRelations") {
+      } else if (val === "otheRelations") {
         this.$router.push({
           path: "/ledger/cenoteDetail",
           query: {
@@ -489,7 +484,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 2 - 1
src/views/ledger/cenotelist/relatedSpace.vue

@@ -215,6 +215,7 @@ export default {
           this.buildingLoading = false;
           this.buildingList = res.content;
           this.buildingList = this.buildingList.map(item => {
+						debugger
             item.floor = item.floorList;
             item.BuildID = item.BuildingId;
             item.BuildLocalName = item.BuildingLocalName;
@@ -312,7 +313,7 @@ export default {
     },
     //更换楼层
     changeFloor(floorObj) {
-      this.buildFloorName = `${this.buildingObj.BuildLocalName || this.buildingObj.BuildName || ""}-${floorObj.FloorLocalName || floorObj.FloorName || ""}`
+      this.buildFloorName = `${this.buildingObj.localName || this.buildingObj.name || ""}-${floorObj.localName || floorObj.name || ""}`
       this.floor = floorObj.id;
       let buildfloor = [this.building, floorObj.id]
       this.$refs.cenotegraphy.getFloorMap(buildfloor, this.ObjectType)

+ 2 - 2
src/views/ledger/facility/batchlink.vue

@@ -240,8 +240,8 @@ export default {
       if (Object.keys(this.radio).length) {
         for (let key in this.radio) {
           params.content.push({
-            equipId: this.radio[key],
-            equipmentId: key
+            id: this.radio[key],
+            equipId: key
           })
           console.log(params.content)
         }

+ 6 - 6
src/views/ledger/facility/details/index.vue

@@ -79,10 +79,10 @@ import exhibitionEnergy from "@/components/ledger/details/detail/exhibitionEnerg
 import exhibitionMaintain from "@/components/ledger/details/detail/exhibitionMaintain";
 import selectRadio from "@/components/ledger/details/detail/selectRadio";
 import tools from "@/utils/scan/tools"
-import { BeatchQueryParam } from "@/api/scan/request";
-import { getDataDictionary } from "@/api/dict";
-import { queryEquip } from "@/api/object/equip"
-import { mapGetters } from "vuex";
+import {BeatchQueryParam} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/dict";
+import {queryEquip} from "@/api/object/equip"
+import {mapGetters} from "vuex";
 
 export default {
   name: "deviceDetails",
@@ -105,7 +105,7 @@ export default {
     this.getData();
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"])
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"])
   },
   data() {
     return {
@@ -229,7 +229,7 @@ export default {
           }
         })
         let params = { //获取动态参数
-          groupCode: "WD",
+          groupCode: this.group_code,
           appId: "datacenter",
           projectId: this.projectId,
           data: []

+ 5 - 12
src/views/ledger/facility/parts/index.vue

@@ -46,9 +46,7 @@
 </template>
 <script>
 import tools from "@/utils/scan/tools";
-import handsonUtils from "@/utils/hasontableUtils";
 import showTools from "@/utils/handsontable/notShow";
-import text from "@/utils/handsontable/mainText";
 
 import qrcode from "@/components/ledger/lib/qrcode";
 import firm from "@/components/dialogs/list/firm";
@@ -62,14 +60,9 @@ import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog";
 import picDialog from "@/components/dialogs/list/picDialog";
 import systemType from "@/components/dialogs/list/systemType";
 import handsonTable from "@/components/common/handsontable";
-import {
-  getEquipPartsType,
-  getEquipPartsCon,
-  deleteParts,
-  BeatchQueryParam
-} from "@/api/scan/request";
-import { getDataDictionary } from "@/api/dict";
-import { mapGetters, mapActions } from "vuex";
+import {BeatchQueryParam, deleteParts, getEquipPartsCon, getEquipPartsType} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/dict";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -140,7 +133,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"])
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"])
   },
   created() {
     this.queryParam = this.$route.query;
@@ -477,7 +470,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 82 - 132
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -31,22 +31,29 @@
     </el-row>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
-    <!-- 型号弹窗 -->
-    <firm :mess="{deviceId: firmId}" ref="firm" @changeFirm="firmChange" :dialog="myDialog"></firm>
-    <!-- 供应商合同弹窗 -->
-    <supply-dialog ref="supply" @change="supplyChange" :id="id" :dialog="myDialog"></supply-dialog>
-    <!-- 供应商弹窗 -->
-    <supplier-dialog ref="supplier" @changeSupplier="supplierChange" :dialog="myDialog"></supplier-dialog>
-    <guarantee-dialog :id="id" ref="guarantee" @change="guaranteeChange" :dialog="myDialog"></guarantee-dialog>
     <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
                          :dialog="myDialog">
     </upload-files-dialog>
     <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr"
                        :dialog="myDialog"></upload-img-dialog>
-    <maintainer-dialog @changeMaintainer="changeMaintainer" ref="maintainer" :dialog="myDialog"></maintainer-dialog>
-    <insurer-dialog @changeInsurer="changeInsurer" ref="insurer" :dialog="myDialog"></insurer-dialog>
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
+    <!-- 不支持的输入方式 -->
+    <el-dialog title="临时维护信息点" :visible.sync="myDialog.update" @close="handleCloseUpdate" width="670px">
+      <el-row>
+        该信息点未定义对应组件,现在维护数据不确定后续是否可用。如确实需要维护,请点击
+        <el-link @click="updateInputShow = true" type="primary" :underline="false">继续维护</el-link>
+        。
+      </el-row>
+      <el-row style="margin-top:20px;" v-show="updateInputShow">
+        <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" placeholder="请输入内容"
+                  v-model="updateInput"></el-input>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="myDialog.update = false">取 消</el-button>
+        <el-button type="primary" @click="handleClickUpdate">确 认</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -68,12 +75,6 @@ import { getDataDictionary } from "@/api/dict";
 import { mapGetters, mapActions } from "vuex";
 
 import qrcode from "@/components/ledger/lib/qrcode";
-import firm from "@/components/dialogs/list/firm";
-import supplyDialog from "@/components/dialogs/list/supplyDialog";
-import supplierDialog from "@/components/dialogs/list/supplierDialog";
-import maintainerDialog from "@/components/dialogs/list/maintainerDialog";
-import insurerDialog from "@/components/dialogs/list/insurerDialog";
-import guaranteeDialog from "@/components/dialogs/list/guaranteeDialog";
 import uploadFilesDialog from "@/components/dialogs/list/filesDialog";
 import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog";
 import picDialog from "@/components/dialogs/list/picDialog";
@@ -81,12 +82,6 @@ import picDialog from "@/components/dialogs/list/picDialog";
 export default {
   components: {
     qrcode, //二维码页面
-    firm, //品牌型号弹窗
-    supplyDialog,
-    supplierDialog,
-    maintainerDialog,
-    insurerDialog,
-    guaranteeDialog,
     uploadFilesDialog,
     uploadImgDialog,
     picDialog,
@@ -112,12 +107,6 @@ export default {
       category: "", //当前设备类
       myDialog: {
         qrcode: false, //二维码弹窗
-        firm: false, //厂商弹窗
-        supply: false, //选择供应合同
-        supplier: false, //供应商选择
-        guarantee: false, //选择保单
-        maintainer: false, //选择维修商
-        insurer: false, //选择保险公司
         uploadFiles: false, //上传文件
         uploadImgs: false, //上传单个图片
         pic: false, //多个图片
@@ -125,8 +114,22 @@ export default {
         systemType: false,
         details: false, //详情页
         changeRea: false,
-        lookPic: false //图片查看
+        lookPic: false, //图片查看
+        update: false,//临时维护信息点
       },
+      inputMap: {
+        flowBuild: {
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild",
+          category: 'STATIC',
+          dataType: "ENUM"
+        }
+      }, //信息点和输入方式映射表
+      updateInputShow: false, //是否显示临时维护输入框
+      updateInfoPoint: '',//临时维护信息点
+      updateInput: '', //临时维护信息点值
       qrcodeUrl: "", //二维码图片地址
       filesArr: [], //保存临时的文件key
       imgsArr: [], //临时保存的图片key数组
@@ -174,6 +177,11 @@ export default {
       };
       await getDataDictionary(params, res => {
         this.tableHeader = res.content;
+        this.tableHeader.forEach(item => {
+          if (item.path) {
+            this.inputMap[item.path] = item
+          }
+        });
         this.initTable();
       });
     },
@@ -335,60 +343,6 @@ export default {
       }
       return a;
     },
-    //选择型号修改
-    firmChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpManufacturerId", data.venderId); //生产商ID
-      tools.setDataForKey(this.tableData[this.row], "dpBrandId", data.brandId); //品牌ID
-      tools.setDataForKey(this.tableData[this.row], "dpSpecificationId", data.specificationId); //型号ID
-      tools.setDataForKey(this.tableData[this.row], "infos.manufacturer", data.venderName);
-      tools.setDataForKey(this.tableData[this.row], "infos.brand", data.name);
-      tools.setDataForKey(this.tableData[this.row], "infos.specification", data.brandName);
-    },
-    //供应商变更
-    supplierChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId);
-      tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name);
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierPhone', data.contacts[0]?data.contacts[0].phone:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierContactor', data.contacts[0]?data.contacts[0].name:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierWeb', data.website?data.website:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierEmail', data.contacts[0]?data.contacts[0].email:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierFax', data.contacts[0]?data.contacts[0].fax:null)
-    },
-    //保险商变更
-    changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId);
-      tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name);
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerWeb', data.website?data.website:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerEmail', data.contacts[0]?data.contacts[0].email:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerFax', data.contacts[0]?data.contacts[0].fax:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerPhone', data.contacts[0]?data.contacts[0].phone:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerContactor', data.contacts[0]?data.contacts[0].name:null)
-    },
-    //维修商变更
-    changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId);
-      tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name);
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerWeb', data.website?data.website:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerContactor', data.contacts[0]?data.contacts[0].name:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerPhone', data.contacts[0]?data.contacts[0].phone:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerEmail', data.contacts[0]?data.contacts[0].email:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerFax', data.contacts[0]?data.contacts[0].fax:null)
-    },
-    supplyChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", { id: data });
-    },
-    //保险合同
-    guaranteeChange(data) {
-      for (let key in data) {
-        this.utilToKey(key, "insuranceNo", data, "insuranceNum");
-        if (key == "contractFile") {
-          if (!!data[key]) {
-            data[key] = [data[key]];
-          }
-        }
-        this.utilToKey(key, "contractFile", data, "insuranceFile");
-      }
-    },
     //上传文件弹窗触发事件
     fileChange(keys) {
       this.setDataToMain(keys, this.messKey, this.row);
@@ -448,60 +402,34 @@ export default {
     getInfors(infos, row) {
       //其他的开始判断
       let val = this.tableExample.colToProp(row.col);
+      let inputData = this.inputMap[val];
+      this.row = row.row;
+      this.messKey = val;
       //设备二维码图片
       if (val == "defaultQRCode") {
         this.myDialog.qrcode = true;
         this.$refs.qrcode.getCanvas(1111);
       }
-      //关联系统
-      if (val == "linkSystem") {
-        // this.systemList = this.tableData[row.row].linkSystem || [];
-        this.myDialog.systemType = true;
-      }
-      //品牌型号弹窗
-      if (val == "dpManufacturerId") {
-        this.myDialog.firm = true;
-      }
-      //供应商信息弹窗
-      if (val == "dpSupplierId") {
-        this.myDialog.supplier = true;
-      }
-      //维修商信息弹窗
-      if (val == "dpMaintainerId") {
-        this.myDialog.maintainer = true;
-      }
-      //保险公司信息
-      if (val == "dpInsurerId") {
-        this.myDialog.insurer = true;
-      }
-      //供应合同编号
-      if (val == "infos.supplierContractID") {
-        let falg = null;
-        let data = this.tableData[row.row].dpSupplierId;
-        if (data) {
-          falg = data.split("-")[0];
-        }
-        if (!!falg) {
-          this.id = falg;
-          this.myDialog.supply = true;
-        } else {
-          this.$message("请先选择供应商");
-        }
-      }
-      //保险单号
-      if (val == "infos.insuranceNum") {
-        //选择保单
-        let falg = null;
-        let data = this.tableData[row.row].dpInsurerId
-        if (data) {
-          falg = data.split("-")[0];
-        }
-        if (!!falg) {
-          this.id = falg;
-          this.myDialog.guarantee = true;
-        } else {
-          this.$message("请先选择保险商");
+      if (
+        val == "flowBuild" || //所属建筑楼层
+        val == "infos.productDate" || //生产日期
+        val == "infos.serialNum" || //出厂编号
+        val == "infos.assetID" || //资产编号
+        val == "infos.purchasePrice" || //采购价格
+        val == "infos.insuranceNum" || //保险单号
+        val == "infos.insuranceFile" //保险文件
+      ) {
+        const propertyId = this.tableData[row.row].propertyId;
+        if (!propertyId) { //未关联资产
+            this.$confirm('请先关联资产再维护该信息!', '提示', {
+                confirmButtonText: '确定',
+                showCancelButton: false,
+                type: 'warning'
+            }).then(() => {
+                return false;
+            });
         }
+        return false
       }
       //保险文件--设备文档--安装质检报告
       if (
@@ -539,8 +467,30 @@ export default {
         this.picsArr = data ? data : []
         this.myDialog.pic = true;
       }
-      this.row = row.row;
-      this.messKey = val;
+      if (!this.onlyRead && !inputData.editable) {
+        this.$message("该信息点的值为自动生成,不可人工维护!");
+        return false;
+      }
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.dataType) == '-1') {
+        this.updateInfoPoint = val;
+        this.updateInput = tools.dataForKey(this.tableData[row.row], val);
+        this.myDialog.update = true;
+        return false;
+      }
+    },
+    //关闭临时维护弹窗回调
+    handleCloseUpdate() {
+      this.updateInputShow = false
+      this.updateInfoPoint = ''
+      this.updateInput = ''
+    },
+    //更新临时维护信息点
+    handleClickUpdate() {
+      tools.setDataForKey(this.tableData[this.row], this.updateInfoPoint, this.updateInput)
+      this.handleUpdataTable([[this.row, this.updateInfoPoint, null, this.updateInput]], "edit")
+      this.updateInputShow = false
+      this.myDialog.update = false
+      this.updateInput = ''
     },
     utilToKey(key, name, data, messName) {
       if (key == name) {

+ 20 - 187
src/views/ledger/facility/partsmanage/index.vue

@@ -44,20 +44,11 @@
                    :total="page.total"></el-pagination>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
-    <!-- 型号弹窗 -->
-    <firm :mess="{deviceId: firmId}" ref="firm" @changeFirm="firmChange" :dialog="myDialog"></firm>
-    <!-- 供应商合同弹窗 -->
-    <supply-dialog ref="supply" @change="supplyChange" :id="id" :dialog="myDialog"></supply-dialog>
-    <!-- 供应商弹窗 -->
-    <supplier-dialog ref="supplier" @changeSupplier="supplierChange" :dialog="myDialog"></supplier-dialog>
-    <guarantee-dialog :id="id" ref="guarantee" @change="guaranteeChange" :dialog="myDialog"></guarantee-dialog>
     <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
                          :dialog="myDialog">
     </upload-files-dialog>
     <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr"
                        :dialog="myDialog"></upload-img-dialog>
-    <maintainer-dialog @changeMaintainer="changeMaintainer" ref="maintainer" :dialog="myDialog"></maintainer-dialog>
-    <insurer-dialog @changeInsurer="changeInsurer" ref="insurer" :dialog="myDialog"></insurer-dialog>
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
     <!-- 关联资产 -->
@@ -100,12 +91,6 @@ import { getDataDictionary } from "@/api/dict";
 import { mapGetters, mapActions } from "vuex";
 
 import qrcode from "@/components/ledger/lib/qrcode";
-import firm from "@/components/dialogs/list/firm";
-import supplyDialog from "@/components/dialogs/list/supplyDialog";
-import supplierDialog from "@/components/dialogs/list/supplierDialog";
-import maintainerDialog from "@/components/dialogs/list/maintainerDialog";
-import insurerDialog from "@/components/dialogs/list/insurerDialog";
-import guaranteeDialog from "@/components/dialogs/list/guaranteeDialog";
 import uploadFilesDialog from "@/components/dialogs/list/filesDialog";
 import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog";
 import picDialog from "@/components/dialogs/list/picDialog";
@@ -114,12 +99,6 @@ import changeRea from "@/components/dialogs/changeRea"
 export default {
   components: {
     qrcode, //二维码页面
-    firm, //品牌型号弹窗
-    supplyDialog,
-    supplierDialog,
-    maintainerDialog,
-    insurerDialog,
-    guaranteeDialog,
     uploadFilesDialog,
     uploadImgDialog,
     picDialog,
@@ -166,12 +145,6 @@ export default {
       partsTypeList: [], //tabs
       myDialog: {
         qrcode: false, //二维码弹窗
-        firm: false, //厂商弹窗
-        supply: false, //选择供应合同
-        supplier: false, //供应商选择
-        guarantee: false, //选择保单
-        maintainer: false, //选择维修商
-        insurer: false, //选择保险公司
         uploadFiles: false, //上传文件
         uploadImgs: false, //上传单个图片
         pic: false, //多个图片
@@ -485,111 +458,6 @@ export default {
       }
       return a;
     },
-    //选择型号修改
-    firmChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpManufacturerId", data.venderId); //生产商ID
-      tools.setDataForKey(this.tableData[this.row], "dpBrandId", data.brandId); //品牌ID
-      tools.setDataForKey(this.tableData[this.row], "dpSpecificationId", data.specificationId); //型号ID
-      tools.setDataForKey(this.tableData[this.row], "infos.manufacturer", data.venderName);
-      tools.setDataForKey(this.tableData[this.row], "infos.brand", data.name);
-      tools.setDataForKey(this.tableData[this.row], "infos.specification", data.brandName);
-      this.handleUpdataTable(
-        [
-          [this.row, "dpManufacturerId", null, data.venderId],
-          [this.row, "dpBrandId", null, data.brandId],
-          [this.row, "dpSpecificationId", null, data.specificationId],
-          [this.row, "infos.manufacturer", null, data.venderName],
-          [this.row, "infos.brand", null, data.brandName],
-          [this.row, "infos.specification", null, data.name]
-        ],
-        "edit"
-      )
-      // this.handleUpdataTable([[this.row, "LedgerParam.equipManufactor.Brand", null, data.brand]], "edit")
-      // this.handleUpdataTable([[this.row, "LedgerParam.equipManufactor.Specification", null, data.name]], "edit")
-    },
-    //供应商变更
-    supplierChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId);
-      tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name);
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierPhone', data.contacts[0]?data.contacts[0].phone:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierContactor', data.contacts[0]?data.contacts[0].name:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierWeb', data.website?data.website:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierEmail', data.contacts[0]?data.contacts[0].email:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.supplierFax', data.contacts[0]?data.contacts[0].fax:null)
-      this.handleUpdataTable(
-        [
-          [this.row, "dpSupplierId", null, data.venderId],
-          [this.row, "infos.supplier", null, data.name],
-          [this.row, 'infos.supplierPhone', null, data.contacts[0]?data.contacts[0].phone:null],
-          [this.row, 'infos.supplierContactor', null, data.contacts[0]?data.contacts[0].name:null],
-          [this.row, 'infos.supplierWeb', null, data.website?data.website:null],
-          [this.row, 'infos.supplierEmail', null, data.contacts[0]?data.contacts[0].email:null],
-          [this.row, 'infos.supplierFax', null, data.contacts[0]?data.contacts[0].fax:null],
-        ],
-        "edit"
-      )
-    },
-    //保险商变更
-    changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId);
-      tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name);
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerWeb', data.website?data.website:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerEmail', data.contacts[0]?data.contacts[0].email:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerFax', data.contacts[0]?data.contacts[0].fax:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerPhone', data.contacts[0]?data.contacts[0].phone:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.insurerContactor', data.contacts[0]?data.contacts[0].name:null)
-      this.handleUpdataTable(
-        [
-          [this.row, "dpInsurerId", null, data.venderId],
-          [this.row, "infos.insurer", null, data.name],
-          [this.row, 'infos.insurerWeb', null, data.website?data.website:null],
-          [this.row, 'infos.insurerEmail', null, data.contacts[0]?data.contacts[0].email:null],
-          [this.row, 'infos.insurerFax', null, data.contacts[0]?data.contacts[0].fax:null],
-          [this.row, 'infos.insurerPhone', null, data.contacts[0]?data.contacts[0].phone:null],
-          [this.row, 'infos.insurerContactor', null, data.contacts[0]?data.contacts[0].name:null],
-        ],
-        "edit"
-      )
-      // this.handleUpdataTable([[this.row, "LedgerParam.InsuranceDoc.Insurer", null, data.name]], "edit")
-    },
-    //维修商变更
-    changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId);
-      tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name);
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerWeb', data.website?data.website:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerContactor', data.contacts[0]?data.contacts[0].name:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerPhone', data.contacts[0]?data.contacts[0].phone:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerEmail', data.contacts[0]?data.contacts[0].email:null)
-      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerFax', data.contacts[0]?data.contacts[0].fax:null)
-      this.handleUpdataTable(
-        [
-          [this.row, "dpMaintainerId", null, data.venderId],
-          [this.row, "infos.maintainer", null, data.name],
-          [this.row, 'infos.maintainerWeb', null, data.website?data.website:null],
-          [this.row, 'infos.maintainerContactor', null, data.contacts[0]?data.contacts[0].name:null],
-          [this.row, 'infos.maintainerPhone', null, data.contacts[0]?data.contacts[0].phone:null],
-          [this.row, 'infos.maintainerEmail', null, data.contacts[0]?data.contacts[0].email:null],
-          [this.row, 'infos.maintainerFax', null, data.contacts[0]?data.contacts[0].fax:null],
-        ],
-        "edit"
-      )
-      // this.handleUpdataTable([[this.row, "LedgerParam.operationMainte.maintainer", null, data.name]], "edit")
-    },
-    supplyChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", { id: data });
-    },
-    //保险合同
-    guaranteeChange(data) {
-      for (let key in data) {
-        this.utilToKey(key, "insuranceNo", data, "insuranceNum");
-        if (key == "contractFile") {
-          if (!!data[key]) {
-            data[key] = [data[key]];
-          }
-        }
-        this.utilToKey(key, "contractFile", data, "insuranceFile");
-      }
-    },
     //修改关联的资产
     changeProperty(val) {
       this.setDataToMain(val.propertyId, 'propertyId', this.row);
@@ -685,62 +553,27 @@ export default {
             this.myDialog.changeRea = true;
           }
           break;
-        //品牌型号弹窗
-        case 'dpManufacturerId':
-          if (!this.onlyRead) {
-            this.myDialog.firm = true;
-          }
-          break;
-        //供应商信息弹窗
-        case 'dpSupplierId':
-          if (!this.onlyRead) {
-            this.myDialog.supplier = true;
-          }
-          break;
-        //维修商信息弹窗
-        case 'dpMaintainerId':
-          if (!this.onlyRead) {
-            this.myDialog.maintainer = true;
-          }
-          break;
-        //保险公司信息
-        case 'dpInsurerId':
-          if (!this.onlyRead) {
-            this.myDialog.insurer = true;
-          }
-          break;
-        //供应合同编号
-        case 'infos.supplierContractID':
-          if (!this.onlyRead) {
-            let ContractIDflag = null;
-            let DPSdata = this.tableData[row.row].dpSupplierId;
-            if (DPSdata) {
-              ContractIDflag = DPSdata.split("-")[0];
-            }
-            if (!!ContractIDflag) {
-              this.id = ContractIDflag;
-              this.myDialog.supply = true;
-            } else {
-              this.$message("请先选择供应商");
-            }
-          }
-          break;
-        //保险单号
-        case 'infos.insuranceNum':
-          if (!this.onlyRead) {
-            let DPInsurerIDflag = null;
-            let DPIdata = this.tableData[row.row].dpInsurerId;
-            if (DPIdata) {
-              DPInsurerIDflag = DPIdata.split("-")[0];
-            }
-            if (!!DPInsurerIDflag) {
-              this.id = DPInsurerIDflag;
-              this.myDialog.guarantee = true;
-            } else {
-              this.$message("请先选择保险商");
+        /**
+         * 关联资产后才可维护的信息点
+         */
+        case 'flowBuild': //所属建筑楼层
+        case 'infos.productDate': //生产日期
+        case 'infos.serialNum': //出厂编号
+        case 'infos.assetID': //资产编号
+        case 'infos.purchasePrice': //采购价格
+        case 'infos.insuranceNum': //保险单号
+        case 'infos.insuranceFile': //保险文件
+            const propertyId = this.tableData[row.row].propertyId;
+            if (!propertyId) { //未关联资产
+                this.$confirm('请先关联资产后再维护该信息!', '提示', {
+                    confirmButtonText: '确定',
+                    showCancelButton: false,
+                    type: 'warning'
+                }).then(() => {
+                    return false;
+                });
             }
-          }
-          break;
+            break
         //保险文件--设备文档--安装质检报告
         case 'infos.insuranceFile': //保险文件
         case 'infos.archive': //设备文档

+ 9 - 11
src/views/ledger/rentlist/index.vue

@@ -64,20 +64,18 @@
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
-import text from "@/utils/handsontable/mainText"
 import roomCountDrawer from "@/components/ledger/rentList/roomCountDrawer"
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import handsonTable from "@/components/common/handsontable"
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 import {
-  getRentTableHeader,
-  queryRentTableData,
-  updataRentTableData,
+  BeatchQueryParam,
   deleteRentTableData,
+  queryRentTableData,
   saveRentRelateSpace,
-  BeatchQueryParam
+  updataRentTableData
 } from "@/api/scan/request"
-import { mapGetters, mapActions } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -130,11 +128,11 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   created() {
@@ -520,7 +518,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = { //获取动态参数
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 5 - 5
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -61,10 +61,10 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import tools from "@/utils/scan/tools";
-import { BeatchQueryParam, zoneDelete, zoneQuery } from '@/api/scan/request';
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, zoneDelete, zoneQuery} from '@/api/scan/request';
+import {getDataDictionary} from "@/api/dict";
 
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
 import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable';
@@ -149,7 +149,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "userId", "secret"])
+    ...mapGetters("layout", ["projectId", "userId", "secret", 'group_code'])
   },
   components: {
     eqToSpaceTable,
@@ -234,7 +234,7 @@ export default {
           }
         })
         let params = { //获取动态参数
-          groupCode: "WD",
+          groupCode: this.group_code,
           appId: "datacenter",
           projectId: this.projectId,
           data: []

+ 5 - 4
src/views/screen/splitscreen/spaceledger/index.vue

@@ -117,12 +117,12 @@
 </template>
 
 <script>
-import { BeatchQueryParam, floorQuery, zoneQuery, zoneQueryOutline } from '@/api/scan/request'
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, floorQuery, zoneQuery, zoneQueryOutline} from '@/api/scan/request'
+import {getDataDictionary} from "@/api/dict";
 
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable'
 import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable'
-import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib";
+import {DivideFloorScene, FloorView} from "@saga-web/cad-engine/lib";
 import tools from "@/utils/scan/tools";
 import exhibitionBaseInformation from "@/components/ledger/details/detail/exhibitionBaseInformation";
 
@@ -303,6 +303,7 @@ export default {
     getInFormationPoitnName() {// 获取动态数据
       let proId = localStorage.getItem('projectId');
       let secret = localStorage.getItem('secret');
+      let group_code = localStorage.getItem('group_code');
       let params = {
         filters: 'category != STATIC',
         orders: "sort asc",
@@ -311,7 +312,7 @@ export default {
         type: this.$route.query.zone
       }
       let param = {
-        groupCode: "WD",
+        groupCode: group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []