Merge remote-tracking branch 'remotes/origin/3.3.2-dzxxp' into 3.3.4-kdyh

src/views/gasManage3_0/manage/infoRecord/detailsPage.vue

@@ -104,7 +104,7 @@
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
         ],
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         topButtonIndex:0,
         topButton:[
           {id:'1',name:'走廊摄像头1'},{id:'2',name:'走廊摄像头2'},{id:'3',name:'走廊摄像头3'},

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

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

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

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

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

@@ -100,7 +100,7 @@
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
         ],
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         topButtonIndex:0,
         topButton:[
           {id:'1',name:'走廊摄像头1'},{id:'2',name:'走廊摄像头2'},{id:'3',name:'走廊摄像头3'},

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

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

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

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

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

@@ -160,7 +160,7 @@
     },
     data(){
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
         videoTitle:"",

src/views/newEvacuationBigData.vue

@@ -472,7 +472,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,
         //全局MQTT相关

src/views/newEvacuationBigDataHome.vue

@@ -128,7 +128,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,
         containerType:false,

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

@@ -54,7 +54,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + 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:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         selectTree: '',
         selectTreeValue: [],
         /******************基本信息-开始******************/

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

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

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

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

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

@@ -154,7 +154,7 @@
     },
     data(){
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
         videoTitle:"",

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

@@ -83,7 +83,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
         searchData:{
           searchList:[//搜索数组
             {