update

src/views/common/ex-warehouse-info.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-17 15:49:18
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-17 17:02:25
+ * @LastEditTime: 2021-12-21 10:23:09
  * @Description:
 -->
 <template>
@@ -74,7 +74,7 @@
               data: this.$http.adornData({ id })
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm = data.data
+                this.dataList = data.data
               } else {
                 this.$message.error(data.msg)
               }

src/views/common/ex-warehouse.vue

@@ -2,33 +2,45 @@
  * @Author: zwq
  * @Date: 2021-11-15 15:17:30
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-17 17:05:22
+ * @LastEditTime: 2021-12-21 15:33:40
  * @Description:
 -->
 <template>
   <div v-loading="dataListLoading">
-    <div class="mainDiv" style="margin:10px 0 100px">
+    <el-card class="base-container" style="min-height: 300px">
-      <div
+      <el-card
         class="wareBox"
+        shadow="hover"
         :class="[
-            item.empty === 1 ? 'enableBox' : 'disableBox',
+          item.empty ? 'disableBox' : 'enableBox',
           { active: item.locationId === isActive }
         ]"
-          @click="selectBox(item.locationId)"
+        :disabled="item.empty"
+        @click.native="item.empty ? '' : selectBox(item.locationId)"
         v-for="item in warehouseList"
         :key="item.locationId"
       >
         <div class="plat">{{ item.locationName }}</div>
-        </div>
+        <el-button
-    </div>
+          v-if="!item.empty"
-    <div class="line"></div>
+          @click.stop="showDetail(item.locationId)"
-    <div class="mainDiv" style="margin:100px 0 10px">
+          class="wareBox-button"
-      <div class="flexDiv">
+          type="text"
-        <div class="wareBox end-plat" @click="selectPlat(count)" v-for="count in 4" v-bind:key="count">
+          size="mini"
-          <div class="plat">提升台{{ count }}</div>
+          icon="el-icon-search"
-        </div>
+          circle
-      </div>
+        />
-    </div>
+      </el-card>
+    </el-card>
+    <el-card class="base-container" style="margin-top: 20px; min-height: 200px">
+      <el-row :gutter="30" style="padding: 20px;">
+        <el-col class="footer-item-container" :span="6" v-for="count in 4" :key="count">
+          <el-card class="footer-item-box base-container" @click.native="selectPlat(count)">
+            <div class="plat" style="font-size: 24px">提升台{{ count }}</div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-card>
     <ex-warehouse-info
       v-if="ExWarehouseInfoVisible"
       ref="ExWarehouseInfoRef"
@@ -70,7 +82,13 @@ export default {
       })
     },
     selectBox (id) {
+      if (this.isActive === id) {
+        this.isActive = null
+      } else {
         this.isActive = id
+      }
+    },
+    showDetail (id) {
       this.ExWarehouseInfoVisible = true
       this.$nextTick(() => {
         this.$refs.ExWarehouseInfoRef.init(id)
@@ -94,11 +112,10 @@ export default {
             if (data && data.code === 0) {
               this.$message({
                 type: 'success',
-                message: '出库成功!',
+                message: '出库成功!'
-                onClose: () => {
-                  this.getWarehouseList()
-                }
               })
+              this.isActive = null
+              this.getWarehouseList()
             } else {
               this.$message.error(data.msg)
             }
@@ -121,46 +138,27 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .mainDiv {
   border: 2px solid rgb(145, 174, 255);
   padding: 20px 0;
 }
-.flexDiv {
+
-  display: -webkit-flex;
-  display: flex;
-  -webkit-justify-content: space-around;
-  justify-content: space-around;
-}
-/* 边框特效 */
-.wareBox:hover {
-  background: linear-gradient(to left, deepskyblue, deepskyblue) left top
-      no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) left top no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right top no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) right top no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) left bottom no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) left bottom no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat;
-  background-size: 5px 30px, 30px 5px;
-  color: black;
-  border-radius: 5px;
-  background-color: rgb(190, 224, 241);
-}
 .wareBox {
   cursor: pointer;
+  display: inline-block;
   margin: 10px;
-  width: 100px;
+  width: 104px;
-  height: 100px;
+  height: 112px;
-  padding: 10px;
+  line-height: 72px;
-  line-height: 90px;
   text-align: center;
-  border: 2px solid #cdcdc5;
+  padding: 0;
-  border-radius: 5px;
+  position: relative;
+  .wareBox-button {
+    position: absolute;
+    bottom: 0;
+    right: 0;
   }
-.plat {
-  min-width: 80px;
 }
 .line {
   margin: 20px 0;
@@ -170,16 +168,38 @@ export default {
   border-right: 200px solid #ddd;
 }
 .enableBox {
-  background: rgb(0, 189, 16);
+  background: #EFF3FF;
 }
 .disableBox {
-  background: #ddd;
+  background: #F4F4F4;
   cursor: not-allowed;
 }
 .end-plat {
   background-color: rgb(195, 246, 255);
 }
+.plat {
+  font-size: 16px;
+}
 .active {
-  border: 2px solid red;
+  border: 2px solid #F56C6C;
+}
+.footer-item-container{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .footer-item-box{
+    width: 100%;
+    height: 200px;
+    padding: 0 !important;
+    cursor: pointer;
+    line-height: 160px;
+    text-align: center;
+    background-image: url('../../assets/img/1.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-color: transparent;
+    border-radius: 25px;
+    margin-bottom: 20px;
+  }
 }
 </style>

src/views/main-sidebar.vue

@@ -252,7 +252,7 @@
               <span slot="title">油槽温度</span>
             </el-menu-item>
           </el-submenu>
-          <el-submenu index="gas">
+          <!-- <el-submenu index="gas">
             <template slot="title">
               <icon-svg
                 name="config"
@@ -270,7 +270,7 @@
               ></icon-svg>
               <span slot="title">使用氮气分析</span>
             </el-menu-item>
-          </el-submenu>
+          </el-submenu> -->
           <el-menu-item
             index="kiln-speed"
             @click="$router.push({ name: 'energy-kiln-speed' })"