2 Commits 1df1b7a45e ... 967fb325b8

Author SHA1 Message Date
  zhangyu 967fb325b8 Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType 3 years ago
  zhangyu efa9c57e25 第一轮集中测试问题修改 3 years ago

+ 1 - 1
package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.591",
+    "@saga-web/cad-engine": "2.0.593",
     "@saga-web/draw": "2.1.112",
     "@saga-web/graph": "2.1.137",
     "axios": "^0.18.0",

+ 1 - 1
src/components/ledger/lib/cascader.vue

@@ -132,7 +132,7 @@ export default {
     //格式化options数据
     formatOptions(arr) {
       let data = [];
-      arr.map(t => {
+      arr && arr.map(t => {
         let temp = {};
         temp.code = t.code;
         temp.facility = t.name === t.aliasName ? t.name : `${t.name}(${t.aliasName})`;

+ 1 - 1
src/components/ledger/lib/excelDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="深化点表导入" :visible.sync="dialogFormVisible" class="dialogFormVisible" @close="messageKey = ''">
-    <h5 class="title">深化点表前四列须按照“设备本地编码(A列)”、“信息点编码(B列)”、“号(C列)”、“功能号(D列)”的顺序整理,第1行为标题,从第2行开始填写具体内容。</h5>
+    <h5 class="title">深化点表前四列须按照“设备本地编码(A列)”、“信息点编码(B列)”、“号(C列)”、“功能号(D列)”的顺序整理,第1行为标题,从第2行开始填写具体内容。</h5>
     <p class="time">
       <el-button type="text" :disabled="!messageKey" @click="download">下载导入结果</el-button>
     </p>

+ 18 - 16
src/components/ledger/lib/linkassets.vue

@@ -171,22 +171,24 @@ export default {
         type: "space"
       }
       queryPhysicsAllType(params, res => {
-        this.zoneList = res.content.filter(item => {
-          if (item.name !== item.aliasName) {
-            item.name = `${item.name}(${item.aliasName})`
-          }
-          if (item.code != 'Ispace') {
-            return item
-          }
-        })
-        this.zoneList.unshift({
-          name: '全部',
-          code: 'all'
-        })
-        this.zoneList.push({
-          name: '不在任何业务空间内',
-          code: 'noKnow'
-        })
+        if (res.content) {
+					this.zoneList = res.content.filter(item => {
+						if (item.name !== item.aliasName) {
+							item.name = `${item.name}(${item.aliasName})`
+						}
+						if (item.code != 'Ispace') {
+							return item
+						}
+					})
+					this.zoneList.unshift({
+						name: '全部',
+						code: 'all'
+					})
+					this.zoneList.push({
+						name: '不在任何业务空间内',
+						code: 'noKnow'
+					})
+				}
       })
     },
     // 修改设备类型

+ 7 - 3
src/components/ready/buildfloor/formItems.vue

@@ -96,13 +96,14 @@
             </div>
           </span>
 
-          <el-input
+          <el-input-number
             v-model.trim="form[item.path]"
+            :controls="false"
+            style="text-align: right;"
             v-else-if="item.dataType == 'INTEGER' || item.dataType == 'DOUBLE'"
-            type="number"
           >
             <template slot="append" v-if="item.unit">{{ item.unit }}</template>
-          </el-input>
+          </el-input-number>
 
           <el-select
             v-model="form[item.path]"
@@ -237,6 +238,9 @@ export default {
       font-size: 12px;
     }
   }
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 
   /deep/ .FloorTypeSelect .el-form-item__content {
     width: 200px;

+ 1 - 0
src/components/relation/overview/CardList.vue

@@ -19,6 +19,7 @@
             <i class="icon-zuzhiguanxi iconfont"/></span>
           <span class="pic-code">图类型编码:{{ child.graphTypeCode }}</span>
           <el-tooltip
+            v-if="child.Note"
             :content="child.Note"
             placement="top">
             <i

File diff suppressed because it is too large
+ 22 - 23
src/data/deviceList.js


+ 8 - 0
src/framework/layout/project.js

@@ -1,4 +1,12 @@
 const project = {
+  MKL: [
+    {
+      id: "Pj0000000001",
+      name: "飞龙商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    }
+  ],
   "39": [
     {
       id: "Pj4501030002",

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

@@ -465,7 +465,7 @@ tools.formatDate = (now) => {
   let hour = now.getHours();
   let minute = now.getMinutes();
   let second = now.getSeconds();
-  return year + "-" + month + "-" + (date > 10 ? date : '0' + date) + " " + hour + ":" + (minute > 10 ? minute : '0' + minute) + ":" + (second > 10 ? second : '0' + second);
+  return year + "-" + (month > 10 ? month : '0' + month) + "-" + (date > 10 ? date : '0' + date) + " " + hour + ":" + (minute > 10 ? minute : '0' + minute) + ":" + (second > 10 ? second : '0' + second);
 };
 tools.formatDataSource = function (data) {
   let options

+ 3 - 1
src/views/data_admin/buildAssets/index.vue

@@ -64,6 +64,7 @@ import SagaNopaint from './Nopaint'
 import SagaVerify from './Noverify'
 // import assetsList from './assetsList'
 import { mapActions, mapGetters, mapState } from 'vuex'
+import tools from '@/utils/scan/tools.js'
 //api
 import {
   // buildingQuery,
@@ -106,8 +107,9 @@ export default {
   methods: {
     ...mapActions('layout', ['setErrorReport']),
     handleTime(val) {
+        let endDate = tools.formatDate(new Date(new Date(val[1]).getTime() + 86399000));
       let param = {
-        filters: `createTime > '${val[0]}';createTime < '${val[1]}'`,
+        filters: `createTime > '${val[0]}';createTime < '${endDate}'`,
         pageNumber: 1,
         pageSize: 50
       }

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

@@ -346,6 +346,7 @@ export default {
 
 	        this.canvasLoading = true;
 			queryEquip(params, (res) => {
+                this.equipList = [];
 				this.equipList = this.equipList.concat(res.content.map(item => {item.selected = false; item.hasLocation = !!item.bimLocation; return item;}));
 				if (this.view && this.view.scene) {
 					res.content.forEach(item =>{

+ 4 - 3
src/views/model/report/deleted.vue

@@ -235,10 +235,11 @@ export default {
             let Y = can[this.i].dataset.y * -1;
             that.view.scene = that.scene;
             this.scene.addMarker({
-            Id: EquipID,
-            X: X,
-            Y: Y
+                Id: EquipID,
+                X: X,
+                Y: Y
             })
+            that.scene.isShowSpaceName = false;
             that.view.fitSceneToView();
             that.view.scalable = false;
             this.scene.isSpaceSelectable = false;

+ 7 - 6
src/views/model/report/supplement.vue

@@ -205,19 +205,20 @@ export default {
         that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
             that.canvasLoading = false;
             if (res == 'error') {
-            this.FloorMap = '';
-            console.log('数据解析异常');
-            return;
+                this.FloorMap = '';
+                console.log('数据解析异常');
+                return;
             }
             let equipId = can[this.i].dataset.equipid;
             let X = Number(can[this.i].dataset.x);
             let Y = can[this.i].dataset.y * -1;
             that.view.scene = that.scene;
             this.scene.addMarker({
-            Id: equipId,
-            X: X,
-            Y: Y
+                Id: equipId,
+                X: X,
+                Y: Y
             })
+            that.scene.isShowSpaceName = false;
             that.view.fitSceneToView();
             that.view.scalable = false;
             this.scene.isSpaceSelectable = false;