Browse Source

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

haojianlong 4 years ago
parent
commit
d92fd04961

+ 4 - 3
src/api/scan/request.js

@@ -1252,7 +1252,8 @@ export function equipLinkSys(param, success) {
 
 //设备清单 - 设备关联系统 系统1-n
 export function sysLinkEquip(param, success) {
-  let url = `${baseUrl}/datacenter2/sy-in-eq/link-sy-eq`;
+  // let url = `${baseUrl}/datacenter2/sy-in-eq/link-sy-eq`;
+  let url = `${baseUrl}/datacenter2/rel/sy-in-eq/link-sy-eq`;
   http.postJson(url, param, success)
 }
 
@@ -1843,7 +1844,7 @@ export function shthroughshUnlink(param, success) {
 export function unSysEq(param, success) {
   let data = param.data
   // let url = `${baseUrl}/datacenter2/general-system/un-sys-equip?sysId=${param.sysId}`;
-  let url = `${baseUrl}/datacenter2/object/general-system/un-sys-equip`;
+  let url = `${baseUrl}/datacenter2/object/general-system/un-sys-equip?sysId=${param.id}`;
   http.postJson(url, data, success)
 }
 
@@ -1857,7 +1858,7 @@ export function unSysShaft(param, success) {
 //查询没有和当前系统关联的业务空间
 export function unSysZoneSpace(param, success) {
   let data = param.data
-  let url = `${baseUrl}/datacenter2/general-system/un-sys-zoneSpaceBaseTable?sysId=${param.sysId}`;
+  let url = `${baseUrl}/datacenter2/object/general-system/un-sys-zoneSpaceBaseTable?sysId=${param.sysId}`;
   http.postJson(url, data, success)
 }
 

+ 13 - 14
src/components/ledger/system/dialog/addEquipDialog.vue

@@ -21,12 +21,12 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{ scope.row.EquipLocalName || scope.row.EquipName || '' }}</div>
+            <div>{{ scope.row.localName || scope.row.name || '' }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
                          min-width="100"></el-table-column>
-        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip
+        <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类`" show-overflow-tooltip
                          min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
@@ -119,9 +119,9 @@ export default {
           orders: "createTime desc, id desc",
           pageNumber: this.page.pageNumber,
           pageSize: this.page.pageSize,
-          sysId: this.$route.query.SysID,
-          shaftId: this.params.ShaftID,
         },
+        id: this.$route.query.SysID,
+        shaftId: this.params.ShaftID,
       };
       if (this.Buildfloor[0] == "noKnow") {
         params.data.filters += `;buildingId isNull`;
@@ -140,14 +140,13 @@ export default {
         params.data.filters += `;classCode='${this.Equipcategory}'`;
       }
       unSysEq(params, res => {
-        debugger
         res.content.forEach(item => {
           item.ShaftListName = "";
-          if (item.ShaftList && item.ShaftList.length) {
-            item.ShaftListName = item.ShaftList.map(shaft => {
-              return shaft.ShaftLocalName
-                ? shaft.ShaftLocalName
-                : shaft.ShaftName;
+          if (item.shaftList && item.shaftList.length) {
+            item.ShaftListName = item.shaftList.map(shaft => {
+              return shaft.localName
+                ? shaft.localName
+                : shaft.name;
             }).join("、");
           }
         });
@@ -162,9 +161,9 @@ export default {
     savaRelation() {
       if (this.selections.length) {
         let params = {
-          SysId: this.$route.query.SysID,
-          EquipIdList: this.selections.map(item => {
-            return item.EquipID;
+          id: this.$route.query.SysID,
+          equipIdList: this.selections.map(item => {
+            return item.id;
           })
         };
         sysLinkEquip(params, res => {

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

@@ -125,34 +125,34 @@ export default {
     getTableData() {
       let params = {
         data: {
-          Filters: "not RoomID isNull",
-          Orders: "RoomLocalName desc",
-          PageNumber: this.page.pageNumber,
-          PageSize: this.page.pageSize
+          filters: "not roomId isNull",
+          orders: "roomLocalName desc",
+          pageNumber: this.page.pageNumber,
+          pageSize: this.page.pageSize
         },
         shaftId: this.params.ShaftID,
         sysId: this.$route.query.SysID
       };
       if (this.Buildfloor[0] == "noKnow") {
-        params.data.Filters += `;buildingId isNull`;
+        params.data.filters += `;buildingId isNull`;
       } else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
-        params.data.Filters += `;buildingId='${this.Buildfloor[0]}'`;
+        params.data.filters += `;buildingId='${this.Buildfloor[0]}'`;
       }
       if (this.Buildfloor[1] == "noKnow") {
-        params.data.Filters += `;floorId isNull`;
+        params.data.filters += `;floorId isNull`;
       } else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
-        params.data.Filters += `;floorId='${this.Buildfloor[1]}'`;
+        params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
       }
       if (this.Spacecategory) {
-        params.data.Filters += `;ObjectType='${this.Spacecategory}'`;
+        params.data.filters += `;objectType='${this.Spacecategory}'`;
       }
       if (this.keycode != "") {
-        params.data.Filters += `;RoomName contain '${this.keycode}' or RoomLocalName contain '${this.keycode}'`;
+        params.data.filters += `;roomName contain '${this.keycode}' or roomLocalName contain '${this.keycode}'`;
       }
 
       unSysZoneSpace(params, res => {
-        this.tableData = res.Content;
-        this.page.total = res.Total;
+        this.tableData = res.content;
+        this.page.total = res.total;
       });
     },
     handleClose() {
@@ -222,4 +222,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 18 - 15
src/components/ledger/system/lib/equipType.vue

@@ -1,8 +1,9 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
-    <el-select v-model="value" placeholder="请选择" :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 v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'"
+               size="small" @change="changeVal">
+      <el-option v-for="item in options" :key="item.code" :label="item.name" :value="item.code"></el-option>
     </el-select>
   </div>
 </template>
@@ -35,7 +36,7 @@ export default {
       options: [],
       props: {
         value: "code",
-        label: "facility"
+        label: "name"
       },
       falg: true,
       content: []
@@ -75,7 +76,7 @@ export default {
           "classCode"
         ]
       }
-      let param1 = 'equipment'
+      let param1 = { type: 'equipment' }
       let promise2 = new Promise((resolve, reject) => {
         queryEquip(param2, res => {
           resolve(res)
@@ -95,7 +96,8 @@ export default {
       })
       Promise.all([promise1, promise2]).then((res) => {
         let allData = res[0], data = res[1]
-        this.options = this.formatOptions(allData)
+        // this.options = this.formatOptions(allData)
+        this.options = allData
         if (this.value) {
           this.changeVal(this.value)
         }
@@ -111,16 +113,16 @@ export default {
       })
     },
     //格式化options数据
-    formatOptions(arr) {
-      let data = [];
-      arr.map(t => {
-        let temp = {};
-        temp.code = t.Code;
-        temp.facility = t.Name;
-        data.push(temp)
-      })
-      return data;
-    },
+    // formatOptions(arr) {
+    //   let data = [];
+    //   arr.map(t => {
+    //     let temp = {};
+    //     temp.code = t.code;
+    //     temp.facility = t.name;
+    //     data.push(temp)
+    //   })
+    //   return data;
+    // },
     //过滤
     filterForOptions() {
       this.options = this.options.filter(item => {
@@ -136,6 +138,7 @@ export default {
 #cascaderMap {
   float: left;
   margin-left: 10px;
+
   .buildFloor {
     color: #999999;
     font-size: 14px;

+ 2 - 2
src/components/ledger/tableTransfers.vue

@@ -301,8 +301,8 @@ export default {
     //更新设备 系统关系
     relationChange(arr) {
       let param = {
-        SysID: this.id,
-        EquipIdList: arr
+        id: this.id,
+        equipIdList: arr
       }
       sysLinkEquip(param, res => {
         this.$message.success('修改关联关系成功')

+ 0 - 1
src/views/data_admin/buildData/index-2.vue

@@ -1155,7 +1155,6 @@ export default {
       }
     },
     getInfors(data, rowArr, falg = false) {
-      debugger
       let val = this.myHotArr[this.tabChecked].getActiveEditor().prop;
       this.$refs.recommend.randerData(data, val, this.myHotHeaderArr[this.tabChecked])
       if (data.LedgerParam.PhotoDoc && (data.LedgerParam.PhotoDoc.Pic || data.LedgerParam.PhotoDoc.Nameplate)) {

+ 0 - 1
src/views/ledger/property/details/index_old.vue

@@ -241,7 +241,6 @@ export default {
     },
     handlePicList(arr) {
       let picObject = {}
-      debugger
       //处理数据格式
       arr.map(i => {
         if (i.InputMode == 'F2') {