Browse Source

历史遗留bug修改

zhangyu 5 years ago
parent
commit
206aa1bb4e

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

@@ -465,7 +465,7 @@
                      arr = showTools.arrToArr(arr)
                      readArr.push("Own")
                  }
-                 let data = showTools.changeHeader(arr, readArr, false, false, true, true, true)
+                 let data = showTools.changeHeader(arr, readArr, false, false, true, false, true)
                  data.unshift("是否关联平面图", "与空间相关联的设备");
                  console.log("header", data)
                  return data;
@@ -478,7 +478,7 @@
               */
              getType(list) {
                  let arr = tools.copyArr(list)
-                 let data = showTools.showTypes(arr, false, false, true, true, ["F1", "F2"])
+                 let data = showTools.showTypes(arr, false, false, true, false, ["F1", "F2"])
                  data.unshift({
                      data: "hasSi",
                      renderer: this.myRenderer,

+ 1 - 1
src/components/common/handsontable.vue

@@ -5,7 +5,7 @@
 
 <template>
     <div style="height: 100%;width: 100%;">
-        <div :id="id"></div>
+        <div :id="id" style="overflow: auto;"></div>
     </div>
 </template>
 <script>

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

@@ -1270,7 +1270,7 @@ http://47.94.89.44:8058/asset?id=${infos.id}&pid=${this.projectId}&secret=${this
   padding: 5px 10px;
   font-size: 14px;
   overflow: hidden;
-  // margin-top: 10px;
+  margin-top: 0;
   line-height: 40px;
   .iconfont {
     font-size: 12px;

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

@@ -1345,7 +1345,7 @@ export default {
   padding: 5px 10px;
   font-size: 14px;
   overflow: hidden;
-  // margin-top: 10px;
+  margin-top: 0;
   line-height: 40px;
   .iconfont {
     font-size: 12px;

+ 4 - 4
src/components/ledger/handsontables/system.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 94%;">
+  <div style="height: calc(100% - 44.5px);padding: 0px 10px 10px;box-sizing: border-box;">
     <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}系统</span>
       <div style="float:right;overflow:hidden;">
@@ -81,7 +81,7 @@
             </p>
         </div>
     
-    <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable" style="margin-left:10px"></div>
+    <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
     <div v-show="mess.deviceId && main && main.length" class="right">
         <my-pagination @change="getMain" :page="page"></my-pagination>
     </div>
@@ -661,7 +661,7 @@ export default {
         columns: this.getType(this.headers), //数据显示格式
         filters: true,
         maxRows: this.main.length,
-        height: winHeight - 100 - 50 - 200,
+        height: winHeight - 335,
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,
@@ -1083,7 +1083,7 @@ http://47.94.89.44:8058/system?id=${infos.id}&pid=${this.projectId}&secret=${thi
   padding: 5px 10px;
   font-size: 14px;
   overflow: hidden;
-  margin-top: 10px;
+  margin-top: 0;
   line-height: 40px;
   .iconfont {
     font-size: 12px;

+ 5 - 5
src/components/ledger/lib/cenoteType.vue

@@ -4,9 +4,9 @@
     <el-select v-model="id" @change="changeVal">
     <el-option
       v-for="item in options"
-      :key="item.ID"
+      :key="item.Id"
       :label="item.Name"
-      :value="item.ID">
+      :value="item.Id">
     </el-option>
   </el-select>
   </div>
@@ -32,7 +32,7 @@ export default {
     projectId() {
       this.getData()
       if (this.options.length) {
-        this.changeVal(this.options[0].ID)
+        this.changeVal(this.options[0].Id)
       }
     }
   },
@@ -41,7 +41,7 @@ export default {
     changeVal(val) {
       let value = {};
       this.options.map(item => {
-        if (item.ID == val) {
+        if (item.Id == val) {
           value = item;
         }
       });
@@ -59,7 +59,7 @@ export default {
       await getCenoteType (param, res => {
         var data = res.Content;
         data.unshift({
-          ID: "",
+          Id: "",
           Name: "全部"
         });
         this.options = data;

+ 1 - 0
src/components/ledger/lib/floorCascader.vue

@@ -50,6 +50,7 @@
                 this.value = ['all'];
                 this.options = [];
                 this.param.ProjId = this.projectId
+                this.param.secret = this.secret
                 this.getData()
                 this.changeCascader(['all'])
             }

+ 9 - 2
src/framework/layout/layout-store.js

@@ -17,7 +17,7 @@ export default {
         projectId: '',
         projects: [],
         breadcrumb: [],
-        secret: "saga123456", //密码
+        secret: "", //密码
         userId: "test", //用户id
     },
     getters: {
@@ -66,6 +66,11 @@ export default {
             state.projectId = val
             localStorage.setItem('projectId', val)
             storage.set(KEY_PROJECT_SELECTED, val)
+            state.projects.map((item) =>{
+                if(item.id == val) {
+                    state.secret = item.pwd
+                }
+            })
         }
     },
     actions: {
@@ -84,11 +89,13 @@ export default {
                         if (resp.projects) {
                             if(resp.projects[0] && resp.projects[0].projId) {
                                 state.projectId = resp.projects[0].projId
+                                state.secret = resp.projects[0].secret
                             }
                             resp.projects.forEach(proj =>
                                 state.projects.push({
                                     id: proj.projId,
-                                    name: proj.projLocalName
+                                    name: proj.projLocalName,
+                                    pwd: proj.secret,
                                 })
                             )
                         }

+ 92 - 92
src/utils/handsontable/notShow.js

@@ -540,7 +540,7 @@ const showTools = {
         return data
     },
 
-    showHeaderTypes(arr, onlyRead, isWatch, allMess, falg = false, typeArr = false) {
+    showHeaderTypes(arr, typeArr, onlyRead, isWatch, allMess, falg = false) {
         let data = arr.map(item => {
             if (item.FirstTag && !item.FirstTag == "") {
                 item.InfoPointCode = `${item.FirstTag}.${item.InfoPointCode}`
@@ -556,110 +556,110 @@ const showTools = {
                 return undefined
             }
             if (!!typeArr && typeArr.indexOf(item.InputMode) > -1) {
-                return undefined
-            }
-            if (item.Visible || !allMess) {
-                //固定不显示的code
-                if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
-                    return undefined
-                }
-
-                if (!showTools.isShow(item.InfoPointCode)) {
-                    if (isWatch && !onlyRead) {
+                if (item.Visible || !allMess) {
+                    //固定不显示的code
+                    if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
                         return undefined
                     }
-                }
-
-                if (item.InfoPointCode == "EquipQRCode") {
-                    return {
-                        data: item.InfoPointCode,
-                        renderer: text.lookQRCode,
-                        readOnly: onlyRead
-                    }
-                }
-
-                //图片类型
-                if (
-                    item.InfoPointCode == "InstallPic" ||
-                    item.InfoPointCode == "InstallDrawing" ||
-                    item.InfoPointCode == "Nameplate" ||
-                    item.InfoPointCode == "Pic" ||
-                    item.InfoPointCode == "Drawing"
-                ) {
-                    return {
-                        data: item.InfoPointCode,
-                        renderer: text.picType,
-                        readOnly: onlyRead
+    
+                    if (!showTools.isShow(item.InfoPointCode)) {
+                        if (isWatch && !onlyRead) {
+                            return undefined
+                        }
                     }
-                }
-
-                //文件类型
-                if (item.InfoPointCode == "InsuranceFile" ||
-                    item.InfoPointCode == "Archive" ||
-                    item.InfoPointCode == "CheckReport") {
-                    return {
-                        data: item.InfoPointCode,
-                        renderer: text.fileType,
-                        readOnly: onlyRead
+    
+                    if (item.InfoPointCode == "EquipQRCode") {
+                        return {
+                            data: item.InfoPointCode,
+                            renderer: text.lookQRCode,
+                            readOnly: onlyRead
+                        }
                     }
-                }
-
-                if (item.InputMode == "D1" || item.InputMode == "D2") {
-                    return {
-                        data: item.InfoPointCode,
-                        renderer: tools.customDropdownRenderer,
-                        editor: "chosen",
-                        readOnly: onlyRead,
-                        chosenOptions: {
-                            multiple: true, //多选
-                            data: item.DataSource? tools.formatDataSource(item.DataSource): ""
+    
+                    //图片类型
+                    if (
+                        item.InfoPointCode == "InstallPic" ||
+                        item.InfoPointCode == "InstallDrawing" ||
+                        item.InfoPointCode == "Nameplate" ||
+                        item.InfoPointCode == "Pic" ||
+                        item.InfoPointCode == "Drawing"
+                    ) {
+                        return {
+                            data: item.InfoPointCode,
+                            renderer: text.picType,
+                            readOnly: onlyRead
                         }
-                    };
-                } else if (item.InputMode == "E1") {//单选
-                    return {
-                        data: item.InfoPointCode,
-                        renderer: tools.customDropdownRenderer,
-                        editor: "chosen",
-                        readOnly: onlyRead,
-                        chosenOptions: {
-                            data: item.DataSource? tools.formatDataSource(item.DataSource): ""
+                    }
+    
+                    //文件类型
+                    if (item.InfoPointCode == "InsuranceFile" ||
+                        item.InfoPointCode == "Archive" ||
+                        item.InfoPointCode == "CheckReport") {
+                        return {
+                            data: item.InfoPointCode,
+                            renderer: text.fileType,
+                            readOnly: onlyRead
                         }
-                    };
-                } else if (item.InputMode == "A1" || item.InputMode == "A2") {
-                    return {
-                        data: item.InfoPointCode,
-                        type: "numeric",
-                        readOnly: onlyRead,
-                        numericFormat: {
-                            pattern: "0,0.00"
-                                // culture: 'de-DE' // use this for EUR (German),
-                                // more cultures available on http://numbrojs.com/languages.html
+                    }
+    
+                    if (item.InputMode == "D1" || item.InputMode == "D2") {
+                        return {
+                            data: item.InfoPointCode,
+                            renderer: tools.customDropdownRenderer,
+                            editor: "chosen",
+                            readOnly: onlyRead,
+                            chosenOptions: {
+                                multiple: true, //多选
+                                data: item.DataSource? tools.formatDataSource(item.DataSource): ""
+                            }
+                        };
+                    } else if (item.InputMode == "E1") {//单选
+                        return {
+                            data: item.InfoPointCode,
+                            renderer: tools.customDropdownRenderer,
+                            editor: "chosen",
+                            readOnly: onlyRead,
+                            chosenOptions: {
+                                data: item.DataSource? tools.formatDataSource(item.DataSource): ""
+                            }
+                        };
+                    } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+                        return {
+                            data: item.InfoPointCode,
+                            type: "numeric",
+                            readOnly: onlyRead,
+                            numericFormat: {
+                                pattern: "0,0.00"
+                                    // culture: 'de-DE' // use this for EUR (German),
+                                    // more cultures available on http://numbrojs.com/languages.html
+                            }
+                        };
+                    } else if (item.InputMode == "C5") {
+                        return {
+                            data: item.InfoPointCode,
+                            type: "date",
+                            dateFormat: "YYYY-MM-DD",
+                            readOnly: onlyRead,
+                            correctFormat: true
+                        };
+                    } else if (item.InputMode == "Own" && !onlyRead) {
+                        return {
+                            data: item.InfoPointCode,
+                            renderer: text.idType,
+                            readOnly: onlyRead
                         }
-                    };
-                } else if (item.InputMode == "C5") {
-                    return {
-                        data: item.InfoPointCode,
-                        type: "date",
-                        dateFormat: "YYYY-MM-DD",
-                        readOnly: onlyRead,
-                        correctFormat: true
-                    };
-                } else if (item.InputMode == "Own" && !onlyRead) {
-                    return {
-                        data: item.InfoPointCode,
-                        renderer: text.idType,
-                        readOnly: onlyRead
+                    } else {
+                        return {
+                            data: item.InfoPointCode,
+                            readOnly: onlyRead
+                        };
                     }
                 } else {
-                    return {
-                        data: item.InfoPointCode,
-                        readOnly: onlyRead
-                    };
+                    return undefined
                 }
             } else {
                 return undefined
             }
-
         }).filter(item => item);
         return data
     }

+ 5 - 4
src/views/ledger/cenotelist/index.vue

@@ -137,7 +137,7 @@ export default {
     },
     async getTableData() {//获取表格数据
       let data = {
-        Filters: this.cenoteId? `ProjectId='${this.projectId}';ShaftFuncType='${this.cenoteId}'`: `ProjectId='${this.projectId}'`,
+        Filters: this.cenoteId? `ProjectId='${this.projectId}';structureInfo.ShaftFuncType='${this.cenoteId}'`: `ProjectId='${this.projectId}'`,
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
@@ -267,7 +267,7 @@ export default {
     },
     //切换竖井类型
     changeFloor(value) {
-      this.cenoteId = value.ID
+      this.cenoteId = value.Id
       this.getTableHeader()
     },
     //关闭右侧关联元空间输入按钮
@@ -290,7 +290,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "N2", "X"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
       if (!this.onlyRead) {
         readArr.push("Own")
       }
@@ -303,7 +303,8 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let data = showTools.showHeaderTypes(arr, this.onlyRead, false, this.allMess)
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
+      let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       data.unshift({
         data: "SpaceCount",
         renderer: tools.num,

+ 2 - 1
src/views/ledger/facility/index.vue

@@ -72,7 +72,8 @@ export default {
   },
   watch: {
       projectId() {
-          this.param.ProjId = this.projectId;
+          this.param.ProjId = this.projectId
+          this.param.secret = this.secret
           this.getProjName()
       }
   },

+ 1 - 0
src/views/ledger/property/index.vue

@@ -74,6 +74,7 @@ export default {
   watch: {
     projectId() {
         this.param.ProjId = this.projectId
+        this.param.secret = this.secret
         this.getProjName()
     }
   },

+ 4 - 3
src/views/ledger/system/index.vue

@@ -72,6 +72,7 @@ export default {
     watch: {
     projectId() {
         this.param.ProjId = this.projectId
+        this.param.secret = this.secret
         this.getProjName()
     }
   },
@@ -174,17 +175,17 @@ export default {
 #deviceList {
   overflow: hidden;
   height: 100%;
-  background-color: #f6f6f6;
+  background-color: #fff;
   position: relative;
   .table-main {
     position: absolute;
     top: 87px;
-    bottom: 10px;
+    bottom: 0;
     left: 0;
     right: 0;
     background-color: #fff;
     // border-radius: 5px;
-    padding: 10px 0;
+    // padding: 10px 0;
   }
   .search-header {
     overflow: hidden;

+ 4 - 3
src/views/rent/rentlist/index.vue

@@ -40,7 +40,7 @@
             type="textarea"
             :autosize="{ minRows: 6, maxRows: 10}"
             :disabled="onlyRead"
-            placeholder="请输入空间id,以“,”分割"
+            placeholder="请输入业务空间id,以“,”分割"
             v-model="roomId">
           </el-input>
           <el-row class="right" v-show="!onlyRead">
@@ -296,7 +296,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "N2", "X"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
       if (!this.onlyRead) {
         readArr.push("Own")
       }
@@ -309,7 +309,8 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let data = showTools.showHeaderTypes(arr, this.onlyRead, false, this.allMess)
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "X"]
+      let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       data.unshift({
         data: "caozuo",
         renderer: tools.lookDetails,