dedsudiyu 3 mesi fa
parent
commit
8c6138b5d3

+ 12 - 1
README.md

@@ -127,7 +127,7 @@
     
 ## 六.版本相关
 
-### 1.版本差异字段
+### 1.版本差异字段 VUE_APP_VERSION_DIFFERENCE_FIELD
 >##### 配置文件在 .env.development 与 .env.production 文件内
 
     ├─src
@@ -135,6 +135,17 @@
     │  └─.env.production          (打包配置)
 
 
+### 当前差异内容
+
+>#### 一.非配置化内容 
+>##### ① 首页配置 西农使用定制化首页 其他学校部署使用后台配置首页
+>##### router/index.js 下homeXiNong为定制化西农首页home为后台配置首页
+
+>#### 二.配置化内容
+>##### 所有配置化内容使用VUE_APP_VERSION_DIFFERENCE_FIELD 字段控制
+>##### ① 西农配置 VUE_APP_VERSION_DIFFERENCE_FIELD = 'xiBeiNongLinDaXue'
+>###### 化学品首页 chemicalManage/chemicalsStatistics
+
 ### 2.版本分支关系
 >##### 修改时务必注意版本分支关系,从底层开始迭代
 

BIN
src/assets/ZDimages/basicsModules/homeXiNong/icon_sy_sydwzx.png


BIN
src/assets/ZDimages/chemicalManage/chemicalsStatistics_1.png


BIN
src/assets/ZDimages/chemicalManage/chemicalsStatistics_2.png


BIN
src/assets/ZDimages/chemicalManage/chemicalsStatistics_3.png


+ 69 - 23
src/views/chemicalManage/chemicalsStatistics/index.vue

@@ -1,28 +1,42 @@
 <!--化学品首页-->
 <template>
   <div class="app-container chemicalsStatistics">
-    <div class="top-max-big-box">
-      <div class="img-box">
-        <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpg.png">
-        <div>
-          <p>化学品柜</p>
-          <p class="colorA">{{inventoryData.cabinetNum}}</p>
-        </div>
+    <div class="top-max-max-big-box">
+      <div class="button-big-box" @click="goPage(1)" v-if="versionField() == 'xiBeiNongLinDaXue'">
+        <img src="@/assets/ZDimages/chemicalManage/chemicalsStatistics_1.png">
+        <p>实验室库存管理</p>
       </div>
-      <p class="null-p"></p>
-      <div class="img-box">
-        <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpkysl.png">
-        <div>
-          <p>待入库</p>
-          <p class="colorB">{{inventoryData.stockWaitNum}}</p>
-        </div>
+      <div class="button-big-box" @click="goPage(2)" v-if="versionField() == 'xiBeiNongLinDaXue'">
+        <img src="@/assets/ZDimages/chemicalManage/chemicalsStatistics_2.png">
+        <p>危化品申购申领</p>
       </div>
-      <p class="null-p"></p>
-      <div class="img-box">
-        <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpyjsl.png">
-        <div>
-          <p>待归还</p>
-          <p class="colorC">{{inventoryData.giveBackNum}}</p>
+      <div class="button-big-box" @click="goPage(3)" v-if="versionField() == 'xiBeiNongLinDaXue'">
+        <img src="@/assets/ZDimages/chemicalManage/chemicalsStatistics_3.png">
+        <p>危废回收报备</p>
+      </div>
+      <div class="top-max-big-box">
+        <div class="img-box">
+          <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpg.png">
+          <div>
+            <p>化学品柜</p>
+            <p class="colorA">{{inventoryData.cabinetNum}}</p>
+          </div>
+        </div>
+        <p class="null-p"></p>
+        <div class="img-box">
+          <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpkysl.png">
+          <div>
+            <p>待入库</p>
+            <p class="colorB">{{inventoryData.stockWaitNum}}</p>
+          </div>
+        </div>
+        <p class="null-p"></p>
+        <div class="img-box">
+          <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpyjsl.png">
+          <div>
+            <p>待归还</p>
+            <p class="colorC">{{inventoryData.giveBackNum}}</p>
+          </div>
         </div>
       </div>
     </div>
@@ -73,6 +87,13 @@
       this.chemicalIndexTypeGroup();
     },
     methods:{
+      goPage(type){
+        if (type == 1){
+          this.$router.push({ path: '/chemicalManage/inventoryManagement/inventoryStatistics'});
+        } else {
+          window.open('https://chemcenter.nwafu.edu.cn/','_blank');
+        }
+      },
       chemicalIndexTypeGroup(){
         chemicalIndexTypeGroup().then(response => {
           this.$set(this,'inventoryData',response.data);
@@ -83,7 +104,32 @@
 </script>
 <style scoped lang="scss">
   .chemicalsStatistics{
+    .top-max-max-big-box{
+      display: flex;
+      .button-big-box{
+        width:225px;
+        height:120px;
+        display: flex;
+        flex-direction: column;
+        margin:20px 0 10px 20px;
+        box-shadow: 0 4px 10px 0 rgba(0,0,0,0.1);
+        border-radius: 10px;
+        cursor: pointer;
+        img{
+          margin:13px auto 0;
+          height:60px;
+          width:60px;
+        }
+        p{
+          font-size:18px;
+          line-height:40px;
+          text-align: center;
+        }
+      }
+    }
     .top-max-big-box{
+      flex:1;
+      height:120px;
       margin:20px 20px 10px;
       box-shadow: 0 4px 10px 0 rgba(0,0,0,0.1);
       border-radius: 10px;
@@ -92,9 +138,9 @@
         flex:1;
         display: flex;
         img{
-          margin:26px 30px 0 170px;
-          width: 68px;
-          height:68px;
+          margin:30px 30px 0 45px;
+          height:60px;
+          width:60px;
         }
         div{
           p:nth-child(1){