heyang

.env.production

@@ -11,6 +11,6 @@ ENV = 'production'
 
 # 实验室安全管理系统/生产环境
 #VUE_APP_BASE_API = '10.20.10.7/labSystem'
-VUE_APP_BASE_API = '192.168.1.43/labSystem'
+#VUE_APP_BASE_API = '192.168.1.43/labSystem'
 #VUE_APP_BASE_API = '192.168.1.88/labSystem'
-
+VUE_APP_BASE_API = 'lab.sxitdlc.com/sudalabSystem'

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -563,6 +563,7 @@ export default {
                   let newData = res.data.data;
                   let videoList = [];
                   for(let i=0;i<newData.length;i++){
+                    debugger
                     let text = localStorage.getItem('cameraUrl');
                     let url = newData[i].ws_flv;
                     url = url.split("rtp/");

src/views/gasManage3_0/manage/supplierManage/supplierManage.vue

@@ -76,7 +76,7 @@
                     </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="edit" icon="el-icon-edit-outline" v-hasPermiAnd="['airbottle:supplier:edit']">编辑</el-dropdown-item>
-                  <el-dropdown-item command="delete" icon="el-icon-delete" >删除</el-dropdown-item>
+                  <el-dropdown-item command="delete" icon="el-icon-delete" v-hasPermiAnd="['airbottle:supplier:remove']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/views/login.vue

@@ -139,10 +139,12 @@ export default {
         console.log('开发配置',response.data)
         //判定http或者https
         let urlText = window.location.href.split('://')[0]+'://';
-        if(urlText=='https://'){
+
+        let outerNet=window.location.href.indexOf(response.data.ipIdentify) == -1//true外网 false 内网
+
+        if(outerNet){//外网
           //文件预览地址
           localStorage.setItem('filePreviewUrl',urlText+response.data.fileExtranetUrl)
-
           //摄像头代理访问地址
           localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraExtranetAgent)
           //摄像头地址ip段
@@ -157,7 +159,7 @@ export default {
           localStorage.setItem('mqttPassword',Decrypt(response.data.mqttExtranetPassword))
           //可视化大屏访问地址
           localStorage.setItem('screenUrl',urlText+response.data.screenExtranetUrl)
-        }else if(urlText=='http://'){
+        }else{
           //文件预览地址
           localStorage.setItem('filePreviewUrl',urlText+response.data.fileIntranetUrl)
           //摄像头代理访问地址