package.json

@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.591",
-    "@saga-web/draw": "2.1.112",
-    "@saga-web/graph": "2.1.137",
+    "@saga-web/cad-engine": "2.0.594",
+    "@saga-web/draw": "2.1.113",
+    "@saga-web/graph": "2.1.138",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

src/api/scan/httpUtil.js

@@ -53,14 +53,14 @@ function downFile(blob, fileName) {
 export default {
   getJson: function (url, data, success, failed, err) {
     let ProjectId = store.state.layout.projectId ? store.state.layout.projectId : localStorage.getItem("projectId");
-    let userName = storage.get("user_name")
-    let group_code = localStorage.getItem("group_code")
+    let userName = store.state.layout.userInfo.userName ? store.state.layout.userInfo.userName : storage.get("user_name");
+    let group_code = store.state.layout.group_code ? store.state.layout.group_code : localStorage.getItem("group_code");
     let vm = this;
     fetch({
       url: url,
       method: 'get',
       params: data,
-      headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName, 'group_code': group_code}
+      headers: {'projectId': ProjectId, 'appId': 'adm', 'userId': userName, 'groupCode': group_code}
     }).then((response) => {
       successResponse(vm, response, success, failed)
     }).catch(error => {
@@ -69,15 +69,15 @@ export default {
   },
   postJson: function (url, data, success, failed, err) {
     let ProjectId = store.state.layout.projectId ? store.state.layout.projectId : localStorage.getItem("projectId");
-    let userName = storage.get("user_name")
-    let group_code = localStorage.getItem("group_code")
+    let userName = store.state.layout.userInfo.userName ? store.state.layout.userInfo.userName : storage.get("user_name");
+    let group_code = store.state.layout.group_code ? store.state.layout.group_code : localStorage.getItem("group_code");
 
     let vm = this;
     fetch({
       url: url,
       method: 'post',
       data: data,
-      headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName, 'group_code': group_code}
+      headers: {'projectId': ProjectId, 'appId': 'adm', 'userId': userName, 'groupCode': group_code}
     }).then((response) => {
       successResponse(vm, response, success, failed)
     }).catch(error => {

src/api/scan/request.js

@@ -1765,6 +1765,12 @@ export function manageDeleteFloor(param, success) {
   http.postJson(url, param, success)
 }
 
+//建筑楼层管理-删除楼层(该接口有删除失败的原因)
+export function deleteFloorInfo(param, success) {
+	let url = `${baseUrl}${floor}/single/delete`;
+	http.postJson(url, param, success)
+}
+
 //建筑楼层管理-修改楼层
 export function manageUpdateFloor(param, success) {
   let url = `${baseUrl}${floor}/update`;
@@ -2347,6 +2353,12 @@ export function objectDeleteBuild(param, success) {
   http.postJson(url, param, success)
 }
 
+//根据id删除建筑信息(该接口有删除失败的原因)
+export function deleteBuildInfo(param, success) {
+  let url = `${baseUrl}${object}/building/single/delete`
+  http.postJson(url, param, success)
+}
+
 // 查询记录
 export function problemQuery(param, success) {
   // let url = `${baseUrl}${dataCenter}/problems/query`

src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -106,7 +106,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

src/components/business_space/newGraphy/unRelateBSP.vue

@@ -112,7 +112,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

src/components/data_admin/buildTask/table/assetsTable.vue

@@ -10,8 +10,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localName" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localName || '--'}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipFamily.familyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

src/components/data_admin/buildTask/table/deviceTable.vue

@@ -13,7 +13,7 @@
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.localName}}
+              {{scope.row.localName || '--'}}
               <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
                         :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
                         class="item" type="warning">
@@ -21,7 +21,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

src/components/data_admin/buildTask/table/modelTable.vue

@@ -7,7 +7,7 @@
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.localName}}
+              {{scope.row.localName || '--'}}
               <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
                         :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
                         class="item" type="warning">
@@ -15,7 +15,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column prop="bimId" label="BIM ID" show-overflow-tooltip min-width="220"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>

src/components/data_admin/buildTask/table/replaceTable.vue

@@ -10,8 +10,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="localName" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localName || '--'}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipFamily.familyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

src/components/data_admin/buildTask/table/tearTable.vue

@@ -10,8 +10,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="localName" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localName || '--'}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipFamily.familyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

src/components/dialogs/list/batchDialog.vue

@@ -436,13 +436,13 @@ export default {
         let filterParam1 = this.filterCheck(param1, "multiple");
         if (filterParam) {
           updateEquip(param, res => {
-						if (res.result === "success") {
-							this.loading = false;
-							this.$emit('upDataDevice')
-						} else {
-							this.$message.error(res.message);
-						}
-						this.closeDialog();
+            if (res.result === "success") {
+                this.loading = false;
+                this.$emit('upDataDevice')
+            } else {
+                this.$message.error(res.message);
+            }
+            this.closeDialog();
           });
         }
         if (filterParam1) {
@@ -453,29 +453,35 @@ export default {
           })
           setTimeout(() => {
             queryUpdate(param1, res => {
-							if (res.result === "success") {
-								this.loading = false;
-								this.$emit('upDataDevice')
-							} else {
-								this.$message.error(res.message);
-							}
-							this.closeDialog();
+                if (res.result === "success") {
+                    this.loading = false;
+                    this.$emit('upDataDevice')
+                } else {
+                    this.$message.error(res.message);
+                }
+                this.closeDialog();
             });
           });
+        } else {
+            this.loading = false;
+            this.closeDialog();
         }
       } else if (type === 2) {
         //覆盖
         let filterParams = this.filterCheck(param, "sole");
         if (filterParams) {
           updateEquip(param, res => {
-						if (res.result === "success") {
-							this.loading = false;
-							this.$emit('upDataDevice')
-						} else {
-							this.$message.error(res.message);
-						}
-						this.closeDialog();
+            if (res.result === "success") {
+                this.loading = false;
+                this.$emit('upDataDevice')
+            } else {
+                this.$message.error(res.message);
+            }
+            this.closeDialog();
           });
+        } else {
+            this.loading = false;
+            this.closeDialog();
         }
       }
     },

src/components/ledger/handsontables/system.vue

@@ -16,9 +16,9 @@
       <el-button v-show="!onlyRead" size="small" style="width: 80px" @click="undo" icon="iconfont icon-undo">撤销</el-button>
     </div>
     <qrcode :dialog="myDialog" :addBody="true" ref="qrcode"></qrcode>
-    <upload-files-dialog ref="upload" @changeFile="fileChange" :keysArr="filesArr"
+    <upload-files-dialog ref="upload" @changeFile="fileChange" :keysArr="filesArr" firmDataType="row"
                          :dialog="myDialog"></upload-files-dialog>
-    <upload-img-dialog @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"></upload-img-dialog>
+    <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" firmDataType="row" :dialog="myDialog"></upload-img-dialog>
     <pic-dialog :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
     <div class="center middle_sty" style="height: 91%" v-show="!mess.deviceId && (!tableData || !tableData.length)">
       <p><i class="icon-wushuju iconfont"></i>请选择系统类型</p>
@@ -72,8 +72,8 @@ import tools from "@/utils/scan/tools";
 import handsonUtils from "@/utils/scan/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
 import qrcode from "@/components/business_space/lib/qrcode"
-import uploadFilesDialog from "@/components/business_space/dialogs/list/filesDialog"
-import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
+import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
+import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
 import picDialog from "@/components/business_space/dialogs/list/picDialog"
 import myPagination from "@/components/common/myPagination"
 import detailsDialog from "@/components/business_space/lib/detailsDia"
@@ -246,7 +246,9 @@ export default {
     },
     //撤回
     undo() {
-      this.hot.undo();
+      if (this.tableData.length) {
+				this.hot.undo();
+			}
     },
     //刷新
     reset() {
@@ -546,7 +548,7 @@ export default {
       //其他的开始判断
       let val = this.hot.colToProp(row.col);
       let inputData = this.inputMap[val];
-      this.systemId = infos.SysID
+      this.systemId = infos.SysID;
       this.row = row.row
       this.messKey = val
       switch (val) {
@@ -581,6 +583,14 @@ export default {
             this.$refs.editFloor.showDialog(this.tableData[row.row]);
           }
           return false
+				//系统图(F2)
+        case "infos.systemChart":
+          let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
+          this.imgsArr = SSPPdata ? SSPPdata : [];
+          if (!this.onlyRead || this.imgsArr.length) {
+            this.myDialog.uploadImgs = true;
+          }
+          return false;
         default:
           break;
       }
@@ -645,57 +655,28 @@ export default {
     },
     //上传文件弹窗触发事件
     fileChange(keys) {
-      this.setDataToMain(keys[0], this.messKey.split(".")[1], this.row)
-      //   tools.setItem(this.deviceType.code, this.tableData)
+			this.setDataToMain(keys, this.messKey, this.row);
     },
     //上传图片弹窗触发事件
     imgChange(keys) {
-      this.setDataToMain(keys[0], this.messKey.split(".")[1], this.row)
-      //   tools.setItem(this.deviceType.code, this.tableData)
+			this.setDataToMain(keys, this.messKey, this.row);
     },
     //设备图片弹窗改变事件
     changePics(keys) {
-      this.setDataToMain(keys, this.messKey.split(".")[1], this.row)
-      //   tools.setItem(this.deviceType.code, this.tableData)
+			this.setDataToMain(keys, this.messKey, this.row);
     },
     //判断是否有值，有值赋值
     setDataToMain(data, key, row) {
-      if (!!data && data != '--') {
-        if (!!this.tableData[row].infos) {
-          //falg确定每个的是否有值
-          let falg = false
-          if (!this.tableData[row].infos[key]) {
-            falg = true
-          }
-          //铭牌照片特殊处理
-          if (key == 'Nameplate') {
-            this.tableData[row].infos[key] = {
-              "systemId": "dataPlatform",
-              "name": "铭牌照片",
-              "type": "image",
-              "key": data
-            }
-          } else {
-            this.tableData[row].infos[key] = data
-          }
-          if (falg) {
-            this.updateBusiness([this.tableData[row]], [[0, "infos." + key, null, data]])
-          }
+			if (!!data && data != "--") {
+        if (!!this.tableData[row]) {
+          tools.setDataForKey(this.tableData[row], key, data);
+          this.handleUpdataTable([[row, key, null, data]], "edit");
         } else {
-          this.tableData[row].infos = {}
-          if (key == 'Nameplate') {
-            this.tableData[row].infos[key] = {
-              "systemId": "dataPlatform",
-              "name": "铭牌照片",
-              "type": "image",
-              "key": data
-            }
-          } else {
-            this.tableData[row].infos[key] = data
-          }
+          this.tableData[row] = {};
+          tools.setDataForKey(this.tableData[row], key, data);
         }
       } else {
-        this.tableData[row].infos[key] = ''
+        tools.setDataForKey(this.tableData[row], key, "");
       }
     }
   },

src/components/ledger/lib/buildfloorCascader.vue

@@ -29,7 +29,7 @@ export default {
     getCascader() {
       let param = {
         cascade: [
-          { name: "floor", orders: "floorSequenceId desc" }
+          { name: "floor", orders: "floorSequenceID desc" }
         ],
         orders: "localName asc",
         pageNumber: 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})`;

src/components/ledger/lib/excelDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="深化点表导入" :visible.sync="dialogFormVisible" class="dialogFormVisible" @close="messageKey = ''">
-    <h5 class="title">深化点表中必须包含四列，表头分别是$唯一识别码$、￥动态信息点名称￥、表号、功能号，每列可以在表中任意位置，不受前后排序的影响。$唯一识别码$使用的设备信息点，由项目的实际需求决定。</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>

src/components/ledger/lib/floorCascader.vue

@@ -71,7 +71,7 @@
                         "localName"
                     ]
                 }, floorParams = {
-                    orders: "floorSequenceId desc",
+                    orders: "floorSequenceID desc",
                     pageNumber: 1,
                     pageSize: 1000
                 }
@@ -107,7 +107,7 @@
                                     build.children.push({
                                         value: floor.id,
                                         label: floor.localName,
-                                        FloorSequenceID: floor.floorSequenceId,
+                                        FloorSequenceID: floor.floorSequenceID,
                                         infos: floor.infos || {},
                                         outline: floor.outline || null,
                                     })
@@ -122,7 +122,7 @@
                                     },{
                                         value: floor.id,
                                         label: floor.localName,
-                                        FloorSequenceID: floor.floorSequenceId,
+                                        FloorSequenceID: floor.floorSequenceID,
                                         infos: floor.infos || {},
                                         outline: floor.outline || null,
                                     })

src/components/ledger/lib/linkassets.vue

@@ -101,14 +101,14 @@ export default {
           "localName"
         ]
       }, floorParams = {
-        orders: "floorSequenceId desc",
+        orders: "floorSequenceID desc",
         pageNumber: 1,
         pageSize: 1000,
         projection: [
           "buildingId",
           "id",
           "localName",
-          "floorSequenceId"
+          "floorSequenceID"
         ]
       }
       let promise1 = new Promise((resolve, reject) => {
@@ -143,7 +143,7 @@ export default {
                 build.children.push({
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               } else {
                 build.children = []
@@ -156,7 +156,7 @@ export default {
                 }, {
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               }
             }
@@ -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'
+					})
+				}
       })
     },
     // 修改设备类型

src/components/ledger/lib/noAllDataFloor.vue

@@ -74,7 +74,7 @@ export default {
           "localName"
         ]
       }, floorParams = {
-        orders: "floorSequenceId desc",
+        orders: "floorSequenceID desc",
         pageNumber: 1,
         pageSize: 1000
       }
@@ -108,7 +108,7 @@ export default {
                 build.children.push({
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               } else {
                 build.children = []
@@ -118,7 +118,7 @@ export default {
                 }, {
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               }
             }

src/components/ledger/lib/system.vue

@@ -84,8 +84,10 @@ export default {
       }
       queryLinkSys(param, res => {
         this.options = res.content;
-        if (this.value) {
+        if (this.value && this.options.find(item => item.classCode === this.value)) {
           this.changeVal(this.value)
+        } else {
+            this.changeVal("")
         }
       })
     },
@@ -95,8 +97,10 @@ export default {
       }
       queryPhysicsAllType(param, res => {
         this.options = this.changeArr(res.content)
-        if (this.value) {
+        if (this.value && this.options.find(item => item.classCode === this.value)) {
           this.changeVal(this.value)
+        } else {
+            this.changeVal("")
         }
       })
     },

src/components/ledger/rentList/roomCountDrawer.vue

@@ -104,7 +104,7 @@ export default {
     },
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         order: 'localName asc'
       }
       //todo 检测所有大小写

src/components/point/dynamicdata/delRelationDialog.vue

@@ -364,7 +364,7 @@ export default {
                   Data.forEach(t => {
                     if (t.id == item.FloorID) {
                       item.ObjectLocalName = t.localName;
-                      item.ObjectSequenceID = t.floorSequenceId;
+                      item.ObjectSequenceID = t.floorSequenceID;
                       item.BuildLocalName = t.building ? t.building.localName : '';
                     }
                   })

src/components/point/dynamicdata/floorRules.vue

@@ -235,7 +235,7 @@ export default {
                   } else if (t.localName || t.id) {
                     item.ObjectLocalName = t.localName || t.id;
                   }
-                  item.ObjectSequenceID = t.floorSequenceId;
+                  item.ObjectSequenceID = t.floorSequenceID;
                   item.BuildLocalName = t.building ? t.building.localName : '';
                 }
               })

src/components/ready/buildfloor/buildfloorCascader.vue

@@ -30,7 +30,7 @@ export default {
       let param = {
         cascade: [
           // { Name: "floor", Orders: "FloorSequenceID desc" }
-          {name: "floor", orders: "floorSequenceId desc"}
+          {name: "floor", orders: "floorSequenceID desc"}
         ],
         // Orders: "BuildLocalName asc",
         pageNumber: 1,

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]"
@@ -129,6 +130,7 @@
 </template>
 <script>
 import { getDataDictionary } from "@/api/dict";
+import rules from "../../../api/fm/rules";
 
 export default {
   props: {
@@ -137,7 +139,9 @@ export default {
     },
   },
   data() {
+
     let validateId = (rule, value, callback) => {
+      console.log('localId', rule, value, callback)
       if (!value) {
         this.isShowTitle = false;
         return callback(new Error("请输入楼层本地编码"));
@@ -146,16 +150,6 @@ export default {
         callback();
       }
     };
-    let validateFloor = (rule, value, callback) => {
-        let floorSequenceID = this.form["infos.floorSequenceID"];
-        console.log(floorSequenceID);
-        if (!floorSequenceID) {
-        return callback(new Error("请输入楼层顺序号"));
-      } else {
-        callback();
-      }
-    };
-    // }
     return {
       form: {},
       isShowTitle: true,
@@ -167,7 +161,7 @@ export default {
           { required: true, message: "请输入楼层本地名称", trigger: "blur" },
         ],
         floorSequenceID: [
-          { validator: validateFloor, required: true, trigger: "blur" },
+          { required: true, message: "请输入楼层顺序号",  trigger: "blur" },
         ],
       },
     };
@@ -201,7 +195,7 @@ export default {
           }
           switch (
             item.code //过滤掉待删除的
-          ) {
+            ) {
             case "floorIdentity":
             case "relatedSchedule":
             case "outPeopleFlow":
@@ -234,6 +228,9 @@ export default {
       font-size: 12px;
     }
   }
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 
   /deep/ .FloorTypeSelect .el-form-item__content {
     width: 200px;

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

src/components/relation/overview/Modal/RelationMaintain.vue

@@ -87,19 +87,28 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <p>源端设备类：</p>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            multiple
-            @change="changeVal"
-          >
-            <el-option
-              v-for="item in oraginOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
+          <el-tooltip placement="top" :disabled="!sourceSideList.length">
+						<div slot="content">
+							<ul>
+								<li  v-for="item in sourceSideList" :key="item.sourceType">
+									{{`${oraginOption.find(e => e.value === item.sourceType)? oraginOption.find(e => e.value === item.sourceType).label : ""}：${item.sourceCount}个`}}
+								</li>
+							</ul>
+						</div>
+            <el-select
+                v-model="value"
+                placeholder="请选择"
+                multiple
+                @change="changeVal"
+            >
+                <el-option
+                v-for="item in oraginOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+                />
+            </el-select>
+        	</el-tooltip>
         </el-col>
         <el-col :span="12">
           <p>末端设备类：</p>
@@ -300,6 +309,7 @@ export default {
       setOriginOption: [],
       setEndValue: [],
       setEndOptions: [],
+			sourceSideList: [],
       disabled: false
     }
   },
@@ -347,6 +357,7 @@ export default {
       sourceQuery(param, res => {
         this.value = []
         this.setValue = []
+				this.sourceSideList = res.content ? res.content : [];
         res.content && res.content.forEach(({sourceType}) => sourceType && this.value.push(sourceType))
         //启动计算
         res.content && res.content.forEach(({sourceType}) => sourceType && this.setValue.push(sourceType))

src/components/relation/relationShip/Modal/exportExcel.vue

@@ -207,9 +207,9 @@ export default {
 						type: 'primary',
 					}]
 				}
-        this.dialogExport = true
-        this.dialogProcess = true
-
+        this.dialogExport = false;
+        this.dialogProcess = true;
+        this.$emit('upDataTable')
       },
       error(event, file, fileList) {
 				this.activities = [{
@@ -225,9 +225,9 @@ export default {
 					size: 'large',
 					type: 'primary',
         }]
-        this.dialogExport = true
-        this.dialogProcess = true
-
+        this.dialogExport = false;
+        this.dialogProcess = true;
+        this.$emit('upDataTable')
       },
       errBack() {
         this.dialogProcess = false

src/data/menus.js

@@ -315,16 +315,16 @@ export default [
     disabled: true,
   },
 // 项目数据转换
-  {
-    path: '/relation/data',
-    name: '项目数据转换',
-    icon: 'icon-view',
-    opts: [{
-      name: '查看',
-      basic: true,
-      permission: 'system:role:query'
-    }]
-  },
+//   {
+//     path: '/relation/data',
+//     name: '项目数据转换',
+//     icon: 'icon-view',
+//     opts: [{
+//       name: '查看',
+//       basic: true,
+//       permission: 'system:role:query'
+//     }]
+//   },
   {
     path: '/synclog',
     name: '数据同步日志',

src/framework/layout/Main.vue

@@ -18,7 +18,7 @@
           <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
         </keep-alive>
         <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
-        <div class="version">当前版本： V 3.9.10</div>
+        <div class="version">当前版本： V 3.10</div>
       </div>
     </div>
     <!-- <div class='page-footer'>

src/framework/layout/PageHeader.vue

@@ -34,7 +34,8 @@
 <!--      </el-dropdown>-->
       <ul class="header-nav">
         <li class="header-nav-set">
-            <router-link to="/ready/collectsetting"><i class="el-icon-s-tools"></i></router-link>
+            <!-- <router-link to="/ready/collectsetting"><i class="el-icon-s-tools"></i></router-link> -->
+            <a @click.ctrl="$router.push({path: '/ready/collectsetting'})"><i class="el-icon-s-tools"></i></a>
         </li>
         <li class="header-nav-Splitscreen">
           <a href="/splitScreen" target="_blank"><i class="el-icon-s-platform"></i></a>

src/framework/layout/layout-store.js

@@ -26,7 +26,7 @@ export default {
     },
     projectId: '',
     group_code: '',
-    projects: project["14"],
+    projects: project["39"],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码

src/framework/layout/project.js

@@ -1,196 +1,265 @@
 const project = {
-  "39": [
+  MKL: [
     {
+      id: "Pj0000000001",
+      name: "飞龙商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000002",
+      name: "常州常武",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000003",
+      name: "上海金桥商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000004",
+      name: "上海金山商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000005",
+      name: "上海真北商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000006",
+      name: "上海浦江商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000007",
+      name: "上海汶水商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000008",
+      name: "上海吴中路商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000009",
+      name: "上海沪南商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000010",
+      name: "北京西四环商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000011",
+      name: "北京至尊mall（东四环）",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000012",
+      name: "北京北五环商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    },
+    {
+      id: "Pj0000000013",
+      name: "北京北四环商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    }
+  ],
+  '39': [{
+      id: "Pj3702020020",
+      name: "青岛海天APM",
+      pwd: "saga123456",
+      group_code: "GX"
+    }, {
+      id: "Pj4690060001",
+      name: "石梅湾酒店",
+      pwd: "saga123456",
+      group_code: "HR"
+    }, {
+      id: "Pj5001070003",
+      name: "重庆万象城",
+      pwd: "saga123456",
+      group_code: "HR"
+    }, {
       id: "Pj4501030002",
       name: "南宁万象城",
       pwd: "saga123456",
       group_code: "HR"
-    },
-    {
+    }, {
+      id: "Pj3101150008",
+      name: "金砖银行",
+      pwd: "saga123456",
+      group_code: "JZD"
+    }, {
       id: "Pj3702120002",
       name: "青岛港务局航运中心",
       pwd: "saga123456",
       group_code: "QD"
-    },
-    {
+    }, {
       id: "Pj4403050002",
       name: "深圳万象天地",
       pwd: "saga123456",
       group_code: "HR"
-    },
-    {
+    }, {
       id: "Pj1101051029",
       name: "北京万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj0001110001",
       name: "飞龙商场",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "MK"
+    }, {
       id: "Pj1101050029",
       name: "东坝万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj4403070003",
       name: "深圳龙岗万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj4403050019",
       name: "招商深圳太子广场汇港二期",
       pwd: "saga123456",
       group_code: "ZS"
-    },
-    {
+    }, {
       id: "Pj5001120003",
       name: "香港置地约克北郡",
       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",
       group_code: "BT"
-    },
-    {
+    }, {
       id: "Pj1101080259",
       name: "博锐尚格北京总部办公楼",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj1101150002",
       name: "华润生命科学园",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj3101150007",
       name: "招商上海森兰花园城",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "ZS"
+    }, {
       id: "Pj5101080004",
       name: "成都招商花园城",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "ZS"
+    }, {
       id: "Pj3201130004",
       name: "招商南京燕子矶花园城",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "ZS"
+    }, {
       id: "Pj3702120001",
       name: "金融中心",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj1101051130",
       name: "万达模型测试项目2",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj0002220001",
       name: "数字化交付01",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220002",
       name: "数字化交付02",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220003",
       name: "数字化交付03",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220004",
       name: "数字化交付04",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220005",
       name: "数字化交付05",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220006",
       name: "数字化交付06",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220007",
       name: "数字化交付07",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220008",
       name: "数字化交付08",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220009",
       name: "数字化交付09",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj0002220010",
       name: "数字化交付10",
       pwd: "saga123456",
       group_code: "BR"
     }
   ],
-  "14": [
-    {
-      id: "Pj1101051029",
-      name: "北京万达广场",
-      pwd: "saga123456",
-      group_code: "WD"
-    },
+  '14': [{
+    id: "Pj1101051029",
+    name: "北京万达广场",
+    pwd: "saga123456",
+    group_code: "WD"
+  },
     {
       id: "Pj1101050029",
-      name: "北京东坝万达广场",
+      name: "东坝万达广场",
       pwd: "saga123456",
       group_code: "WD"
     },
@@ -231,122 +300,118 @@ const project = {
       group_code: "ZS"
     },
     {
+      id: "Pj3201130004",
+      name: "招商南京燕子矶花园城项目",
+      pwd: "saga123456",
+      group_code: "ZS"
+    },
+    {
+      id: "Pj4403050019",
+      name: "招商IOC广场",
+      pwd: "saga123456",
+      group_code: "ZS"
+    },
+    {
       id: "Pj1101080259",
       name: "博锐尚格北京总部办公楼",
       pwd: "saga123456",
       group_code: "BR"
-    }
-  ],
-  "18": [
+
+    }],
+  '18': [
     {
       id: "Pj1101051029",
       name: "北京万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj0001110001",
       name: "飞龙商场",
       pwd: "saga123456",
       group_code: "MK"
-    },
-    {
+    }, {
       id: "Pj0001110002",
       name: "常州常武",
       pwd: "saga123456",
       group_code: "MK"
-    },
-    {
+    }, {
       id: "Pj1101050029",
       name: "东坝万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj4403070003",
       name: "深圳龙岗万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj4403050019",
       name: "招商深圳太子广场汇港二期",
       pwd: "saga123456",
       group_code: "ZS"
-    },
-    {
+    }, {
       id: "Pj5001120003",
       name: "香港置地约克北郡",
       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",
       group_code: "BT"
-    },
-    {
+    }, {
       id: "Pj1101080259",
       name: "博锐尚格北京总部办公楼",
       pwd: "saga123456",
       group_code: "BR"
-    },
-    {
+    }, {
       id: "Pj1101150002",
       name: "华润生命科学园",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj3101150007",
       name: "招商上海森兰花园城",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "ZS"
+    }, {
       id: "Pj5101080004",
       name: "成都招商花园城",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "ZS"
+    }, {
       id: "Pj3201130004",
       name: "招商南京燕子矶花园城",
       pwd: "saga123456",
-      group_code: "WD"
-    },
-    {
+      group_code: "ZS"
+    }, {
       id: "Pj3702120001",
       name: "金融中心",
       pwd: "saga123456",
       group_code: "WD"
-    },
-    {
+    }, {
       id: "Pj1101051130",
       name: "万达模型测试项目2",
       pwd: "saga123456",
       group_code: "WD"
     }
   ]
-};
 
-export default project;
+}
+
+export default project

src/utils/handsontable/buildFloorData.js

@@ -12,14 +12,14 @@ const buildFloor = {
             "localName"
         ]
     }, floorParams = {
-        orders: "floorSequenceId desc",
+        orders: "floorSequenceID desc",
         pageNumber: 1,
         pageSize: 1000,
         projection: [
             "buildingId",
             "id",
             "localName",
-            "floorSequenceId"
+            "floorSequenceID"
         ]
     }
 

src/utils/handsontable/notShow.js

@@ -352,6 +352,7 @@ const showTools = {
     if (
       item.code == "installPic" ||
       item.code == "nameplate" ||
+      item.code == "systemChart" ||
       item.code == "pic"
     ) {
       return {
@@ -458,6 +459,7 @@ const showTools = {
     if (
       item.code == "installPic" ||
       item.code == "nameplate" ||
+      item.code == "systemChart" ||
       item.code == "pic"
     ) {
       return {

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

src/views/business_space/dataUtil/index.vue

@@ -449,7 +449,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

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
       }

src/views/data_admin/buildData/index.vue

@@ -745,7 +745,7 @@ export default {
     getFloorData() {
       let param = {
         filters: `buildingId='${this.buildId}'`,
-        orders: 'floorSequenceId desc'
+        orders: 'floorSequenceID desc'
       };
       floorQuery(param, res => {
         this.floorList = res.content

src/views/data_admin/buildGraphy/index.vue

@@ -110,7 +110,7 @@ export default {
     getList() {
       let param = {
         cascade: [
-          { name: "floor", orders: "floorSequenceId desc", }
+          { name: "floor", orders: "floorSequenceID desc", }
         ],
         pageNumber: 1,
         pageSize: 50

src/views/ledger/cenotelist/relatedSpace.vue

@@ -223,7 +223,7 @@ export default {
           cascade: [
             {
               name: "floor",
-              orders: "floorSequenceId desc, name asc",
+              orders: "floorSequenceID desc, name asc",
             }
           ]
         };

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 =>{

src/views/ledger/facility/parts/index.vue

@@ -170,7 +170,7 @@ export default {
         pageNumber: this.page.pageNumber,
         pageSize: this.page.PageSize,
         orders: "createTime desc, localName desc, localId desc, id desc",
-        filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
+        filters: `classCode='${this.tabVal}';parentId='${this.deviceId}'`
       };
       await getEquipPartsCon(params, res => {
         this.tableData = res.content;

src/views/ledger/system/addsystem.vue

@@ -24,7 +24,8 @@
     <el-row class="center">
       <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button" :disabled="createDisable">创建系统</el-button>
     </el-row>
-
+		<!-- 上传图片组件 -->
+		<upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" firmDataType="row" :dialog="myDialog"></upload-img-dialog>
     <!-- 关联楼层 -->
     <editSysfloor ref="editFloor" @relateSuccess="relateSuccess" :isCreate="true"></editSysfloor>
   </div>
@@ -37,6 +38,7 @@ import text from "@/utils/handsontable/mainText";
 import session from "@/framework/utils/storage";
 
 import editSysfloor from "@/components/ledger/lib/editSysFloor";
+import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
 import handsonTable from "@/components/common/handsontable";
 import { getDataDictionary } from "@/api/dict";
 import {
@@ -51,7 +53,8 @@ import qrcode from "@/components/ledger/lib/qrcode";
 export default {
   components: {
     handsonTable,
-    editSysfloor
+    editSysfloor,
+		uploadImgDialog
   },
   data() {
     return {
@@ -365,6 +368,12 @@ export default {
             this.$refs.editFloor.showDialog(this.tableData[row.row]);
           }
           break;
+				//系统图(F2)
+        case "infos.systemChart":
+          let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
+          this.imgsArr = SSPPdata ? SSPPdata : [];
+          this.myDialog.uploadImgs = true;
+          return false;
         default:
           break;
       }
@@ -379,10 +388,28 @@ export default {
         });
       }
     },
+		//上传图片弹窗触发事件
+    imgChange(keys) {
+			this.setDataToMain(keys, this.messKey, this.row);
+    },
     //建筑楼层
     relateSuccess(data) {
       this.tableData[this.row].buildingFloorInfoList = data
       this.tableExample.render()
+    },
+		//判断是否有值，有值赋值
+    setDataToMain(data, key, row) {
+			if (!!data && data != "--") {
+        if (!!this.tableData[row]) {
+          tools.setDataForKey(this.tableData[row], key, data);
+          this.handleUpdataTable([[row, key, null, data]], "edit");
+        } else {
+          this.tableData[row] = {};
+          tools.setDataForKey(this.tableData[row], key, data);
+        }
+      } else {
+        tools.setDataForKey(this.tableData[row], key, "");
+      }
     }
   }
 };

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;

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;

src/views/point/dynamicdata/addRelation/floorRela/index.vue

@@ -428,7 +428,7 @@ export default {
               t.ObjectID = t.id.substr(12);
               t.ObjectLocalName = t.localName;
               t.ObjectLocalCode = t.localId;
-              t.ObjectSequenceID = t.floorSequenceId;
+              t.ObjectSequenceID = t.floorSequenceID;
               t.BuildLocalName = t.building ? t.building.localName : '';
               return t;
             });

src/views/ready/buildfloor/index.vue

@@ -85,7 +85,7 @@
       <div>确定要删除该{{ delText }}？</div>
       <span class="dialog-footer" slot="footer">
         <el-button @click="delDialogVis=false" size="small">取消</el-button>
-        <el-button @click="confirmDel" size="small" type="primary" :disabled="buildDisabled">确认</el-button>
+        <el-button @click="confirmDel" size="small" type="primary">确认</el-button>
       </span>
     </el-dialog>
     <!-- 添加贯通关系弹窗 -->
@@ -103,8 +103,10 @@ import {
   buildingQueryAndCount,
   floorQueryAndSign,
   manageDeleteFloor,
-  objectCreateBuild,
   objectDeleteBuild,
+  deleteFloorInfo,
+  deleteBuildInfo,
+  objectCreateBuild,
   objectQueryBuild,
   objectUpdateBuild
 } from "@/api/scan/request";
@@ -122,7 +124,6 @@ export default {
       floorTitle: "添加楼层",
       buildTitle: "添加建筑",
       delDialogVis: false,
-      buildDisabled: false,
       delText: "建筑",
       headerStyle: {
         backgroundColor: "#d9d9d9",
@@ -313,27 +314,23 @@ export default {
     },
     // 确认删除(删除建筑-楼层公用)
     confirmDel() {
-      this.buildDisabled = true
       if (this.delText == "楼层") {
         let delParam = [{ id: this.curFloorId }];
         this.delDialogVis = false;
-        manageDeleteFloor(delParam, res => {
+        deleteFloorInfo(delParam, res => {
           this.$message.success("删除成功");
-          this.buildDisabled = false
           this.init();
         });
       } else {
         // 删除建筑
         if (this.tableData && this.tableData.length) {
-          this.buildDisabled = false
           this.$message.error("当前建筑中包含楼层，不可删除");
           this.delDialogVis = false;
         } else {
           let param = [{ id: this.curBuildId }];
           this.delDialogVis = false;
-          objectDeleteBuild(param, res => {
+          deleteBuildInfo(param, res => {
             this.$message.success("删除成功");
-            this.buildDisabled = false
             this.handleBuildQuery()
             this.init()
           })

src/views/ready/buildfloor/repetitionGraphy.vue

@@ -191,7 +191,6 @@ export default {
     // 替换模型文件成功
     refresh(modelId,pa) {
       this.modelId = modelId
-      this.currentModelId = pa.id;
       this.hasGraph = true;
       const temp = this.modelId.split('.');
       if (temp[1]) {
@@ -202,7 +201,10 @@ export default {
         }
       } else {
         this.key = '';
-        pa && pa.id && this.getFileName(pa.id)
+        if (pa && pa.id) {
+          this.getFileName(pa.id)
+          this.currentModelId = pa.id;
+        }
         this.initFromModelId(this.modelId)
       }
     },

src/views/relation/overview/detail/index.vue

@@ -231,7 +231,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {