Browse Source

租户和竖井接口数据格式变更调整

zhangyu 5 years ago
parent
commit
ea6041556e

+ 27 - 25
src/framework/style/layout.scss

@@ -178,39 +178,41 @@ body {
 
 // #page-main #page-container #page-content-wrapper .page-content.page-table-template {
 #page-main #page-container #page-content-wrapper .page-table-template {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    flex-grow: 1;
-    flex-shrink: 1;
+    // display: flex;
+    // flex-direction: column;
+    // justify-content: flex-start;
+    // align-items: stretch;
+    // flex-grow: 1;
+    // flex-shrink: 1;
+    height: 100%;
     >.query-form {
         flex-grow: 0;
         flex-shrink: 0;
     }
     >.data-table {
-        flex-grow: 1;
-        flex-shrink: 1;
-        overflow-x: auto;
-        overflow-y: auto;
-        background: rgb(242, 242, 242);
-        margin-top: 10px;
+        // flex-grow: 1;
+        // flex-shrink: 1;
+        height: calc(100% - 52px);
+        // overflow-x: auto;
+        // overflow-y: auto;
+        background: #fff;
+        // margin-top: 10px;
     }
     >.data-table-pagination {
-        z-index: 99999;
+    //     z-index: 99999;
         margin-top: 10px;
-        flex-grow: 0;
-        flex-shrink: 0;
-        display: flex;
-        justify-content: flex-end;
-        text-align: center;
-        position: fixed;
-        bottom: 0;
-        background: #f2f2f2;
-        left: 242px;
-        right: 0;
-        padding-top: 10px;
-        padding-bottom: 10px;
+    //     flex-grow: 0;
+    //     flex-shrink: 0;
+    //     display: flex;
+    //     justify-content: flex-end;
+        text-align: right;
+    //     position: fixed;
+    //     bottom: 0;
+    //     background: #f2f2f2;
+    //     left: 242px;
+    //     right: 0;
+    //     padding-top: 10px;
+    //     padding-bottom: 10px;
     }
 }
 

+ 3 - 0
src/utils/handsontable/notShow.js

@@ -542,6 +542,9 @@ const showTools = {
 
     showHeaderTypes(arr, onlyRead, isWatch, allMess, falg = false, typeArr = false) {
         let data = arr.map(item => {
+            if (item.FirstTag && !item.FirstTag == "") {
+                item.InfoPointCode = `${item.FirstTag}.${item.InfoPointCode}`
+            }
             if (falg) {
                 if (item.FirstTag == "控制参数" ||
                     item.FirstTag == "设定参数" ||

+ 2 - 2
src/views/data_admin/buildAssets/NoMap.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page-table-template" style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
         <div class='data-table'>
-            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading' height="700px">
+            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading' height="100%">
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑'  width="150"></el-table-column>、
             <el-table-column header-align='center' align='center' prop='floorName' label='楼层' width="80"></el-table-column>
             <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>
@@ -25,7 +25,7 @@
             </el-table-column>
         </el-table>
         </div>
-        <base-pagination class='data-table-pagination' :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+        <base-pagination class='data-table-pagination' style="text-align:right;" :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
         <!-- component -->
         <saga-dialog ref='dialog' :iframeSrc='iframeSrc'></saga-dialog>
         <saga-station ref='station' :options='options' :itemObj='itemObj' @refresh='refresh'></saga-station>

+ 25 - 25
src/views/data_admin/buildAssets/Nofind.vue

@@ -1,31 +1,31 @@
 <template>
     <div class="page-table-template" style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
-        <div  class='data-table'>
-            <el-table :data='tableData' style='width: 100%' border v-loading='loading' height="700px">
-            <el-table-column header-align='center' align='center' prop='BuildName' label='建筑' width="150"></el-table-column>、
-            <el-table-column header-align='center' align='center' prop='floorName' label='楼层'  width="80"></el-table-column>
-            <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>
-                <template slot-scope='scope'>
-                    <span>{{scope.row.PointName || '--'}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column header-align='center' align='center' prop='FamilyName' label='设备族'></el-table-column>
-            <el-table-column header-align='center' align='center' label='本地编码' width='250'>
-                <template slot-scope='scope'>
-                    <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
-                    
-                </template>
-            </el-table-column>
-            <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
-            <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
-                <template slot-scope='scope'>
-                    <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
-                    <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+        <div class='data-table'>
+            <el-table :data='tableData' style='width: 100%;' v-loading='loading' height="100%">
+                <el-table-column header-align='center' align='center' prop='BuildName' label='建筑' width="150"></el-table-column>、
+                <el-table-column header-align='center' align='center' prop='floorName' label='楼层'  width="80"></el-table-column>
+                <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>
+                    <template slot-scope='scope'>
+                        <span>{{scope.row.PointName || '--'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column header-align='center' align='center' prop='FamilyName' label='设备族'></el-table-column>
+                <el-table-column header-align='center' align='center' label='本地编码' width='250'>
+                    <template slot-scope='scope'>
+                        <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
+                        
+                    </template>
+                </el-table-column>
+                <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
+                    <template slot-scope='scope'>
+                        <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
+                        <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
         </div>
-        <base-pagination class='data-table-pagination' :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+        <base-pagination class='data-table-pagination' style="text-align:right;" :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
         <saga-dialog ref='dialog' :iframeSrc='iframeSrc'></saga-dialog>
     </div>
 </template>

+ 23 - 23
src/views/data_admin/buildAssets/Nopaint.vue

@@ -1,30 +1,30 @@
 <template>
     <div class="page-table-template" style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
         <div class='data-table'>
-            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading' height="700px">
-            <el-table-column header-align='center' align='center' prop='BuildName' label='建筑'  width="150"></el-table-column>、
-            <el-table-column header-align='center' align='center' prop='floorName' label='楼层' width="80"></el-table-column>
-            <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>
-                <template slot-scope='scope'>
-                    <span>{{scope.row.PointName || '--'}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column header-align='center' align='center' prop='FamilyName' label='设备族'></el-table-column>
-            <el-table-column header-align='center' align='center' label='本地编码' width='250'>
-                <template slot-scope='scope'>
-                    <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
-            <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
-                <template slot-scope='scope'>
-                    <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
-                    <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+            <el-table  :data='tableData' style='width: 100%;' v-loading='loading' height="100%">
+                <el-table-column header-align='center' align='center' prop='BuildName' label='建筑'  width="150"></el-table-column>、
+                <el-table-column header-align='center' align='center' prop='floorName' label='楼层' width="80"></el-table-column>
+                <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>
+                    <template slot-scope='scope'>
+                        <span>{{scope.row.PointName || '--'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column header-align='center' align='center' prop='FamilyName' label='设备族'></el-table-column>
+                <el-table-column header-align='center' align='center' label='本地编码' width='250'>
+                    <template slot-scope='scope'>
+                        <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
+                    <template slot-scope='scope'>
+                        <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
+                        <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
         </div>
-        <base-pagination class='data-table-pagination' :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+        <base-pagination class='data-table-pagination' style="text-align:right;" :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
         <saga-dialog ref='dialog' :iframeSrc='iframeSrc'></saga-dialog>
     </div>
 </template>

+ 6 - 1
src/views/data_admin/buildAssets/Noverify.vue

@@ -10,7 +10,7 @@
             border            
             v-loading='loading'
             @selection-change='handleSelectionChange'
-            height="700px"
+            height="100%"
         >
             <el-table-column type='selection' width='55' align='center'></el-table-column>
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑' width='150'></el-table-column>、
@@ -40,6 +40,7 @@
         </div>
         <base-pagination
             class='data-table-pagination'
+            style="text-align:right;"
             :currentPages='pageNum'
             :total='total'
             @pageChanged='pageChanged'
@@ -316,8 +317,12 @@ export default {
 </script>
 
 <style scoped lang='less'>
+.data-table {
+    height: calc(100% - 94px);
+}
 .btn-box {
     padding: 10px;
+    padding-top: 0;
     display: flex;
     justify-content: flex-end;
 }

+ 1 - 0
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -117,6 +117,7 @@ export default {
       for(let i = 0; i < addRowLength; i++){
         this.tableData.push({})
       }
+      this.initTable()
       this.formaTableData()
     },
     //修改

+ 7 - 3
src/views/ledger/cenotelist/index.vue

@@ -168,14 +168,18 @@ export default {
       };
       //生成要修改字段列表
       change.map((item) => {
-        if(item[1] && param.data.Projection.indexOf(item[1] != -1)) {
+        if(item[1] && param.data.Projection.indexOf(item[1]) == -1) {
           param.data.Projection.push(item[1])
         }
       })
       //生成对应修改数据
       data.map((item, index) => {
-        let key = change[index][1]
-        item[key] = item[key] != ""? item[key]: null
+        let keyarr = change[index][1].split(".")
+        if (keyarr && keyarr.length > 1) {
+          item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
+        } else {
+          item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
+        }
         param.data.Content.push(item);
       });
 

+ 9 - 19
src/views/rent/rentlist/index.vue

@@ -35,7 +35,7 @@
         <div v-show="isTableRightShow">
           <div class="table_right_box"><span class="iconfont close_right" @click="handleCloseRight">&#xe66b;</span></div>
           <h5>管理租赁空间</h5>
-          <p style="margin-bottom: 10px;">以下为关联的空间id</p>
+          <p style="margin-bottom: 10px;">以下为关联的业务空间id</p>
           <el-input
             type="textarea"
             :autosize="{ minRows: 6, maxRows: 10}"
@@ -136,22 +136,8 @@ export default {
       })
     },
     async getTableData() {//获取表格数据
-      let Filters
-      if (this.buildId == "all") {
-        Filters = `ProjectId='${this.projectId}'`
-      } else if (this.buildId == "noKnow") {
-        Filters = `ProjectId='${this.projectId}';BuildingId isNull`
-      } else if (this.floorId == "noKnow") {
-        Filters = `ProjectId='${this.projectId}';BuildingId='${this.buildId}';FloorId isNull`
-      } else if (this.floorId && this.floorId != "all") {
-        Filters = `ProjectId='${this.projectId}';BuildingId='${this.buildId}';FloorId='${this.floorId}'`
-      } else if (this.floorId == 'all') {
-        Filters = `ProjectId='${this.projectId}';BuildingId='${this.buildId}'`
-      } else {
-        Filters = `ProjectId='${this.projectId}'`
-      }
       let data = {
-        Filters: Filters,
+        // Filters: `ProjectId='${this.projectId}'`, //项目id条件筛选
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
@@ -182,14 +168,18 @@ export default {
       };
       //生成要修改字段列表
       change.map((item) => {
-        if(item[1] && param.data.Projection.indexOf(item[1] != -1)) {
+        if(item[1] && param.data.Projection.indexOf(item[1]) == -1) {
           param.data.Projection.push(item[1])
         }
       })
       //生成对应修改数据
       data.map((item, index) => {
-        let key = change[index][1]
-        item[key] = item[key] != ""? item[key]: null
+        let keyarr = change[index][1].split(".")
+        if (keyarr && keyarr.length > 1) {
+          item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
+        } else {
+          item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
+        }
         param.data.Content.push(item);
       });