Browse Source

Merge branch 'graphEq' of http://39.106.8.246:3003/web/ibms into graphEq

haojianlong 4 years ago
parent
commit
ec4ccd5d6d

+ 1 - 1
.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 node_modules/
-/dist/
+dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

+ 3 - 1
src/api/model/file.js

@@ -89,7 +89,9 @@ let api = {
             Filters += `;Status in [${data.Status}]`
         }
         let params = {
-            Filters: Filters
+            Filters: Filters,
+            PageNumber: 1,
+            PageSize: 500
         }
         return httputils.postJson(`${baseUrl}/model-floor/query-list`, params, success)
     },

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

@@ -16,6 +16,7 @@
             <!-- <el-button size="small" style='width: 80px;' @click="download" icon="iconfont icon-xiazai">下载</el-button> -->
             <el-button size='small' style='width: 80px;' @click='addDevice'>添加设备</el-button>
             <el-button size='small' @click='Batch' v-show='!onlyRead' :disabled='!(tableData && tableData.length)'>批量维护信息点</el-button>
+            <el-button size='small' @click='handleBatchEquipPoint' v-show='true'>批量维护设备位置</el-button>
             <el-button size='small' style='width: 80px;' @click='reset'>刷新</el-button>
             <el-button size='small' style='width: 80px;' v-show='!onlyRead' @click='undo'>撤销</el-button>
         </div>
@@ -1436,6 +1437,15 @@
             this.firmDataType = 'dialog'
             this.$refs.batchDialogs.batchDialog = true
         },
+        // 批量维护设备位置
+        handleBatchEquipPoint() {
+            let query = {};
+            // 跳转批量维护设备位置页面
+            this.$router.push({
+                name: "BatchPointAssets",
+                params: query
+            })
+        },
         upDataDevice(type, data1, data2) {
             let param = { Content: data1 }
             let param1 = { Content: data2 }

+ 12 - 0
src/router/system.js

@@ -59,6 +59,7 @@ import propertyLedger from '@/views/ledger/property'
 import spacelist from '@/views/ledger/spacelist' //业务空间台账
 import addPropertys from '@/views/ledger/property/addpropertys' //根据未关联资产的设备或部件批量创建设备
 import batchlinkAssets from '@/views/ledger/facility/batchlink' //批量关联资产
+import batchPointAssets from '@/views/ledger/facility/batchPoint' //批量维护设备位置
 import cenotelist from '@/views/ledger/cenotelist' //竖井清单
 import cenoteadd from '@/views/ledger/cenotelist/cenoteadd' //添加竖井
 import spaceadd from '@/views/ledger/spacelist/spaceadd' //添加业务空间
@@ -413,6 +414,17 @@ export default [{
               }, {label: '批量关联资产'}]
             }
           },
+          {
+            path: 'batchPointAssets',
+            name: 'BatchPointAssets',
+            component: batchPointAssets,
+            meta: {keepAlive: false,
+              breadcrumbs: [{label: '台账管理', path: '/ledger/facility'}, {
+                label: '设备台账',
+                path: '/ledger/facility'
+              }, {label: '批量维护设备位置'}]
+            }
+          },
             {
                 path: 'property',
                 name: 'propertyLedger',

+ 1 - 0
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -89,6 +89,7 @@
         let data = {
           FolderId: val,
           Status: '4',
+          
           ProjectId: this.projectId
         };
         request.queryFloorList(data, res => {

+ 67 - 0
src/views/ledger/facility/batchPoint.vue

@@ -0,0 +1,67 @@
+<template>
+  <div id="manageTenantZone">
+    <el-row style="margin:5px 0 0 0;">
+      <el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goback"></el-button>
+      <floor-cascader @change="changeFloor"></floor-cascader>
+      <my-cascader ref="cascader" @change="changeDevice"></my-cascader>
+      <el-button style="float:right;margin-top:1px;">取消</el-button>
+      <el-button style="float:right;margin-top:1px;margin-right:10px;">确认</el-button>
+    </el-row>
+    <el-row class="main-container"></el-row>
+  </div>
+</template>
+<script>
+import floorCascader from "@/components/ledger/lib/floorCascader";
+import myCascader from "@/components/ledger/lib/cascader";
+import { mapGetters } from "vuex";
+export default {
+  components: {
+    floorCascader,
+    myCascader
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    ...mapGetters("layout", ["projectId", "projects"])
+  },
+  created() {},
+  mounted() {
+    // this.canvasWidth = this.$refs.graphy.offsetWidth;
+    // this.canvasHeight = this.$refs.graphy.offsetHeight;
+  },
+  methods: {
+    // 返回
+    goback() {
+      this.$router.push({ name: "facilityLedger" })
+    },
+    //修改楼层
+    changeFloor(value) {
+      console.log(value);
+    },
+    //修改设备族
+    changeDevice(value) {
+      console.log(value);
+    }
+  },
+  watch: {
+    projectId() {
+      this.$router.push({ name: "facilityLedger" })
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+@normal-border-color: #e4e4e4;
+@normal-border-active-color: #e8e8e8;
+#manageTenantZone {
+  height: 100%;
+  .main-container {
+    margin-top: 10px;
+    background: #fff;
+    border: 1px solid @normal-border-color;
+    height: calc(100% - 53px);
+    overflow: hidden;
+  }
+}
+</style>

+ 1 - 1
src/views/model/report/index.vue

@@ -229,7 +229,7 @@
       },
       getModelFloorCount() {// 获取楼层模型文件数量,计算出检查出问题的模型文件
         let promise1 = new Promise(resolve => {
-          queryFloorList({Filters:"Status=4"}, res => {
+          queryFloorList({Filters:"Status=4",pageNumber:1,PageSize: 500}, res => {
             resolve(res);
           })
         })