zc

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/index.vue

@@ -198,7 +198,10 @@
       //操作按钮
       tableButton(type,row){
         let self = this;
-        if(type == 2){
+        if(type == 1){
+          //返回
+          this.$set(this,'pageType',type);
+        }else if(type == 2){
           //新增
           this.$set(this,'pageType',type);
           this.$set(this,'propsData','');

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/infoPage.vue

@@ -2,26 +2,25 @@
   <div class="page-container chemicalsCabinetManage-infoPage">
     <div class="page-top-title-box">
       <p class="page-top-title-name-p">
-        <span>{{newData.name}}</span>
-        <span>{{newData.address}}</span>
+        <span>{{propsData.cabinetName}}</span>
+        <span>{{propsData.deptName}}{{propsData.buildName}}{{propsData.floorName}}{{propsData.subName}}</span>
       </p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
     </div>
     <div class="content-box">
       <div class="left-max-box">
-        <div class="title-box">
-          <p>{{newData.maxName}} - {{newData.minName}}</p>
-          <p :class="newData.lockType == 1 ? 'lockType':''">{{newData.lockType == 1?'已开启':'已关闭'}}</p>
-        </div>
-        <div class="img-max-box">
-          <img class="back-img" src="@/assets/ZDimages/chemicalManage/img_hxpg.png">
-          <div class="text-position-box">
-            <p class="max-name-p">{{newData.minName}}</p>
-            <p class="text-p">层数：{{newData.num}}</p>
-            <p class="text-p">管理员：</p>
-            <div class="min-for-name-box">
-              <p v-for="(item,index) in newData.nameList" :key="index">{{item.name}}</p>
-            </div>
+        <div class="for-left-max-box" :class="checkType == index ? 'for-left-check-box':''"
+             @click="leftCheck(index)"
+             v-for="(item,index) in leftDataList" :key="index">
+          <div class="for-title-box">
+            <p>{{item.doorName}}</p>
+            <p>{{item.openOrClose?'已开启':'已关闭'}}</p>
+          </div>
+          <div class="for-num-box">
+            <p>化学品数量：{{item.stockNum}}</p>
+          </div>
+          <div class="for-user-box">
+            <p>管理员：<span v-for="(minItem,minIndex) in item.cabinetAdminVoList">{{minItem.userName}}</span></p>
           </div>
         </div>
       </div>
@@ -103,33 +102,20 @@
 </template>
 
 <script>
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { chemicalCabinetGetDoorList } from '@/api/chemicalManage'
+  import index from '../../../../router'
   export default {
     name: 'infoPage',
     props:{
-      propsInfoData:{},
+      propsData:{},
     },
     data(){
       return{
         optionsA:[],
         optionsB:[],
-        newData:{
-          name:'我是柜锁名称',
-          address:'我是柜锁位置',
-          maxName:"我是化学品柜名称",
-          minName:'我是柜门名称',
-          lockType:1,
-          num:9999,
-          nameList:[
-            {name:'老师名称1'},
-            {name:'老师名称1'},
-            {name:'老师名称1'},
-            {name:'老师名称1'},
-            {name:'老师名称1'},
-          ]
-        },
+        //左侧柜门数据
+        leftDataList:[],
+        checkType:0,
         //查询条件
         queryParams:{
           page:1,
@@ -152,9 +138,26 @@
     created(){
     },
     mounted(){
-
+      this.initialize();
     },
     methods:{
+      //初始化
+      initialize(){
+        chemicalCabinetGetDoorList({cabinetId:this.propsData.cabinetId}).then(response => {
+          this.$set(this,'leftDataList',response.data);
+          if(response.data[0]){
+            this.$set(this,'checkType',0);
+            this.getList();
+          }
+        });
+      },
+      //左侧柜门选中
+      leftCheck(index){
+        if (this.checkType != index){
+          this.$set(this,'checkType',index);
+          this.getList();
+        }
+      },
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
@@ -196,7 +199,7 @@
       },
       // 返回按钮
       backPage(){
-        this.$parent.tableButton(2);
+        this.$parent.tableButton(1);
       },
       /** 提交按钮 */
       submitForm() {
@@ -225,75 +228,58 @@
         width:370px;
         margin:25px;
         border-right:1px dashed #dedede;
-        .title-box{
-          display: flex;
-          p{
-            font-size:16px;
-            line-height:30px;
-          }
-          p:nth-child(1){
-            font-weight:700;
-            flex:1;
-            /*单行省略号*/
-            display:block;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            white-space:nowrap;
-          }
-          p:nth-child(2){
-            margin-right:25px;
-            width:80px;
-            border-radius:6px;
-            text-align: center;
-            color:#fff;
-            background-color: #0183FA;
-          }
-          .lockType{
-            background-color: #14AE10!important;
+        .for-left-check-box{
+          cursor: pointer;
+          background: rgba(1,131,250,0.2)!important;
+          margin:0 0 20px 12px;
+          .for-title-box{
+            p:nth-child(2){
+              border:1px solid #0183FA!important;;
+              color:#0183FA!important;;
+            }
           }
         }
-        .img-max-box{
-          margin:35px 25px 0 0;
-          position: relative;
-          img{
-            display: block;
-            width:345px;
-            height:480px;
-          }
-          .text-position-box{
-            position: absolute;
-            top:68px;
-            left:16px;
-            background-color: rgba(255,255,255,0.2);
-            border-radius:10px;
-            width:142px;
-            min-height:122px;
-            padding-bottom:10px;
-            p{
-              color:#fff;
-              /*单行省略号*/
-              display:block;
-              overflow:hidden;
-              text-overflow:ellipsis;
-              white-space:nowrap;
+        .for-left-max-box{
+          width:320px;
+          min-height:130px;
+          background: #F5F5F5;
+          border-radius:10px;
+          padding:19px 0 12px;
+          .for-title-box{
+            display: flex;
+            padding:0 15px 0;
+            p:nth-child(1){
+              flex:1;
+              font-weight: 700;
+              font-size:16px;
+              line-height:24px;
             }
-            .max-name-p{
+            p:nth-child(2){
+              width:60px;
+              line-height:24px;
               text-align: center;
-              font-size:16px;
-              line-height:36px;
-              border-bottom:1px solid #fff;
-              margin-bottom:10px;
+              font-size:12px;
+              border-radius:6px;
+              border:1px solid #E0E0E0;
+              color:#666;
             }
-            .text-p{
-              padding:0 20px;
+          }
+          .for-num-box{
+            padding:0 15px;
+            margin:19px 0 8px 0;
+            p{
               font-size:14px;
               line-height:24px;
             }
-            .min-for-name-box{
-              p{
-                text-align: center;
-                font-size:14px;
-                line-height:24px;
+          }
+          .for-user-box{
+            padding:0 15px;
+            p{
+              font-size:14px;
+              line-height:20px;
+              padding:2px 0;
+              span{
+                margin-right:10px;
               }
             }
           }

src/views/iotDevice/hardwareManagement/hardwareClassification/index.vue

@@ -274,6 +274,7 @@ import infoPage from "./infoPage.vue"
           this.$set(this,'pageType',2);
         }if(type == 3){
           //编辑
+          this.$set(this, 'dialogTitle', '编辑')
           let obj = JSON.parse(JSON.stringify(row))
           this.$set(this,'dialogForm',obj);
           this.$set(this,'dialogType',true);

src/views/iotDevice/hardwareManagement/hardwareEquipment/index.vue

@@ -466,6 +466,7 @@
         let self = this
         if (type == 3) {
           //编辑
+          this.$set(this, 'dialogTitle', '编辑')
           let obj = JSON.parse(JSON.stringify(row))
           this.iotDeviceFindByType(row.deviceTypeKey)
           this.iotAttributeDetail(row.attributeId);

src/views/iotDevice/intelligenceIot/iotHardware/addPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page-container iotHardware-addPage">
     <div class="page-top-title-box">
-      <p class="page-top-title-name-p">{{newData.id?'编辑':'新增'}}</p>
+      <p class="page-top-title-name-p">{{propsData.id?'编辑':'新增'}}</p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
       <p class="page-top-title-submit-p" @click="submitForm">提交</p>
     </div>