Merge branch 'master' into kdwc-web

src/api/gasManage3_0/gasManageSYD.js

@@ -301,6 +301,13 @@ export function gasManageConfigName(data) {
     method: 'get',
   })
 }
+// 气瓶管理-新增-查询所有实验室
+export function subjectListAdmin(data) {
+  return request({
+    url: '/laboratory/subject/list/listAdmin',
+    method: 'get',
+  })
+}
 export function getLoginUser(query) {
   return request({
     url: '/bottle/usegasApply/getLoginUser',

src/views/gasManage_syd/manage/gasManage/gasManageAdd.vue

@@ -27,6 +27,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="实验室" prop="subjectId" v-if="subjectList.length>1">
+          <el-select v-model="form.subjectId" clearable placeholder="请选择实验室" style="width: 300px">
+            <el-option
+              v-for="item in subjectList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="最低气压值" prop="minPressure">
           <el-input  style="width: 300px" v-model="form.minPressure"  placeholder="请输入最低气压值" maxlength="8" />
         </el-form-item>
@@ -64,7 +74,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { gasManageAdd, gasManageAirName, gasManageConfigName } from '@/api/gasManage3_0/gasManageSYD'
+import { gasManageAdd, gasManageAirName, gasManageConfigName,subjectListAdmin } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -103,6 +113,7 @@ export default {
         isHandwheel:1,
         isFixed:1,
         isStatusSign:1,
+        subjectId:'',
       },
 
       // 查询参数
@@ -115,6 +126,7 @@ export default {
       airNameList:[],
       configNameList:[],
       optionsListTwo:[],
+      subjectList:[],
       // 表单校验
       rules: {
         airName: [
@@ -123,6 +135,9 @@ export default {
         configName: [
           { required: true, message: "请选择气体规格", trigger: "change" }
         ],
+        subjectId: [
+          { required: true, message: "请选择实验室", trigger: "change" }
+        ],
         minPressure: [
           { required: true, message: "请输入最低气压值", trigger: "change" }
         ],
@@ -164,6 +179,23 @@ export default {
         }
       });
     },
+    /* 获取实验室 */
+    subjectListAdmin(){
+      let _this=this;
+      subjectListAdmin().then( response => {
+        let res=response.data;
+        if(response.code==200){
+          //判断如果是一个实验室,直接取实验室id,如果不是让用户选择
+          if(res.length==1){
+            _this.form.subjectId=res[0].id
+          }else{
+            _this.subjectList=res
+          }
+        }
+      });
+    },
+
+
 
     /* 详情 */
     submitForm(){
@@ -190,6 +222,7 @@ export default {
   mounted() {
     this.getAirName()
     this.getConfigName()
+    this.subjectListAdmin()
     //this.getInfo(this.pageData2.id);
   }
 

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -75,7 +75,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         searchData:{
           buttonList:[//按钮数组没有则为空
             {

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -80,7 +80,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         searchData:{
           buttonList:[//按钮数组没有则为空
             {

src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/detailsPage.vue

@@ -72,7 +72,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         topButtonIndex:0,
         topButton:[{id:'1',name:'走廊摄像头1'},{id:'2',name:'走廊摄像头2'},{id:'3',name:'走廊摄像头3'},],
         bottomButtonIndex:0,

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -113,7 +113,7 @@
         tableList:[],
         total:0,
         //开关锁视频相关数据
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
       }

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue

@@ -113,7 +113,7 @@
         tableList:[],
         total:0,
         //开关锁视频相关数据
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
       }

src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue

@@ -156,7 +156,7 @@
     },
     data(){
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
         videoTitle:"",

src/views/safetyEducationExam/safeLearning/el_course/coursePreview.vue

@@ -54,7 +54,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         loading:false,
         playerOptions: {
           playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度

src/views/safetyEducationExam/safeLearning/el_course/edit.vue

@@ -463,7 +463,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         selectTree: '',
         selectTreeValue: [],
         /******************基本信息-开始******************/

src/views/safetyEducationExam/safeLearning/safeLearning/learning.vue

@@ -85,7 +85,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         circularLogo:localStorage.getItem('circularLogo'),
         studyLoading:false,
         //时间

src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue

@@ -76,7 +76,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         searchData:{
           searchList:[//搜索数组
             {

src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue

@@ -150,7 +150,7 @@
     },
     data(){
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
         videoTitle:"",

src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue

@@ -81,7 +81,7 @@
     },
     data() {
       return {
-        videoCover:process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
         searchData:{
           searchList:[//搜索数组
             {