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/'
+#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,7 +34,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 7730eb65-f547-4811-be73-e0baffe09d4d';//`Bearer ${localStorage.getItem('access_token')`;
+//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')+''
 
 //设置超时

src/views/home.vue

@@ -695,7 +695,12 @@ export default {
       mySub({}).then((res) =>{
         if(res.code==200){
           let data=res.data;
-          _this.labInfoList=data
+          _this.labInfoList=[]
+          data.forEach(function (item){
+            if(item.sensorFunctionStatusList.length>0){
+              _this.labInfoList.push(item)
+            }
+          })
           /* _this.controlList=data.list
            _this.controlTitle=data.title*/
 

src/views/illegalDetail.vue

@@ -64,7 +64,7 @@
                     background
                     @current-change="handleCurrentChange"
                     :page-sizes="[10, 20, 30, 40]"
-                    :current-page.sync="param.pageNo"
+                    :current-page.sync="param.pageNum"
                     :page-size="param.pageSize"
                     layout="total,prev, pager, next"
                     :total="totalNum">
@@ -90,10 +90,12 @@ export default {
     return {
      //查询条件
       param:{
-        pageNo:1,
+        pageNum:1,
         pageSize:5
       },
       editForm:{
+        pageNum:1,
+        pageSize:5,
         deptLevel:'',//这个是登陆后，刘波给你的院校的类型
         subId:'',//实验室
         violationType:'',//违规类型
@@ -123,13 +125,15 @@ export default {
       }
     },
     indexMethod(index) {
-      return (this.param.pageNo - 1) * this.param.pageSize + index + 1;
+      return (this.param.pageNum - 1) * this.param.pageSize + index + 1;
     },
     //请求列表
     getAjaxList:function (){
       let _this=this;
       //列表
       let obj={
+        'pageNum':this.editForm.pageNum,
+        'pageSize':this.editForm.pageSize,
         'subjectId':this.editForm.subId,
         'violationType':this.editForm.violationType,
         'beginTimeStr':this.editForm.beginTimeStr,
@@ -242,7 +246,7 @@ export default {
       this.onSearch();
     },
     handleCurrentChange(val) {
-      this.param.pageNo = val;
+      this.param.pageNum = val;
       // this.getAjaxList();
     },
     getdate() {

src/views/warningDetail.vue

@@ -29,6 +29,7 @@
                          <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'">
+                         <img src="@/assets/image/subject/icon_syspz_hwcw.png" v-if="item.funNum == 'hwcwy'">
                            <i>{{item.funcName}}</i>
                            <i>{{item.formatVal}}</i>
                        </li>