heyang

.env.production

@@ -21,10 +21,10 @@ VUE_APP_ENV = 'production'
 # 矿大-文昌(本地)
 #VUE_APP_BASE_API = '192.168.1.248/labSystem/'
 # 矿大-南湖(线上)
-# VUE_APP_BASE_API = 'lab.sxitdlc.com/labSystem/'
+ VUE_APP_BASE_API = 'lab.sxitdlc.com/labSystem/'
 # 矿大-南湖(本地)
 #VUE_APP_BASE_API = '192.168.251.2/labSystem/'
 # 43服务器
 # VUE_APP_BASE_API = '192.168.1.43/labSystem/'
 # 苏大
-VUE_APP_BASE_API = 'znyj.labcenter.suda.edu.cn/labSystem/'
+#VUE_APP_BASE_API = 'znyj.labcenter.suda.edu.cn/labSystem/'

src/utils/request.js

@@ -34,8 +34,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer e3066fe8-3ff3-4706-b78c-063ece334418';//`Bearer ${localStorage.getItem('access_token')`;
- axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+axios.defaults.headers.common["Authorization"] = 'Bearer 961ca5d9-49bf-454e-b48c-e900471c19c1';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

src/views/home.vue

@@ -54,7 +54,7 @@
                       <i class="over">{{item.title}}</i>
                       <i>{{item.company}}</i>
                       <i>{{item.executionTime}}</i>
-                       <img src="@/assets/image/index_icon8.png" @click="openPlanUrl()"/>
+                       <img src="@/assets/image/index_icon8.png" @click="openInfoUrl()"/>
                     </li>
                   </div>
                   <div v-if="planList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
@@ -207,8 +207,8 @@
         <div class="small_title">
           <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" />
+            <i>预案执行总数：{{planResultCount}}</i>
+            <img class="right_t_btn"  src="@/assets/image/index_icon8.png"/>
           </div>
         </div>
         <div class="right_t_b" id="right_t_b"></div>
@@ -313,7 +313,13 @@ export default {
       //MQTT请求参数-传感器
       mtopic:"lab/bigview",
       mtopicTwo:"manage/work"+localStorage.getItem('userId'),
-      timer: '',//定时器
+      timer: null,//定时器
+      chartReload: null,//定时器
+      chartReload2: null,//定时器
+      chartReload3: null,//定时器
+      chartReload4: null,//定时器
+      chartReload5: null,//定时器
+      chartReload6: null,//定时器
       dataList:[],
       labList:[],//实验室人员
       infoList:[],//工作通知
@@ -901,8 +907,8 @@ export default {
           var left_m_b = this.$echarts.init(document.getElementById('left_b_t_l_b'));
           left_m_b.setOption(illegalOption);
             //定时动画
-           clearInterval(chartReload);
-           var chartReload = setInterval(function(){
+           clearInterval(this.chartReload);
+            this.chartReload = setInterval(function(){
              left_m_b.clear();
              left_m_b.setOption(illegalOption);
            },1000*6);
@@ -1015,8 +1021,8 @@ export default {
       var left_b_b = this.$echarts.init(document.getElementById('left_b_t_r_b'));
       left_b_b.setOption(admittanceOption);
       //定时动画
-      clearInterval(chartReload2);
-      var chartReload2 = setInterval(function(){
+      clearInterval(this.chartReload2);
+      this.chartReload2 = setInterval(function(){
         left_b_b.clear();
         left_b_b.setOption(admittanceOption);
       },1000*4);
@@ -1119,8 +1125,8 @@ export default {
       var right_t_b = this.$echarts.init(document.getElementById('right_t_b'));
       right_t_b.setOption(planOption);
       //定时动画
-      clearInterval(chartReload3);
-      var chartReload3 = setInterval(function(){
+      clearInterval(this.chartReload3);
+      this.chartReload3 = setInterval(function(){
         right_t_b.clear();
         right_t_b.setOption(planOption);
       },1000*4);
@@ -1237,8 +1243,8 @@ export default {
       var left_t_b = this.$echarts.init(document.getElementById('right_m_l_b'));
       left_t_b.setOption(safetyOption);
       //定时动画
-      clearInterval(chartReload4);
-      var chartReload4 = setInterval(function(){
+      clearInterval(this.chartReload4);
+      this.chartReload4 = setInterval(function(){
         left_t_b.clear();
         left_t_b.setOption(safetyOption);
       },1000*5);
@@ -1295,8 +1301,8 @@ export default {
       var right_m_b = this.$echarts.init(document.getElementById('right_m_r_b'));
       right_m_b.setOption(riskOption);
        //定时动画
-       clearInterval(chartReload5);
-       var chartReload5 = setInterval(function(){
+       clearInterval(this.chartReload5);
+       this.chartReload5 = setInterval(function(){
          right_m_b.clear();
          right_m_b.setOption(riskOption);
        },1000*6);
@@ -1370,8 +1376,8 @@ export default {
       var right_b_r_b_b = this.$echarts.init(document.getElementById('right_b_r_b_b'));
       right_b_r_b_b.setOption(classifyOption);
       //定时动画
-      clearInterval(chartReload6);
-      var chartReload6 = setInterval(function(){
+      clearInterval(this.chartReload6);
+      this.chartReload6 = setInterval(function(){
         right_b_r_b_b.clear();
         right_b_r_b_b.setOption(classifyOption);
       },1000*6);
@@ -1388,12 +1394,12 @@ export default {
     _this.safetyInspectFun();
     _this.initSwiper();
     _this.subscriptionMQTT();
-    // let timer = setInterval(() => {
-    //     _this.getAjaxData();
-    //     _this.infoFun();
-    //     _this.workPlanFun();
-    //     _this.safetyInspectFun();
-    // },12000)
+    _this.timer = setInterval(() => {
+        _this.getAjaxData();
+        _this.infoFun();
+        _this.workPlanFun();
+        _this.safetyInspectFun();
+    },1000*300)
     //中间部分点击方法
     $(".left_t_c li").click(function(){
       let index = $(".left_t_c li").index(this);
@@ -1402,8 +1408,9 @@ export default {
       $(this).parent().children().removeClass();
       $(this).addClass("checked_li");
     });
-
-
+  },
+  beforeDestroy(){
+    clearInterval(this.timer);
   },
 
 
@@ -2453,6 +2460,7 @@ export default {
           justify-content: flex-start;
           flex-wrap:wrap;
           margin-top: rh(10);
+          height: rh(60);
           >li{
             display: flex;
             justify-content: flex-start;
@@ -2476,8 +2484,8 @@ export default {
         }
         .right_b_r_b_b{
           width: rw(344);
-          height: rh(204);
-          color: ['#E9BA44', '#0086F1', '#21B532','#1B96EA'],//颜色
+          height: rh(184);
+
         }
       }
 

src/views/planDetail.vue

@@ -5,7 +5,7 @@
         <div class="main_t">
             <div class="main_t_t">
                 <i class="main_t_t_l">当前位置：首页 &gt;</i>
-                <i>风险预警统计</i>
+                <i>预案执行统计</i>
             </div>
             <!--<div class="main_t_b" id="plan_chart"></div>-->
         </div>