heyang

.env.production

@@ -25,4 +25,4 @@ VUE_APP_ENV = 'production'
 # VUE_APP_BASE_API = '192.168.1.43/labSystem/'
 
 # 苏大
-VUE_APP_BASE_API = 'lab.sxitdlc.com/sudalabSystem/'
+VUE_APP_BASE_API = 'znyj.labcenter.suda.edu.cn/labSystem/'

src/components/header.vue

@@ -9,7 +9,7 @@
 <script>
 import {} from "../api/http"
 export default {
-  name: 'HelloWorld',
+  name: 'heaDer',
   setup(){
     return {
       logoImg:localStorage.getItem('logoImg'),

src/utils/request.js

@@ -34,7 +34,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-axios.defaults.headers.common["Authorization"] = 'Bearer 82cfee09-b90a-425d-847d-747a4a6d33f9';//`Bearer ${localStorage.getItem('access_token')`;
+axios.defaults.headers.common["Authorization"] = 'Bearer 967babb7-e306-4701-820a-4086d68d3963';//`Bearer ${localStorage.getItem('access_token')`;
 // axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时

src/views/home.vue

@@ -135,7 +135,7 @@
           <div class="left_b_t_l">
             <!--公共小标题-->
             <div class="small_title">
-              <div class="small_title_l">违规操作统计-本月</div>
+              <div class="small_title_l">人员违规统计-本月</div>
               <div class="small_title_r">
                 <i>总违规人数：{{resultCount}}</i>
                 <img class="left_b_t_l_btn"  src="@/assets/image/index_icon8.png" @click="left_b_t_l_btn"/>
@@ -205,7 +205,7 @@
       <div class="right_t">
         <!--公共小标题-->
         <div class="small_title">
-          <div class="small_title_l">风险预警统计</div>
+          <div class="small_title_l">预案执行计划</div>
           <div class="small_title_r" @click="right_t_btn">
             <i>风险预警总数：{{planResultCount}}</i>
             <img class="right_t_btn"  src="@/assets/image/index_icon8.png" />
@@ -2086,11 +2086,12 @@ export default {
           animation-iteration-count: infinite; // 动画循环无限次播放
           >li{
             width: rw(966);
-            height: rh(66);
+            height: auto;
             margin: 0 rw(30);
             background: rgba(30, 118, 142, 0.2);
             margin-bottom: rh(12);
-            padding-top: rh(12);
+            padding: rh(12) 0;
+            box-sizing: border-box;
             .left_b_b_t{
               display: flex;
               justify-content: flex-start;
@@ -2122,13 +2123,14 @@ export default {
               overflow: hidden;
               margin-top: rh(16);
               margin-left: rw(12);
+              flex-wrap: wrap;
               >i{
                 display: inline-block;
                 font-size: rh(14);
                 font-family: Source Han Sans CN;
                 font-weight: 400;
                 color: #FFFFFF;
-                line-height:rh(14);
+                line-height:rh(18);
                 margin-right: rw(30);
 
               }

src/views/warningDetail.vue

@@ -13,18 +13,22 @@
                 <div class="dowebok">
                    <ul class="main_m_t_c_n">
                        <li v-for="(item,index) in weather" :key="index">
-                           <!--<img src="static/img/img/index_icon6.png"/>-->
-                           <img  v-if="item.funNum == 'wendu'" src="@/assets/image/img/index_icon6.png">
-                           <img  v-if="item.funNum == 'shidu'" src="@/assets/image/img/index_icon7.png">
-                           <img  v-if="item.funNum == 'yanwu'" src="@/assets/image/img/index_icon8.png">
-                           <img  v-if="item.funNum == 'daqiya'" src="@/assets/image/img/index_icon11.png">
-                           <img  v-if="item.funNum == 'co'" src="@/assets/image/img/index_icon10.png">
-                           <img  v-if="item.funNum == 'o2'" src="@/assets/image/img/index_icon9.png">
-                           <img  v-if="item.funNum == 'fenchen'" src="@/assets/image/img/index_icon13.png">
-                           <img  v-if="item.funNum == 'voc'" src="@/assets/image/img/index_icon17.png">
-                           <img  v-if="item.funNum == 'jiawan'" src="@/assets/image/img/index_icon12.png">
-                           <img  v-if="item.funNum == 'so2'" src="@/assets/image/img/index_icon14.png">
-                           <img  v-if="item.funNum == 'no1'" src="@/assets/image/img/index_icon17.png">
+                         <img src="@/assets/image/subject/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
+                         <img src="@/assets/image/subject/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
+                         <img src="@/assets/image/subject/icon_bj_eyht.png" v-if="item.funNum == 'co'">
+                         <img src="@/assets/image/subject/icon_bj_jwnd.png" v-if="item.funNum == 'jiawan'">
+                         <img src="@/assets/image/subject/icon_sy_yqnd.png" v-if="item.funNum == 'o2'">
+                         <img src="@/assets/image/subject/icon_bj_yg.png" v-if="item.funNum == 'yanwu'">
+                         <img src="@/assets/image/subject/icon_sy_dqy.png" v-if="item.funNum == 'daqiya'">
+                         <img src="@/assets/image/subject/icon_syspz_voc.png" v-if="item.funNum == 'voc'">
+                         <img src="@/assets/image/subject/icon_syspz_tvoc.png" v-if="item.funNum == 'tvoc'">
+                         <img src="@/assets/image/subject/icon_sy_mcnd.png" v-if="item.funNum == 'so2'">
+                         <img src="@/assets/image/subject/icon_bj_yyhd.png" v-if="item.funNum == 'no1'">
+                         <img src="@/assets/image/subject/icon_bj_dqy.png" v-if="item.funNum == 'fenchen'">
+                         <img src="@/assets/image/subject/icon_bj_qq.png" v-if="item.funNum == 'H2'">
+                         <img src="@/assets/image/subject/guangqi.png" v-if="item.funNum == 'guangqi'">
+                         <img src="@/assets/image/subject/lvqi.png" v-if="item.funNum == 'lvqi'">
+                         <img src="@/assets/image/subject/icon_syspz_jiaquan.png" v-if="item.funNum == 'jiaquan'">
                            <i>{{item.funcName}}</i>
                            <i>{{item.formatVal}}</i>
                        </li>
@@ -39,7 +43,7 @@
                     <ul  >
                         <li class="active" v-for="(item,index2) in planAxis" :key="index2">
                           <p>发生风险：{{item.riskPlanName}}</p>
-                          <p>甲烷传感器浓度：<i>{{item.sensorJsonValue}}</i></p>
+                          <p>{{item.sensorJsonDescribe}}：<i>{{item.sensorJsonValue}} {{item.sensorJsonUnit}}</i></p>
                           <p>时间：{{item.createTime}}</p>
                         </li>
                     </ul>
@@ -261,6 +265,8 @@ export default {
           for(let i=0;i< _this.planAxis.length;i++){
             if( _this.planAxis[i].sensorJson){
               _this.planAxis[i].sensorJsonValue = JSON.parse(_this.planAxis[i].sensorJson)[0].value;
+              _this.planAxis[i].sensorJsonDescribe = JSON.parse(_this.planAxis[i].sensorJson)[0].describe;
+              _this.planAxis[i].sensorJsonUnit = JSON.parse(_this.planAxis[i].sensorJson)[0].unit;
 
             }
           }
@@ -425,19 +431,24 @@ export default {
         width: rw(1370);
         height: rh(80);
         background: 0;
+        overflow-y: auto;
         .main_m_t_c_n{
-          /* width: rw(2000);
-           display: flex;
-           justify-content: flex-start;
-           align-items: center;*/
+          position: relative;
+          height:255px;
+          white-space: nowrap;
+          display: inline-flex;
           >li{
             width: rw(202);
             height: 100%;
-            display: inline-block;
+            float: left;
+            position: relative;
+            cursor: pointer;
             margin-left: rw(8);
             >img{
-              width: rw(20);
-              height: rh(26);
+              width:26px;
+              height:26px;
+              position: relative;
+              top: rh(5);
             }
             >i{
               font-size: rh(16);
@@ -490,9 +501,16 @@ export default {
       height: rh(278);
       margin-top: rh(10);
       .time-box{
-        width: 100%;margin: 0 auto;overflow: hidden;
+
+        width: 100%;
+        overflow-y: auto;
         >ul{
-          overflow: hidden;position: relative;height:rh(255);
+
+
+          position: relative;
+          height:255px;
+          white-space: nowrap;
+          display: inline-flex;
           >li{
             width:rw(242);
             height: rh(98);