系统详情页面调修

src/components/ledger/lib/floorCascader.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="buildFloor">
-        <span class="buildFloor" style="margin-right: 12px;">建筑楼层</span>
+        <span class="buildFloor">建筑楼层</span>
         <el-cascader placeholder="请选择建筑楼层" :options="options" v-model="value" filterable size="small" :style="isWidth ? '' : 'width:160px;'" @change="changeCascader"></el-cascader>
     </div>
 </template>
@@ -149,9 +149,10 @@
     #buildFloor {
         margin-left: 10px;
         float: left;
-        .buildFloor {
-            color: #999999;
-            font-size: 14px;
-        }
+    }
+    .buildFloor {
+        color: #999999;
+        font-size: 14px;
+        margin-right: 12px;
     }
 </style>

src/components/ledger/system/dialog/addCenoteDialog.vue

@@ -109,7 +109,7 @@ export default {
           PageSize: this.page.pageSize,
         },
         shaftId: this.params.ShaftID,
-        sysId:this.$route.query.SysID
+        sysId: this.$route.query.SysID
       }
       if (this.keycode != '') {
         params.data.Filters += `;ShaftName contain '${this.keycode}' or ShaftLocalName contain '${this.keycode}' or ShaftLocalID contain '${this.keycode}'`

src/components/ledger/system/dialog/addEquipDialog.vue

@@ -2,12 +2,7 @@
   <el-dialog :title="title" :visible.sync="dialogVisible" width="900px" id="addEqDialog">
     <el-row class="filters">
       <el-col :span="7" style="width:268px">
-        <el-input
-          placeholder="输入设备名称或设备本地编码进行查询"
-          v-model="keycode"
-          clearable
-          @keyup.enter.native="getTableData"
-        >
+        <el-input placeholder="输入设备名称或设备本地编码进行查询" v-model="keycode" clearable @keyup.enter.native="getTableData">
           <i slot="suffix" class="el-input__icon el-icon-search" @click="getTableData"></i>
         </el-input>
       </el-col>
@@ -15,38 +10,21 @@
         <floor-cascader @change="changeFloor" style="margin-left:5px;"></floor-cascader>
       </el-col>
       <el-col :span="8.5" style="padding-right:0;">
-        <myCascader @change="changeDevice" :params="params"></myCascader>
+        <myCascader @change="changeDevice" :all="true" :params="childParams"></myCascader>
       </el-col>
     </el-row>
 
     <div class="table-box">
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-        height="350"
-        v-loading="loading"
-        :header-cell-style="headerStyle"
-        ref="multipleTable"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
+        @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>{{scope.row.EquipLocalName||scope.row.EquipName||''}}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="EquipLocalID"
-          :label="`${inSpaceType}本地编码`"
-          show-overflow-tooltip
-          min-width="100"
-        ></el-table-column>
-        <el-table-column
-          prop="EquipCategory.EquipName"
-          :label="`${inSpaceType}类`"
-          show-overflow-tooltip
-          min-width="100"
-        ></el-table-column>
+        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-button size="mini" @click="toDetail(scope.$index, scope.row)" plain>查看详情</el-button>
@@ -54,17 +32,9 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <el-pagination
-        class="fr"
-        v-show="tableData && tableData.length"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="page.pageNumber"
-        :page-sizes="page.pageSizes"
-        :page-size="page.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="page.total"
-      ></el-pagination>
+      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"></el-pagination>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">取 消</el-button>
@@ -107,14 +77,21 @@ export default {
         backgroundColor: "#e1e4e5",
         color: "#2b2b2b",
         lineHeight: "30px"
-      } // 列表样式
+      } // 列表样式,
     };
   },
+  computed: {
+    childParams() {
+      let temp = JSON.parse(JSON.stringify(this.params));
+      temp.SysType = null;
+      return temp;
+    }
+  },
   props: {
     type: String, //选中的tab页
     params: Object //查看的竖井关系信息
   },
-  created() {},
+  created() { },
   methods: {
     //修改建筑楼层
     changeFloor(value) {
@@ -153,9 +130,9 @@ export default {
       if (this.keycode != "") {
         params.data.Filters += `;EquipName contain '${this.keycode}' or EquipLocalName contain '${this.keycode}' or EquipLocalID contain '${this.keycode}'`;
       }
-      // if (this.Equipcategory) {
-      //   params.data.Filters += `;category='${this.Equipcategory}'`;
-      // }
+      if (this.Equipcategory) {
+        params.data.Filters += `;category='${this.Equipcategory}'`;
+      }
       unSysEq(params, res => {
         res.Content.forEach(item => {
           item.ShaftListName = "";
@@ -226,4 +203,7 @@ export default {
     }
   }
 }
+/deep/ #buildFloor .buildFloor {
+  margin: 0 5px 0 5px;
+}
 </style>

src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -1,20 +1,8 @@
 <template>
-  <el-dialog
-    :title="title"
-    :visible.sync="dialog"
-    :before-close="handleClose"
-    width="900px"
-    id="addEqDialog"
-  >
+  <el-dialog :title="title" :visible.sync="dialog" :before-close="handleClose" width="900px" id="addEqDialog">
     <el-row class="filters">
       <el-col :span="7" style="width:268px;padding:0px;">
-        <el-input
-          style
-          placeholder="输入业务空间名称、本地编码进行查询"
-          v-model="keycode"
-          clearable
-          @keyup.enter.native="getTableData"
-        >
+        <el-input style placeholder="输入业务空间名称、本地编码进行查询" v-model="keycode" clearable @keyup.enter.native="getTableData">
           <i slot="suffix" class="el-input__icon el-icon-search" @click="getTableData"></i>
         </el-input>
       </el-col>
@@ -27,30 +15,20 @@
     </el-row>
     <el-row class="filters" :gutter="20"></el-row>
     <div class="table-box">
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-        height="350"
-        v-loading="loading"
-        :header-cell-style="headerStyle"
-        ref="multipleTable"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
+        @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>{{scope.row.RoomLocalName||scope.row.RoomName||''}}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="RoomLocalID"
-          :label="`${inSpaceType}本地编码`"
-          show-overflow-tooltip
-          min-width="100"
-        ></el-table-column>
+        <el-table-column prop="RoomLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop :label="`所属建筑楼层`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{((floorType[scope.row.BuildingId] || '') + (' - ' + floorType[scope.row.FloorId] || '')) || ''}}</div>
+            <div>
+              {{ scope.row.BuildingId && floorType[scope.row.BuildingId]? ((floorType[scope.row.BuildingId] || '') + (scope.row.FloorId && floorType[scope.row.FloorId] ? (' - ' + floorType[scope.row.FloorId] || '') : '')) : ''}}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="ObjectType" :label="`空间类型`" show-overflow-tooltip min-width="100">
@@ -65,17 +43,9 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <el-pagination
-        class="fr"
-        v-show="tableData && tableData.length"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="page.pageNumber"
-        :page-sizes="page.pageSizes"
-        :page-size="page.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="page.total"
-      ></el-pagination>
+      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"></el-pagination>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="handleClose">取 消</el-button>
@@ -103,7 +73,7 @@ export default {
   computed: {
     ...mapGetters("layout", ["projectId"]),
     dialog() {
-      return this.dialogVisible
+      return this.dialogVisible;
     }
   },
   data() {
@@ -138,7 +108,7 @@ export default {
     dialogVisible: Boolean,
     floorType: Object
   },
-  mounted() {},
+  mounted() { },
   methods: {
     // 显示弹窗
     showDialog() {
@@ -245,7 +215,7 @@ export default {
 <style lang="less" scoped>
 #addEqDialog {
   .filters {
-    margin:0 0 10px 0;
+    margin: 0 0 10px 0;
   }
   .table-box {
     height: 370px;

src/components/ledger/system/lib/equipType.vue

@@ -79,10 +79,13 @@ export default {
         })
       })
       let promise1 = new Promise((resolve, reject) => {
-        queryPhysicsAllType(param1, res => {    
-          let tempArr = res.Content.filter(t => {
-            return t.ParentId == `${this.params.SysType}`
-          })
+        queryPhysicsAllType(param1, res => {
+          let tempArr = res.Content;
+          if (this.params.SysType) {
+            tempArr = res.Content.filter(t => {
+              return t.ParentId == `${this.params.SysType}`
+            })
+          }
           resolve(tempArr)
         })
       })

src/components/ledger/system/table/spaceTable.vue

@@ -2,34 +2,18 @@
   <div id="eqInSp">
     <el-row>
       <el-button type="primary" @click="add">添加{{inSpaceType}}</el-button>
-      <el-tooltip
-        class="item"
-        effect="dark"
-        content="可前往“全部关系总览”中,按系统内包含的设备与空间关系计算"
-        placement="right"
-      >
+      <el-tooltip class="item" effect="dark" content="可前往“全部关系总览”中,按系统内包含的设备与空间关系计算" placement="right">
         <el-button>按系统内设备与业务空间关系计算</el-button>
       </el-tooltip>
     </el-row>
     <div class="table-box">
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-        height="100%"
-        v-loading="loading"
-        :header-cell-style="headerStyle"
-      >
+      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>{{ scope.row.RoomLocalName || scope.row.RoomName||''}}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="RoomLocalID"
-          :label="`${inSpaceType}本地编码`"
-          show-overflow-tooltip
-          min-width="100"
-        ></el-table-column>
+        <el-table-column prop="RoomLocalID" :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>{{ spaceType[scope.row.ObjectType]}}</div>
@@ -38,13 +22,7 @@
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="删除关系" placement="left">
-              <el-button
-                size="mini"
-                @click="handleDelete(scope.$index, scope.row)"
-                type="danger"
-                plain
-                icon="el-icon-delete"
-              ></el-button>
+              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain icon="el-icon-delete"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -57,15 +35,8 @@
       </el-table>
     </div>
     <!-- 添加空间弹窗 -->
-    <addSpaceDialog
-      :dialogVisible.sync="dialogVisible"
-      ref="addSpaceDialog"
-      @refresh="refresh"
-      :type="type"
-      :params="params"
-      :spaceType="spaceType"
-      :floorType="floorType"
-    ></addSpaceDialog>
+    <addSpaceDialog :dialogVisible.sync="dialogVisible" ref="addSpaceDialog" @refresh="refresh" :type="type" :params="params" :spaceType="spaceType"
+      :floorType="floorType"></addSpaceDialog>
   </div>
 </template>
 
@@ -132,7 +103,7 @@ export default {
                 SpaceId: row.RoomID
               }
             ],
-            type:row.ObjectType
+            type: row.ObjectType
           };
           this.deleteSyInSh(params);
         })
@@ -162,7 +133,7 @@ export default {
       this.dialogVisible = true;
     },
     //刷新
-    refresh(){
+    refresh() {
       this.dialogVisible = false;
       this.getTableData()
     }