heyang

src/api/http.js

@@ -3,7 +3,8 @@ let {get, post,baseUrl} = axios
 
 //基础
 export const requestUrl = baseUrl;
-
+//根据名称查询实验室列表
+export const systemSubjectGetList = data => post("/system/subject/getList",data)
 //获取logo图片
 export const getLogoInfo = data => get("/system/logo/config/getLogoInfo",data)
 

src/assets/styles/publicEle.scss

@@ -50,11 +50,11 @@
       .el-button--default{
         width: 80px;
         height:40px;
-        border: 1px solid #486CC2;
-        opacity: 0.3;
+        border: 1px solid #00FAFF;
+        opacity: 1;
         border-radius: 4px;
         background: 0;
-        color: #fff;
+        color: #1ED0F8;
       }
       .el-button{
         width: 80px;
@@ -178,7 +178,7 @@
   }
   .el-table__header-wrapper th{
     background: rgba(15, 96, 124, 0.2);
-    color:#FFFFFF;
+    color:#1ED0F8;
   }
   .el-table__fixed-header-wrapper th{
     background: rgba(72, 108, 194, 0.2);

src/utils/request.js

@@ -37,7 +37,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-axios.defaults.headers.common["Authorization"] = 'Bearer 8872c17c-b38a-4b4b-8c71-01aefe1acefa';//`Bearer ${localStorage.getItem('access_token')`;
+axios.defaults.headers.common["Authorization"] = 'Bearer 0ce3b0fa-0941-4db1-9e14-b13bb9d963ab';//`Bearer ${localStorage.getItem('access_token')`;
 //axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时

src/views/courtyardManage/inspectDetail.vue

@@ -13,13 +13,22 @@
       <div class="main_b_title">遗留问题</div>
       <!--查询条件-->
       <el-form :model="editForm" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
-        <el-form-item label="实验室" prop="dangerId" label-width="98px">
-          <el-select v-model="editForm.subId" popper-class="select-big-data" placeholder="请选择实验室">
+
+        <el-form-item label="实验室：" prop="subId" label-width="80px">
+          <el-select
+              style="width:180px;"
+              v-model="editForm.subId"
+              filterable
+              remote
+              reserve-keyword
+              @change="subChange"
+              placeholder="实验室/房间号"
+              :remote-method="subSelectList">
             <el-option
-                v-for="item in labList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
+                v-for="item in subOptions"
+                :key="item.subId"
+                :label="item.subName"
+                :value="item.subId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -52,13 +61,21 @@
       <div class="main_b_title">本次检查问题</div>
       <!--查询条件-->
       <el-form :model="editForm2" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
-        <el-form-item label="实验室" prop="dangerId" label-width="98px">
-          <el-select v-model="editForm2.subId" popper-class="select-big-data" placeholder="请选择实验室">
+        <el-form-item label="实验室：" prop="subId" label-width="80px">
+          <el-select
+              style="width:180px;"
+              v-model="editForm2.subId"
+              filterable
+              remote
+              reserve-keyword
+              @change="subChange"
+              placeholder="实验室/房间号"
+              :remote-method="subSelectList">
             <el-option
-                v-for="item in labList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
+                v-for="item in subOptions"
+                :key="item.subId"
+                :label="item.subName"
+                :value="item.subId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -99,7 +116,7 @@
 </template>
 
 <script>
-import {getSubjectDict, indexCheckDetalsWzg, indexCheckDetalsYzg} from "../../api/http"
+import {getSubjectDict, indexCheckDetalsWzg, indexCheckDetalsYzg,systemSubjectGetList} from "../../api/http"
 import Header from '@/components/header.vue'
 export default {
   components: {
@@ -125,12 +142,34 @@ export default {
       tableData:[],
       tableData2:[],
       codeData:'',
+      subOptions:[],
     }
   },
   methods: {
     back(){
       this.$router.push('/')
     },
+    //选中实验室
+    subChange(val){
+      let self = this;
+      for(let i=0;i<self.subOptions.length;i++){
+        if(self.subOptions[i].subId == val){
+          this.$set(this.newData,'subId',self.subOptions[i].subId);
+          this.$set(this.newData,'subName',self.subOptions[i].subName);
+          this.$set(this.newData,'roomNum',self.subOptions[i].roomNum);
+        }
+      }
+    },
+    //搜索实验室
+    subSelectList(query){
+      if (query !== '' && query.length>1) {
+        systemSubjectGetList({"subName":query,}).then(response => {
+          this.$set(this,'subOptions',response.data);
+        });
+      } else {
+        this.$set(this,'subOptions',[]);
+      }
+    },
     tableRowClassName({ rowIndex}) {
       if (rowIndex%2 === 0) {
         return 'success-row';
@@ -237,9 +276,9 @@ export default {
   },
   mounted() {
     this.codeData=this.$route.query.key
-    this.getAjaxData()
-    this.getAjaxList()
-    this.getAjaxList2()
+   // this.getAjaxData()
+   // this.getAjaxList()
+    //this.getAjaxList2()
   },
 
 

src/views/courtyardManage/warningDetail.vue

@@ -154,6 +154,14 @@ export default {
 
     }
   },
+  mounted() {
+    let self=this
+    this.codeData=this.$route.query.key
+    this.subjectId=this.$route.query.subjectId
+   // self.switchStateFun();
+    //self.getAjaxData();
+
+  },
   methods: {
     /**
      * 横向拖动触发滚动条拖动
@@ -208,27 +216,27 @@ export default {
     },
     leftVideoFunction:function(){
       //videoElement
-      let _this = this;
+      let self = this;
       //本地视频数据
-      _this.leftVideoList = [];
+      self.leftVideoList = [];
 
-      for(let i=0;i<_this.videoList.length;i++){
+      for(let i=0;i<self.videoList.length;i++){
 
-        if(_this.videoList[i].videoUrl){
+        if(self.videoList[i].videoUrl){
 
           let obj = {
             player :{},
             flvPlayer:{}
           };
-          console.log(document.getElementById(_this.videoList[i].divId))
-          obj.player = document.getElementById(_this.videoList[i].divId);
+          console.log(document.getElementById(self.videoList[i].divId))
+          obj.player = document.getElementById(self.videoList[i].divId);
 
           obj.flvPlayer = flvjs.createPlayer(
               {
                 // isLive: true, //=> 是否为直播流
                 // hasAudio: false, //=> 是否开启声音
                 type: 'flv', //媒体类型 flv 或 mp4
-                url:_this.videoList[i].videoUrl,
+                url:self.videoList[i].videoUrl,
               },
               {
                 enableStashBuffer: true,//启用 IO 存储缓冲区。 如果您需要实时流播放（最小延迟），请设置为 false，但如果存在网络抖动，则可能会停止。
@@ -241,39 +249,39 @@ export default {
               }
           );
 
-          _this.leftVideoList.push(obj);
-          _this.leftVideoListOne.push(obj);
+          self.leftVideoList.push(obj);
+          self.leftVideoListOne.push(obj);
 
         }
       }
 
       setTimeout(function(){
-        for(let i=0;i<_this.leftVideoList.length;i++){
+        for(let i=0;i<self.leftVideoList.length;i++){
 
-          _this.leftVideoList[i].flvPlayer.attachMediaElement(_this.leftVideoListOne[i].player);
-          _this.$forceUpdate();
-          _this.leftVideoList[i].flvPlayer.load(); //加载
-          _this.leftVideoList[i].flvPlayer.play(); //播放
+          self.leftVideoList[i].flvPlayer.attachMediaElement(self.leftVideoListOne[i].player);
+          self.$forceUpdate();
+          self.leftVideoList[i].flvPlayer.load(); //加载
+          self.leftVideoList[i].flvPlayer.play(); //播放
         }
       },2000);
     },
 
     //获取开关状态
     switchStateFun(){
-      let _this=this;
+      let self=this;
       controllerList(this.subjectId).then((res) =>{
         if(res.code==200){
           let data=res.data;
-          _this.switchList=data
+          self.switchList=data
         }
       })
     },
     //获取摄像头列表
     cameraListFun(){
-      let _this=this;
+      let self=this;
       let obj = {
         count:"2",
-        deviceIds:_this.tvIds,
+        deviceIds:self.tvIds,
         //deviceIds:'440102004920000000010013',
         page:"1",
       };
@@ -303,20 +311,20 @@ export default {
       this.$refs.videoRef[index].webkitRequestFullScreen();
     },
     getAjaxData: function () {
-      let _this = this;
+      let self = this;
       //获取报警详情
 
       abnormalLogOrderByList({'groupId':this.codeData}).then((res) =>{
         if(res.code==200){
           let data=res.data;
-          _this.firstTime=data[0].createTime
-          _this.planAxis=data;
+          self.firstTime=data[0].createTime
+          self.planAxis=data;
 
-          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;
+          for(let i=0;i< self.planAxis.length;i++){
+            if( self.planAxis[i].sensorJson){
+              self.planAxis[i].sensorJsonValue = JSON.parse(self.planAxis[i].sensorJson)[0].value;
+              self.planAxis[i].sensorJsonDescribe = JSON.parse(self.planAxis[i].sensorJson)[0].describe;
+              self.planAxis[i].sensorJsonUnit = JSON.parse(self.planAxis[i].sensorJson)[0].unit;
 
             }
           }
@@ -329,14 +337,14 @@ export default {
         if(res.code==200){
           let data=res.data;
           let list='';
-          _this.personInfo=data
+          self.personInfo=data
           for(let i=0;i<data.tvIds.length;i++){
             list +=data.tvIds[i]+",";
           }
 
-          _this.tvIds=list
+          self.tvIds=list
 
-          _this.cameraListFun();
+          self.cameraListFun();
 
         }
       })
@@ -345,26 +353,19 @@ export default {
       bigviewFunctionList(this.subjectId).then((res) =>{
         if(res.code==200){
           let data=res.data;
-          _this.weather=data
+          self.weather=data
         }
       })
       //消息推送记录
       bigviewWarnMessage(this.codeData).then((res) =>{
         if(res.code==200){
           let data=res.data;
-          _this.msgsPush=data
+          self.msgsPush=data
         }
       })
     }
   },
-  mounted() {
-    let _this=this
-    this.codeData=this.$route.query.key
-    this.subjectId=this.$route.query.subjectId
-    _this.switchStateFun();
-    _this.getAjaxData();
 
-  },
   beforeMount() {
     this.dragMoveX('.sensor_list')
   }