heyang

src/api/system/publicConfig.js

@@ -16,5 +16,22 @@ export function updateLogoInfo(data) {
     data: data
   })
 }
+// 查询开发配置
+export function getUrlConfig(query) {
+  return request({
+    url: '/system/urlConfig',
+    method: 'get',
+    params: query
+  })
+}
+
+// 开发配置
+export function addUrlConfig(data) {
+  return request({
+    url: '/system/urlConfig',
+    method: 'put',
+    data: data
+  })
+}
 
 

src/layout/components/AppMain.vue

@@ -89,10 +89,15 @@ export default {
     },
     //MQTT订阅
     subscriptionMQTT(){
+      console.log(1111111)
+      console.log(localStorage.getItem('mqttUrl'))
+      console.log(localStorage.getItem('mqttUser'))
+      console.log(localStorage.getItem('mqttPassword'))
+
       let self = this;
-      this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-        username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-        password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+      this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+        username: localStorage.getItem('mqttUser'),
+        password: localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
         console.log("连接成功");

src/store/modules/permission.js

@@ -45,16 +45,8 @@ const permission = {
           for(let i=0;i<newData.length;i++){
             if( newData[i].path == 'https://www.sxitdlc.com'){
               // console.log('newData[i]',newData[i])
-              if(localStorage.getItem('identityType') == 1){
-                newData[i].name = process.env.VUE_APP_BIG_SCREEN_CAMPUS_BASE_API + '?identity=' + localStorage.getItem('identity')
-                newData[i].path = process.env.VUE_APP_BIG_SCREEN_CAMPUS_BASE_API + '?identity=' + localStorage.getItem('identity')
-              }else if(localStorage.getItem('identityType') == 2){
-                newData[i].name = process.env.VUE_APP_BIG_SCREEN_FACULTY_BASE_API + '?identity=' + localStorage.getItem('identity')
-                newData[i].path = process.env.VUE_APP_BIG_SCREEN_FACULTY_BASE_API + '?identity=' + localStorage.getItem('identity')
-              }else{
-                newData[i].name = "noPermission"
-                newData[i].path = "noPermission"
-              }
+              newData[i].name = localStorage.getItem('screenUrl') + '?identity=' + localStorage.getItem('identity')
+              newData[i].path = localStorage.getItem('screenUrl') + '?identity=' + localStorage.getItem('identity')
             }
           }
           const sdata = JSON.parse(JSON.stringify(newData))

src/utils/bigDataRequest.js

@@ -31,7 +31,7 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(config => {
   if(config.type == 'video'){
-    config.baseURL = urlText+process.env.VUE_APP_BASE_VIDEO_API
+    config.baseURL = localStorage.getItem('cameraExtranetAgent')
     potType = true;
   }else{
     potType = false;

src/utils/request.js

@@ -9,6 +9,7 @@ import { tansParams } from "@/utils/ruoyi";
 //判定http或者https
 let urlText = window.location.href.split('://')[0]+'://';
 
+
 //分锅器
 let potType = false;
 
@@ -31,7 +32,7 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(config => {
   if(config.type == 'video'){
-    config.baseURL = urlText+process.env.VUE_APP_BASE_VIDEO_API;
+    config.baseURL = localStorage.getItem('cameraExtranetAgent');
     potType = true;
   }else{
     potType = false;

src/utils/ruoyi.js

@@ -249,9 +249,9 @@ export function urlJudge(url) {
   let src = '';
   if(url.indexOf('http') !== -1){
     let text =  window.location.href.split('://')[0]+'://' + url.split('://')[1]
-    src = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(text))));
+    src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(text))));
   }else{
-    src = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API +'/admin/'+ url))));
+    src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API +'/admin/'+ url))));
   }
   return src
 }

src/views/bigDataLogin.vue

@@ -140,15 +140,8 @@
             this.loading = true;
             this.$store.dispatch("Login", this.loginForm).then((res) => {
               if(res.data.type){
-                if(res.data.screen_type == 1){
-                  window.location.href = process.env.VUE_APP_BIG_SCREEN_CAMPUS_BASE_API + '?identity=' + res.data.screen_token;
-                }else if(res.data.screen_type == 2){
-                  window.location.href = process.env.VUE_APP_BIG_SCREEN_FACULTY_BASE_API + '?identity=' + res.data.screen_token;
-                }else{
-                  this.msgError("您没有相关权限")
-                  this.loading = false;
-                  return
-                }
+                window.location.href = localStorage.getItem('screenUrl') + '?identity=' + res.data.screen_token;
+
                 this.fullScreen();
               }
             }).catch(() => {

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

@@ -528,7 +528,7 @@ export default {
             page:"1",
           };
           let urlText = window.location.href;
-          if(urlText.indexOf("192.168") != -1){
+          if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
             startUrl(obj).then(res => {
               if(res.code == 200){
                 if(!res.data[0]){
@@ -561,7 +561,7 @@ export default {
                 }else{
                   let videoList = [];
                   for(let i=0;i<res.data.length;i++){
-                    let text = 'wss://lab.sxitdlc.com/jinandaxue/stream/';
+                    let text = localStorage.getItem('cameraUrl');
                     let url = res.data[i].result.body.data.ws_flv;
                     url = url.split("rtp/");
                     let newUrl = text+'rtp/'+url[1];
@@ -639,7 +639,7 @@ export default {
                 page:"1",
               };
               let urlText = window.location.href;
-              if(urlText.indexOf("192.168") != -1){
+              if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
                 startUrl(obj).then(res => {
                   if(res.code == 200){
                     if(!res.data[0]){
@@ -673,7 +673,7 @@ export default {
                     }
                     let videoList = [];
                     for(let i=0;i<res.data.length;i++){
-                      let text = 'wss://lab.sxitdlc.com/jinandaxue/stream/';
+                      let text = localStorage.getItem('cameraUrl');
                       let url = res.data[i].result.body.data.ws_flv;
                       url = url.split("rtp/");
                       let newUrl = text+'rtp/'+url[1];
@@ -832,9 +832,9 @@ export default {
     //MQTT订阅
     subscriptionMQTT(){
       let self = this;
-      this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-        username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-        password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+      this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+        username: localStorage.getItem('mqttUser'),
+        password:localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
         console.log("连接成功");

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

@@ -659,7 +659,7 @@ export default {
                 page:"1",
               };
               let urlText = window.location.href;
-              if(urlText.indexOf("192.168") != -1){
+              if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
                 startUrl(obj).then(res => {
                   if(res.code == 200){
                     if(!res.data[0]){
@@ -693,7 +693,7 @@ export default {
                     }
                     let videoList = [];
                     for(let i=0;i<res.data.length;i++){
-                      let text = 'wss://lab.sxitdlc.com/jinandaxue/stream/';
+                      let text = localStorage.getItem('cameraUrl');
                       let url = res.data[i].result.body.data.ws_flv;
                       url = url.split("rtp/");
                       let newUrl = text+'rtp/'+url[1];
@@ -864,9 +864,9 @@ export default {
     //MQTT订阅
     subscriptionMQTT(){
       let self = this;
-      this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-        username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-        password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+      this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+        username: localStorage.getItem('mqttUser'),
+        password: localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
         console.log("连接成功");

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

@@ -527,7 +527,7 @@ export default {
             page:"1",
           };
           let urlText = window.location.href;
-          if(urlText.indexOf("192.168") != -1){
+          if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
             startUrl(obj).then(res => {
               if(res.code == 200){
                 if(!res.data[0]){
@@ -560,7 +560,7 @@ export default {
                 }else{
                   let videoList = [];
                   for(let i=0;i<res.data.length;i++){
-                    let text = 'wss://lab.sxitdlc.com/wenchang/stream/';
+                    let text = localStorage.getItem('cameraUrl');
                     let url = res.data[i].result.body.data.ws_flv;
                     url = url.split("rtp/");
                     let newUrl = text+'rtp/'+url[1];
@@ -638,7 +638,7 @@ export default {
                 page:"1",
               };
               let urlText = window.location.href;
-              if(urlText.indexOf("192.168") != -1){
+              if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
                 startUrl(obj).then(res => {
                   if(res.code == 200){
                     if(!res.data[0]){
@@ -672,7 +672,7 @@ export default {
                     }
                     let videoList = [];
                     for(let i=0;i<res.data.length;i++){
-                      let text = 'wss://lab.sxitdlc.com/wenchang/stream/';
+                      let text = localStorage.getItem('cameraUrl');
                       let url = res.data[i].result.body.data.ws_flv;
                       url = url.split("rtp/");
                       let newUrl = text+'rtp/'+url[1];
@@ -831,9 +831,9 @@ export default {
     //MQTT订阅
     subscriptionMQTT(){
       let self = this;
-      this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-        username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-        password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+      this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+        username: localStorage.getItem('mqttUser'),
+        password: localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
         console.log("连接成功");

src/views/comprehensive/system/publicConfig/basicsConfig.vue

@@ -0,0 +1,208 @@
+<template>
+  <div class="app-container public-config-page">
+    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+      <div class="form-max-box">
+        <el-form-item label="学校名称：" prop="schoolName">
+          <el-input
+            v-model="form.schoolName"
+            maxLength="20"
+            placeholder="请输入学校名称"
+          />
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="圆形Logo：" prop="circularLogo">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'circularLogo')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.circularLogo" :src="form.circularLogo" class="avatar" style="height:80px;width:80px;border-radius: 40px;">
+            <i v-if="!form.circularLogo" class="el-icon-plus avatar-uploader-icon" style="height:80px;width:80px;border-radius: 40px;line-height: 80px;">上传</i>
+          </el-upload>
+          <i v-if="form.circularLogo" class="el-icon-view" @click="lookImg(form.circularLogo)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="长方形Logo：" prop="rectangleLogo">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'rectangleLogo')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.rectangleLogo" :src="form.rectangleLogo" class="avatar">
+            <i v-if="!form.rectangleLogo" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.rectangleLogo" class="el-icon-view" @click="lookImg(form.rectangleLogo)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div class="sub_btn">
+      <p class="inquire-button-one"  @click="submitForm">保存</p>
+    </div>
+    <!--查看图片-->
+    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
+      <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
+        <img :src="imgUrl" style="display:block;max-width:1160px;margin:0 auto">
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { getToken } from "@/utils/auth";
+  import { getLogoInfo,updateLogoInfo } from "@/api/system/publicConfig";
+  import store from '@/store'
+  export default {
+    name: "publicConfig",
+    data() {
+      return {
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/base/upload", // 上传的图片服务器地址
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+        form:{
+          userType:[],
+          expandType:[]
+        },
+        rules: {
+          schoolName: [
+            { required: true, message: "学校名称不能为空", trigger: "blur" },
+            { required: true, message: "学校名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          ],
+          circularLogo: [
+            { required: true, message: "圆形Logo不能为空", trigger: "blur" }
+          ],
+          rectangleLogo: [
+            { required: true, message: "长方形Logo不能为空", trigger: "blur" }
+          ],
+        },
+        imgUrl:"",
+        imgOpen:false,
+      };
+    },
+    created() {
+
+    },
+    mounted(){
+      this.getLogoInfo();
+    },
+    methods: {
+      /** 提交按钮 */
+      submitForm: function() {
+        let self = this;
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            let obj = {
+              schoolName:this.form.schoolName,
+              circularLogo:this.form.circularLogo,
+              rectangleLogo:this.form.rectangleLogo,
+            }
+
+            updateLogoInfo(obj).then(response => {
+              this.msgSuccess(response.msg);
+              this.getLogoInfo();
+            });
+          }
+        });
+      },
+      //查看图片
+      lookImg(url){
+        this.imgUrl = url;
+        this.imgOpen = true;
+      },
+      //获取数据
+      getLogoInfo(){
+        getLogoInfo().then(response => {
+
+          this.$set(this,'form',response.data)
+        });
+      },
+      //上传
+      handleAvatarSuccess(res,type) {
+        if(type == 'circularLogo'){
+          this.$set(this.form,'circularLogo',res.data.url);
+        }else if(type == 'rectangleLogo'){
+          this.$set(this.form,'rectangleLogo',res.data.url);
+        }
+        this.$forceUpdate()
+      },
+      beforeAvatarUpload(file) {
+        let type = false;
+        console.log('file',file);
+        if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif') {
+          type = true;
+        }else{
+          this.$message.error('只能上传png/jpeg/gif格式图片');
+          type = false;
+        }
+        return type;
+      },
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  .public-config-page{
+    position: relative;
+    /*底部按钮弹框*/
+    .sub_btn{
+      position: fixed;
+      right: 20px;
+      bottom: 0;
+      background: #fff;
+      height: 112px;
+      width:84%;
+      text-align: center;
+      .inquire-button-one{
+        cursor:pointer;
+        display: inline-block;
+        text-align: center;
+        width: 70px;
+        height: 40px;
+        border-radius: 6px;
+        border: 1px solid #0045af;
+        color:#ffffff;
+        background:#0045af;
+        margin:36px 10px 0 0;
+      }
+    }
+    *{
+      margin:0;
+    }
+    .title-box{
+      border-bottom:1px solid #dedede;
+      p{
+        margin-left:40px;
+        color:#0045af;
+        line-height:60px;
+      }
+    }
+    .form-max-box{
+      margin-top:20px;
+      margin-left: 100px;
+    }
+    .avatar-uploader-icon{
+      width: 200px;
+      height: 120px;
+      line-height: 120px;
+      font-size: 16px;
+      font-weight: 400;
+      color: #CCCCCC;
+    }
+    .avatar{
+      width: 200px;
+      height: 120px;
+    }
+  }
+</style>

src/views/comprehensive/system/publicConfig/chemicalsConfig.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="app-container public-config-page">
+    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+      <div class="form-max-box">
+        <el-form-item label="使用身份配置" prop="userType">
+          <el-checkbox-group v-model="form.userType">
+            <el-checkbox style="margin:4px 87px 0 20px;" label="11">教职工</el-checkbox>
+            <el-checkbox label="22">学生</el-checkbox>
+          </el-checkbox-group>
+
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="扩展配置" prop="expandType">
+          <el-checkbox-group v-model="form.expandType">
+            <el-checkbox style="margin:4px 30px 0 20px;" label="11">化学品柜智能锁</el-checkbox>
+            <el-checkbox label="22">气瓶标签</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div class="sub_btn">
+      <p class="inquire-button-one"  @click="submitForm">保存</p>
+    </div>
+    <!--查看图片-->
+    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
+      <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
+        <img :src="imgUrl" style="display:block;max-width:1160px;margin:0 auto">
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { getToken } from "@/utils/auth";
+  import { getLogoInfo,updateLogoInfo } from "@/api/system/publicConfig";
+  import store from '@/store'
+  export default {
+    name: "publicConfig",
+    data() {
+      return {
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/base/upload", // 上传的图片服务器地址
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+        form:{
+          userType:[],
+          expandType:[]
+        },
+        rules: {
+
+          userType: [
+            { required: true, message: "请配置使用身份", trigger: "blur" }
+          ],
+          smartLock: [
+            { required: true, message: "请配置智能锁", trigger: "blur" }
+          ],
+          airBottle: [
+            { required: true, message: "请配置气瓶标签", trigger: "blur" }
+          ],
+          expandType: [
+            { required: true, message: "请配置扩展配置", trigger: "blur" }
+          ]
+        },
+        imgUrl:"",
+        imgOpen:false,
+      };
+    },
+    created() {
+
+    },
+    mounted(){
+      this.getLogoInfo();
+    },
+    methods: {
+      /** 提交按钮 */
+      submitForm: function() {
+        let self = this;
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            let obj = {
+
+            }
+            //判断使用身份配置
+            if(self.form.userType[1]){
+              obj.userType = '-1';
+            }else{
+              if(self.form.userType[0] == '11'){
+                obj.userType = '11';
+              }else if(self.form.userType[0] == '22'){
+                obj.userType = '22';
+              }
+            }
+            //判断扩展配置(智能锁配置/气瓶标签配置)
+            let oneType = 0;
+            let twoType = 0;
+            for(let i=0;i<self.form.expandType.length;i++){
+              if(self.form.expandType[i] == '11'){
+                obj.smartLock = 1;
+                oneType++
+              }else if(self.form.expandType[i] == '22'){
+                obj.airBottle = 1;
+                twoType++
+              }
+            }
+            if(oneType==0){
+              obj.smartLock = 0;
+            }
+            if(twoType==0){
+              obj.airBottle = 0;
+            }
+            updateLogoInfo(obj).then(response => {
+              this.msgSuccess(response.msg);
+              this.getLogoInfo();
+            });
+          }
+        });
+      },
+      //查看图片
+      lookImg(url){
+        this.imgUrl = url;
+        this.imgOpen = true;
+      },
+      //获取数据
+      getLogoInfo(){
+        getLogoInfo().then(response => {
+          //判断使用身份配置
+          let listOne = [];
+          if(response.data.userType == -1){
+            listOne.push('11')
+            listOne.push('22')
+          }else if(response.data.userType == 11){
+            listOne.push('11')
+          }else if(response.data.userType == 22){
+            listOne.push('22')
+          }
+          this.$set(response.data,'userType',listOne);
+          //判断扩展配置
+          let listTwo = [];
+          if(response.data.smartLock == 1){
+            listTwo.push('11')
+          }
+          if(response.data.airBottle == 1){
+            listTwo.push('22')
+          }
+          this.$set(response.data,'expandType',listTwo);
+          this.$set(this,'form',response.data)
+        });
+      },
+
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  .public-config-page{
+    /*底部按钮弹框*/
+    .sub_btn{
+      position: fixed;
+      right: 20px;
+      bottom: 0;
+      background: #fff;
+      height: 112px;
+      width:84%;
+      text-align: center;
+      .inquire-button-one{
+        cursor:pointer;
+        display: inline-block;
+        text-align: center;
+        width: 70px;
+        height: 40px;
+        border-radius: 6px;
+        border: 1px solid #0045af;
+        color:#ffffff;
+        background:#0045af;
+        margin:36px 10px 0 0;
+      }
+    }
+    *{
+      margin:0;
+    }
+    .title-box{
+      border-bottom:1px solid #dedede;
+      p{
+        margin-left:40px;
+        color:#0045af;
+        line-height:60px;
+      }
+    }
+    .form-max-box{
+      margin-top:20px;
+    }
+  }
+</style>

src/views/comprehensive/system/publicConfig/exploitConfig.vue

@@ -0,0 +1,258 @@
+<!--开发配置-->
+<template>
+  <div class="app-container public-config-page">
+    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+      <div class="title-box">
+        <p>文件预览配置</p>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="文件预览地址-外网：">
+          <el-input placeholder="请输入"  v-model="form.fileExtranetUrl">
+            <template slot="prepend">https://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>调用后台文件预览服务时访问的地址</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="文件预览地址-内网：">
+          <el-input placeholder="请输入"  v-model="form.fileIntranetUrl">
+            <template slot="prepend">http://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>调用后台文件预览服务时访问的地址</i>
+      </div>
+      <div class="line"></div>
+      <div class="title-box">
+        <p>摄像头配置</p>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="代理访问地址：">
+          <el-input placeholder="请输入"  v-model="form.cameraExtranetAgent">
+            <template slot="prepend">https://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>根据部署内外网环境来配置的调用地址</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="内网地址IP段：">
+          <el-input placeholder="请输入"  v-model="form.cameraIntranetAgent" style="width: 300px">
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>用于判断用户当前访问的是内网地址还是外网地址</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="内网访问地址：">
+          <el-input placeholder="请输入"  v-model="form.cameraIntranetUrl">
+            <template slot="prepend">http://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>在内网环境时连接摄像头所用地址</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="外网访问地址：">
+          <el-input placeholder="请输入"  v-model="form.cameraExtranetUrl">
+            <template slot="prepend">https://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>在外网环境时连接摄像头所用地址</i>
+      </div>
+      <div class="line"></div>
+      <div class="title-box">
+        <p>MQTT配置</p>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="MQTT地址-外网：">
+          <el-input placeholder="请输入"  v-model="form.mqttExtranetUrl">
+            <template slot="prepend">wss://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>MQTT调用相关地址/账号配置</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="MQTT账号-外网：">
+          <el-input
+            v-model="form.mqttExtranetUser"
+            placeholder="请输入"
+            style="width: 290px"
+          />
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="MQTT密码-外网：">
+          <el-input
+            v-model="form.mqttExtranetPassword"
+            placeholder="请输入"
+            style="width: 290px"
+          />
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="MQTT地址-内网：">
+          <el-input placeholder="请输入"  v-model="form.mqttIntranetUrl">
+            <template slot="prepend">ws://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>MQTT调用相关地址/账号配置</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="MQTT账号-内网：">
+          <el-input
+            v-model="form.mqttIntranetUser"
+            placeholder="请输入"
+            style="width: 290px"
+          />
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="MQTT密码-内网：">
+          <el-input
+            v-model="form.mqttIntranetPassword"
+            placeholder="请输入"
+            style="width: 290px"
+          />
+        </el-form-item>
+      </div>
+      <div class="line"></div>
+      <div class="title-box">
+        <p>可视化大屏配置</p>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="访问地址-外网：">
+          <el-input placeholder="请输入"  v-model="form.screenExtranetUrl">
+            <template slot="prepend">https://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>跳转大屏时访问的地址</i>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="访问地址-内网：">
+          <el-input placeholder="请输入"  v-model="form.screenIntranetUrl">
+            <template slot="prepend">http://</template>
+          </el-input>
+        </el-form-item>
+        <i class="tip"><i class="el-icon-question"></i>跳转大屏时访问的地址</i>
+      </div>
+    </el-form>
+    <div class="sub_btn">
+      <p class="inquire-button-one"  @click="submitForm">保存</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getToken } from "@/utils/auth";
+  import { addUrlConfig, getLogoInfo, getUrlConfig } from '@/api/system/publicConfig'
+  import store from '@/store'
+  export default {
+    name: "publicConfig",
+    data() {
+      return {
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/base/upload", // 上传的图片服务器地址
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+        form:{
+
+        },
+        rules: {
+          fileExtranetUrl: [
+            { pattern:/http[s]{0,1}:\/\/([\w.]+\/?)\S*/, message: "请输入正确的联系方式", trigger: "blur" }
+          ],
+
+        },
+
+      };
+    },
+    created() {
+
+    },
+    mounted(){
+      this.getUrlConfig();
+    },
+    methods: {
+      /** 提交按钮 */
+      submitForm: function() {
+        let _this = this;
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            addUrlConfig(_this.form).then(response => {
+              _this.msgSuccess(response.msg);
+              _this.getUrlConfig()
+
+            });
+          }
+        });
+      },
+      //获取数据
+      getUrlConfig(){
+        let _this=this;
+        getUrlConfig().then(response => {
+            _this.form=response.data
+        });
+      },
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  .public-config-page{
+    padding-bottom: 200px !important;
+    /*底部按钮弹框*/
+    .sub_btn{
+      position: fixed;
+      right: 20px;
+      bottom: 0;
+      background: #fff;
+      height: 112px;
+      width:84%;
+      text-align: center;
+      .inquire-button-one{
+        cursor:pointer;
+        display: inline-block;
+        text-align: center;
+        width: 70px;
+        height: 40px;
+        border-radius: 6px;
+        border: 1px solid #0045af;
+        color:#ffffff;
+        background:#0045af;
+        margin:36px 10px 0 0;
+      }
+    }
+    *{
+      margin:0;
+    }
+    .title-box{
+      p{
+        margin-left:78px;
+        color:#0045af;
+        line-height:60px;
+        font-size: 16px;
+        font-weight: 400;
+        color: #333333;
+      }
+    }
+    .form-max-box{
+      margin-top:20px;
+      margin-left: 100px;
+      .tip{
+        font-size: 16px;
+        font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+        font-weight: 400;
+        color: #333333;
+        line-height: 40px;
+        font-style: normal;
+        >i{
+          margin: 0 10px 0 24px;
+          color: #0045AF;
+        }
+      }
+    }
+    .line{
+      width: 100%;
+      height: 10px;
+      background: #F5F5F5;
+      margin-top: 40px;
+    }
+  }
+</style>

src/views/comprehensive/system/publicConfig/index.vue

@@ -1,407 +1,104 @@
 <template>
-  <div class="app-container public-config-page">
-    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
-      <div class="title-box">
-        <p>基本信息</p>
+  <div class="app-container classifiedGrading">
+    <div class="top-button-max-box">
+      <div class="top-button-box" @click="buttonPageType(1)">
+        <p :class="pageType == 1 ? 'p-color':''">基础配置</p>
+        <p :class="pageType == 1 ? 'p-back':''"></p>
       </div>
-      <div class="form-max-box">
-        <el-form-item label="学校名称：" prop="schoolName">
-          <el-input
-            v-model="form.schoolName"
-            maxLength="20"
-            placeholder="请输入学校名称"
-          />
-        </el-form-item>
-        <el-form-item label="圆形Logo：" prop="circularLogo">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'circularLogo')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.circularLogo" :src="form.circularLogo" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.circularLogo" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.circularLogo" class="el-icon-view" @click="lookImg(form.circularLogo)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
-        <el-form-item label="长方形Logo：" prop="rectangleLogo">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'rectangleLogo')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.rectangleLogo" :src="form.rectangleLogo" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.rectangleLogo" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.rectangleLogo" class="el-icon-view" @click="lookImg(form.rectangleLogo)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
+      <div class="top-button-box" @click="buttonPageType(2)">
+        <p :class="pageType == 2 ? 'p-color':''">化学品终端</p>
+        <p :class="pageType == 2 ? 'p-back':''"></p>
       </div>
-      <div class="title-box">
-        <p>一体机</p>
+      <div class="top-button-box" @click="buttonPageType(3)">
+        <p :class="pageType == 3 ? 'p-color':''">一体机</p>
+        <p :class="pageType == 3 ? 'p-back':''"></p>
       </div>
-      <div class="form-max-box">
-        <el-form-item label="签到/离开示意图：" prop="signMap">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'signMap')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.signMap" :src="form.signMap" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
-        <el-form-item label="视频封面：" prop="videoCover">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'videoCover')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.videoCover" :src="form.videoCover" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.videoCover" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.videoCover" class="el-icon-view" @click="lookImg(form.videoCover)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
-        <el-form-item label="操作指南：" prop="operationGuide">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.operationGuide" :src="form.operationGuide" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
+      <div class="top-button-box" @click="buttonPageType(4)">
+        <p :class="pageType == 4 ? 'p-color':''">小程序</p>
+        <p :class="pageType == 4 ? 'p-back':''"></p>
       </div>
-      <div class="title-box">
-        <p>小程序</p>
+      <div class="top-button-box" @click="buttonPageType(5)">
+        <p :class="pageType == 5 ? 'p-color':''">开发配置</p>
+        <p :class="pageType == 5 ? 'p-back':''"></p>
       </div>
-      <div class="form-max-box">
-        <el-form-item label="登录页banner：" prop="loginBanner">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'loginBanner')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.loginBanner" :src="form.loginBanner" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.loginBanner" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.loginBanner" class="el-icon-view" @click="lookImg(form.loginBanner)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
-        <el-form-item label="首页banner：" prop="homepageBanner">
-          <el-upload
-            class="certificate-avatar-uploader"
-            :action="uploadImgUrl"
-            :show-file-list="false"
-            accept="image/jpeg,image/gif,image/png"
-            :on-success="(res)=>handleAvatarSuccess(res,'homepageBanner')"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.homepageBanner" :src="form.homepageBanner" class="avatar" style="height:80px;width:80px;">
-            <i v-if="!form.homepageBanner" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-          <i v-if="form.homepageBanner" class="el-icon-view" @click="lookImg(form.homepageBanner)"
-             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
-            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
-        </el-form-item>
-      </div>
-      <div class="title-box">
-        <p>化学品智能终端</p>
-      </div>
-      <div class="form-max-box">
-        <el-form-item label="使用身份配置" prop="userType">
-          <el-checkbox-group v-model="form.userType">
-            <el-checkbox style="margin:4px 87px 0 20px;" label="11">教职工</el-checkbox>
-            <el-checkbox label="22">学生</el-checkbox>
-          </el-checkbox-group>
-          <!--<el-radio-group v-model="form.userType">-->
-            <!--<el-radio style="margin:4px 28px 0 20px;" label="-1">全部</el-radio>-->
-            <!--<el-radio style="margin:4px 30px 0 0;" label="11">教职工</el-radio>-->
-            <!--<el-radio label="22">学生</el-radio>-->
-          <!--</el-radio-group>-->
-          <!--<el-select v-model="form.userType" placeholder="请配置使用身份" style="width:200px;">-->
-            <!--<el-option label="全部" value="-1" />-->
-            <!--<el-option label="教职工" value="11" />-->
-            <!--<el-option label="学生" value="22" />-->
-          <!--</el-select>-->
-        </el-form-item>
-      </div>
-      <div class="form-max-box">
-        <el-form-item label="扩展配置" prop="expandType">
-          <el-checkbox-group v-model="form.expandType">
-            <el-checkbox style="margin:4px 30px 0 20px;" label="11">化学品柜智能锁</el-checkbox>
-            <el-checkbox label="22">气瓶标签</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-      </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="智能锁配置" prop="smartLock">-->
-          <!--<el-radio-group v-model="form.smartLock">-->
-            <!--<el-radio style="margin:4px 40px 0 20px;" :label="1">有</el-radio>-->
-            <!--<el-radio :label="0">无</el-radio>-->
-          <!--</el-radio-group>-->
-          <!--&lt;!&ndash;<el-select v-model="form.smartLock" placeholder="请配置智能锁" style="width:200px;">&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-option label="有" :value="1" />&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-option label="无" :value="0" />&ndash;&gt;-->
-          <!--&lt;!&ndash;</el-select>&ndash;&gt;-->
-        <!--</el-form-item>-->
-      <!--</div>-->
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="气瓶标签配置" prop="airBottle">-->
-          <!--<el-radio-group v-model="form.airBottle">-->
-            <!--<el-radio style="margin:4px 40px 0 20px;" :label="1">有</el-radio>-->
-            <!--<el-radio :label="0">无</el-radio>-->
-          <!--</el-radio-group>-->
-          <!--&lt;!&ndash;<el-select v-model="form.airBottle" placeholder="请配置气瓶标签" style="width:200px;">&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-option label="有" :value="1" />&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-option label="无" :value="0" />&ndash;&gt;-->
-          <!--&lt;!&ndash;</el-select>&ndash;&gt;-->
-        <!--</el-form-item>-->
-      <!--</div>-->
-    </el-form>
-    <p class="inquire-button-one" style="margin:60px auto 60px;display: block" @click="submitForm">保存</p>
-    <!--查看图片-->
-    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
-      <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
-        <img :src="imgUrl" style="display:block;max-width:1160px;margin:0 auto">
-      </div>
-    </el-dialog>
+    </div>
+    <basics-config v-if="pageType == 1"></basics-config>
+    <chemicals-config v-if="pageType == 2"></chemicals-config>
+    <integration-config v-if="pageType == 3"></integration-config>
+    <program-config v-if="pageType == 4"></program-config>
+    <exploit-config v-if="pageType == 5"></exploit-config>
   </div>
 </template>
 
 <script>
-  import { getToken } from "@/utils/auth";
-  import { getLogoInfo,updateLogoInfo } from "@/api/system/publicConfig";
-  import store from '@/store'
-  export default {
-    name: "publicConfig",
-    data() {
-      return {
-        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/base/upload", // 上传的图片服务器地址
-        headers: {
-          Authorization: "Bearer " + getToken(),
-        },
-        form:{
-          userType:[],
-          expandType:[]
-        },
-        rules: {
-          schoolName: [
-            { required: true, message: "学校名称不能为空", trigger: "blur" },
-            { required: true, message: "学校名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          circularLogo: [
-            { required: true, message: "圆形Logo不能为空", trigger: "blur" }
-          ],
-          rectangleLogo: [
-            { required: true, message: "长方形Logo不能为空", trigger: "blur" }
-          ],
-          signMap: [
-            { required: true, message: "签到/离开示意图不能为空", trigger: "blur" }
-          ],
-          videoCover: [
-            { required: true, message: "视频封面不能为空", trigger: "blur" }
-          ],
-          operationGuide: [
-            { required: true, message: "操作指南不能为空", trigger: "blur" }
-          ],
-          loginBanner: [
-            { required: true, message: "登录页banner不能为空", trigger: "blur" }
-          ],
-          homepageBanner: [
-            { required: true, message: "首页banner不能为空", trigger: "blur" }
-          ],
-          userType: [
-            { required: true, message: "请配置使用身份", trigger: "blur" }
-          ],
-          smartLock: [
-            { required: true, message: "请配置智能锁", trigger: "blur" }
-          ],
-          airBottle: [
-            { required: true, message: "请配置气瓶标签", trigger: "blur" }
-          ],
-          expandType: [
-            { required: true, message: "请配置扩展配置", trigger: "blur" }
-          ]
-        },
-        imgUrl:"",
-        imgOpen:false,
-      };
-    },
-    created() {
+import basicsConfig from "./basicsConfig.vue";
+import chemicalsConfig from "./chemicalsConfig.vue";
+import integrationConfig from "./integrationConfig.vue";
+import programConfig from "./programConfig.vue";
+import exploitConfig from "./exploitConfig.vue";
+export default {
+  name: "index",
+  components: {
+    basicsConfig,
+    chemicalsConfig,
+    integrationConfig,
+    programConfig,
+    exploitConfig,
+  },
+  data() {
+    return {
+      pageType:1,
+    }
+  },
+  created() {
 
+  },
+  mounted(){
+
+  },
+  methods:{
+    // 选项卡切换
+    buttonPageType(type){
+      if(this.pageType != type){
+        this.pageType = type;
+      }
     },
-    mounted(){
-      this.getLogoInfo();
-    },
-    methods: {
-      /** 提交按钮 */
-      submitForm: function() {
-        let self = this;
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            let obj = {
-              schoolName:this.form.schoolName,
-              circularLogo:this.form.circularLogo,
-              rectangleLogo:this.form.rectangleLogo,
-              signMap:this.form.signMap,
-              videoCover:this.form.videoCover,
-              operationGuide:this.form.operationGuide,
-              loginBanner:this.form.loginBanner,
-              homepageBanner:this.form.homepageBanner,
-              smartLock:0,
-              airBottle:0,
-            }
-            //判断使用身份配置
-            if(self.form.userType[1]){
-              obj.userType = '-1';
-            }else{
-              if(self.form.userType[0] == '11'){
-                obj.userType = '11';
-              }else if(self.form.userType[0] == '22'){
-                obj.userType = '22';
-              }
-            }
-            //判断扩展配置(智能锁配置/气瓶标签配置)
-            let oneType = 0;
-            let twoType = 0;
-            for(let i=0;i<self.form.expandType.length;i++){
-              if(self.form.expandType[i] == '11'){
-                obj.smartLock = 1;
-                oneType++
-              }else if(self.form.expandType[i] == '22'){
-                obj.airBottle = 1;
-                twoType++
-              }
-            }
-            if(oneType==0){
-              obj.smartLock = 0;
-            }
-            if(twoType==0){
-              obj.airBottle = 0;
-            }
-            updateLogoInfo(obj).then(response => {
-              this.msgSuccess(response.msg);
-              this.getLogoInfo();
-            });
-          }
-        });
-      },
-      //查看图片
-      lookImg(url){
-        this.imgUrl = url;
-        this.imgOpen = true;
-      },
-      //获取数据
-      getLogoInfo(){
-        getLogoInfo().then(response => {
-          store.dispatch('settings/setSmartAlarmType', response.data.smartLock)
-          localStorage.setItem('setSmartAlarmType',response.data.smartLock)
-          localStorage.setItem('circularLogo',response.data.circularLogo)
-          localStorage.setItem('rectangleLogo',response.data.rectangleLogo)
-          localStorage.setItem('videoCover',response.data.videoCover)
-          //判断使用身份配置
-          let listOne = [];
-          if(response.data.userType == -1){
-            listOne.push('11')
-            listOne.push('22')
-          }else if(response.data.userType == 11){
-            listOne.push('11')
-          }else if(response.data.userType == 22){
-            listOne.push('22')
-          }
-          this.$set(response.data,'userType',listOne);
-          //判断扩展配置
-          let listTwo = [];
-          if(response.data.smartLock == 1){
-            listTwo.push('11')
-          }
-          if(response.data.airBottle == 1){
-            listTwo.push('22')
-          }
-          this.$set(response.data,'expandType',listTwo);
-          this.$set(this,'form',response.data)
-        });
-      },
-      //上传
-      handleAvatarSuccess(res,type) {
-        if(type == 'circularLogo'){
-          this.$set(this.form,'circularLogo',res.data.url);
-        }else if(type == 'rectangleLogo'){
-          this.$set(this.form,'rectangleLogo',res.data.url);
-        }else if(type == 'signMap'){
-          this.$set(this.form,'signMap',res.data.url);
-        }else if(type == 'videoCover'){
-          this.$set(this.form,'videoCover',res.data.url);
-        }else if(type == 'operationGuide'){
-          this.$set(this.form,'operationGuide',res.data.url);
-        }else if(type == 'loginBanner'){
-          this.$set(this.form,'loginBanner',res.data.url);
-        }else if(type == 'homepageBanner'){
-          this.$set(this.form,'homepageBanner',res.data.url);
-        }
-        this.$forceUpdate()
-      },
-      beforeAvatarUpload(file) {
-        let type = false;
-        console.log('file',file);
-        if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif') {
-          type = true;
-        }else{
-          this.$message.error('只能上传png/jpeg/gif格式图片');
-          type = false;
-        }
-        return type;
-      },
-    },
-  };
+  }
+}
 </script>
 
 <style scoped lang="scss">
-  .public-config-page{
-    *{
-      margin:0;
-    }
-    .title-box{
-      border-bottom:1px solid #dedede;
-      p{
-        margin-left:40px;
-        color:#0045af;
-        line-height:60px;
+.classifiedGrading{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+  *{
+    margin:0;
+  }
+  .top-button-max-box{
+    display: flex;
+    padding:16px 10px 0;
+    border-bottom:1px solid #D8D8D8;
+    .top-button-box{
+      height:73px;
+      padding:0 25px;
+      p:nth-child(1){
+        line-height:68px;
+        text-align: center;
+        font-weight:500;
+        cursor: pointer;
+      }
+      p:nth-child(2){
+        height:5px;
+        border-radius:2px;
+      }
+      .p-color{
+        color:#0045AF;
+      }
+      .p-back{
+        background: #0045AF;
       }
-    }
-    .form-max-box{
-      margin-top:20px;
     }
   }
+}
 </style>

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -0,0 +1,222 @@
+<!--一体机配置-->
+<template>
+  <div class="app-container public-config-page">
+    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+      <div class="form-max-box">
+        <el-form-item label="签到/离开示意图：" prop="signMap">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'signMap')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.signMap" :src="form.signMap" class="avatar">
+            <i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>
+          </el-upload>
+          <i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="视频封面：" prop="videoCover">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'videoCover')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.videoCover" :src="form.videoCover" class="avatar" >
+            <i v-if="!form.videoCover" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.videoCover" class="el-icon-view" @click="lookImg(form.videoCover)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="操作指南：" prop="operationGuide">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">
+            <i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div class="sub_btn">
+      <p class="inquire-button-one"  @click="submitForm">保存</p>
+    </div>
+    <!--查看图片-->
+    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
+      <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
+        <img :src="imgUrl" style="display:block;max-width:1160px;margin:0 auto">
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+import { getLogoInfo,updateLogoInfo } from "@/api/system/publicConfig";
+import store from '@/store'
+export default {
+  name: "publicConfig",
+  data() {
+    return {
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/base/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      form:{
+        userType:[],
+        expandType:[]
+      },
+      rules: {
+
+        signMap: [
+          { required: true, message: "签到/离开示意图不能为空", trigger: "blur" }
+        ],
+        videoCover: [
+          { required: true, message: "视频封面不能为空", trigger: "blur" }
+        ],
+        operationGuide: [
+          { required: true, message: "操作指南不能为空", trigger: "blur" }
+        ],
+      },
+      imgUrl:"",
+      imgOpen:false,
+    };
+  },
+  created() {
+
+  },
+  mounted(){
+    this.getLogoInfo();
+  },
+  methods: {
+    /** 提交按钮 */
+    submitForm: function() {
+      let self = this;
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let obj = {
+
+            signMap:this.form.signMap,
+            videoCover:this.form.videoCover,
+            operationGuide:this.form.operationGuide,
+
+          }
+          updateLogoInfo(obj).then(response => {
+            this.msgSuccess(response.msg);
+            this.getLogoInfo();
+          });
+        }
+      });
+    },
+    //查看图片
+    lookImg(url){
+      this.imgUrl = url;
+      this.imgOpen = true;
+    },
+    //获取数据
+    getLogoInfo(){
+      getLogoInfo().then(response => {
+        localStorage.setItem('videoCover',response.data.videoCover)
+
+        this.$set(this,'form',response.data)
+      });
+    },
+    //上传
+    handleAvatarSuccess(res,type) {
+       if(type == 'signMap'){
+        this.$set(this.form,'signMap',res.data.url);
+      }else if(type == 'videoCover'){
+        this.$set(this.form,'videoCover',res.data.url);
+      }else if(type == 'operationGuide'){
+        this.$set(this.form,'operationGuide',res.data.url);
+      }
+      this.$forceUpdate()
+    },
+    beforeAvatarUpload(file) {
+      let type = false;
+      console.log('file',file);
+      if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif') {
+        type = true;
+      }else{
+        this.$message.error('只能上传png/jpeg/gif格式图片');
+        type = false;
+      }
+      return type;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.public-config-page{
+  /*底部按钮弹框*/
+  .sub_btn{
+    position: fixed;
+    right: 20px;
+    bottom: 0;
+    background: #fff;
+    height: 112px;
+    width:84%;
+    text-align: center;
+    .inquire-button-one{
+      cursor:pointer;
+      display: inline-block;
+      text-align: center;
+      width: 70px;
+      height: 40px;
+      border-radius: 6px;
+      border: 1px solid #0045af;
+      color:#ffffff;
+      background:#0045af;
+      margin:36px 10px 0 0;
+    }
+  }
+  *{
+    margin:0;
+  }
+  .title-box{
+    border-bottom:1px solid #dedede;
+    p{
+      margin-left:40px;
+      color:#0045af;
+      line-height:60px;
+    }
+  }
+  .form-max-box{
+    margin-top:20px;
+    margin-left: 100px;
+  }
+  .avatar-uploader-icon{
+    width: 200px;
+    height: 120px;
+    line-height: 120px;
+    font-size: 16px;
+    font-weight: 400;
+    color: #CCCCCC;
+  }
+  .avatar{
+    width: 200px;
+    height: 120px;
+  }
+}
+</style>
+

src/views/comprehensive/system/publicConfig/programConfig.vue

@@ -0,0 +1,194 @@
+<!--一体机配置-->
+<template>
+  <div class="app-container public-config-page">
+    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+      <div class="form-max-box">
+        <el-form-item label="登录页banner：" prop="loginBanner">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'loginBanner')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.loginBanner" :src="form.loginBanner" class="avatar" >
+            <i v-if="!form.loginBanner" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.loginBanner" class="el-icon-view" @click="lookImg(form.loginBanner)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+      <div class="form-max-box">
+        <el-form-item label="首页banner：" prop="homepageBanner">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'homepageBanner')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.homepageBanner" :src="form.homepageBanner" class="avatar" >
+            <i v-if="!form.homepageBanner" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.homepageBanner" class="el-icon-view" @click="lookImg(form.homepageBanner)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div class="sub_btn">
+      <p class="inquire-button-one"  @click="submitForm">保存</p>
+    </div>
+    <!--查看图片-->
+    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
+      <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
+        <img :src="imgUrl" style="display:block;max-width:1160px;margin:0 auto">
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getToken } from "@/utils/auth";
+import { getLogoInfo,updateLogoInfo } from "@/api/system/publicConfig";
+import store from '@/store'
+export default {
+  name: "publicConfig",
+  data() {
+    return {
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/base/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      form:{
+        userType:[],
+        expandType:[]
+      },
+      rules: {
+
+        loginBanner: [
+          { required: true, message: "登录页banner不能为空", trigger: "blur" }
+        ],
+        homepageBanner: [
+          { required: true, message: "首页banner不能为空", trigger: "blur" }
+        ],
+      },
+      imgUrl:"",
+      imgOpen:false,
+    };
+  },
+  created() {
+
+  },
+  mounted(){
+    this.getLogoInfo();
+  },
+  methods: {
+    /** 提交按钮 */
+    submitForm: function() {
+      let self = this;
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let obj = {
+            loginBanner:this.form.loginBanner,
+            homepageBanner:this.form.homepageBanner,
+          }
+
+          updateLogoInfo(obj).then(response => {
+            this.msgSuccess(response.msg);
+            this.getLogoInfo();
+          });
+        }
+      });
+    },
+    //查看图片
+    lookImg(url){
+      this.imgUrl = url;
+      this.imgOpen = true;
+    },
+    //获取数据
+    getLogoInfo(){
+      getLogoInfo().then(response => {
+        this.$set(this,'form',response.data)
+      });
+    },
+    //上传
+    handleAvatarSuccess(res,type) {
+      if(type == 'loginBanner'){
+        this.$set(this.form,'loginBanner',res.data.url);
+      }else if(type == 'homepageBanner'){
+        this.$set(this.form,'homepageBanner',res.data.url);
+      }
+      this.$forceUpdate()
+    },
+    beforeAvatarUpload(file) {
+      let type = false;
+      console.log('file',file);
+      if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif') {
+        type = true;
+      }else{
+        this.$message.error('只能上传png/jpeg/gif格式图片');
+        type = false;
+      }
+      return type;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.public-config-page{
+  /*底部按钮弹框*/
+  .sub_btn{
+    position: fixed;
+    right: 20px;
+    bottom: 0;
+    background: #fff;
+    height: 112px;
+    width:84%;
+    text-align: center;
+    .inquire-button-one{
+      cursor:pointer;
+      display: inline-block;
+      text-align: center;
+      width: 70px;
+      height: 40px;
+      border-radius: 6px;
+      border: 1px solid #0045af;
+      color:#ffffff;
+      background:#0045af;
+      margin:36px 10px 0 0;
+    }
+  }
+  *{
+    margin:0;
+  }
+  .title-box{
+    border-bottom:1px solid #dedede;
+    p{
+      margin-left:40px;
+      color:#0045af;
+      line-height:60px;
+    }
+  }
+  .form-max-box{
+    margin-top:20px;
+    margin-left: 100px;
+  }
+  .avatar-uploader-icon{
+    width: 200px;
+    height: 120px;
+    line-height: 120px;
+    font-size: 16px;
+    font-weight: 400;
+    color: #CCCCCC;
+  }
+  .avatar{
+    width: 200px;
+    height: 120px;
+  }
+}
+</style>
+

src/views/emergencyEvacuationBig.vue

@@ -298,9 +298,9 @@
       //MQTT订阅
       subscriptionMQTT(){
         let self = this;
-        this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-          username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-          password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+        this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+          username: localStorage.getItem('mqttUser'),
+          password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
           console.log("连接成功");
@@ -522,7 +522,7 @@
           deviceIds:list,
         };
         let urlText = window.location.href;
-        if(urlText.indexOf("192.168") != -1){
+        if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
           const { data } = await startUrl(obj);
           if(data){
             self.videoPageList = [];
@@ -544,7 +544,7 @@
           if(data){
             self.videoPageList = [];
             for(let i=0;i<data.length;i++){
-              let text = 'wss://lab.sxitdlc.com/jinandaxue/stream/';
+              let text = localStorage.getItem('cameraUrl');
               let url = data[i].result.body.data.ws_flv;
               url = url.split("rtp/");
               let newUrl = text+'rtp/'+url[1];

src/views/emergencyEvacuationBigOne.vue

@@ -300,9 +300,9 @@
       //MQTT订阅
       subscriptionMQTT(){
         let self = this;
-        this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-          username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-          password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+        this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+          username: localStorage.getItem('mqttUser'),
+          password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
           console.log("连接成功");
@@ -543,7 +543,7 @@
           deviceIds:list,
         };
         let urlText = window.location.href;
-        if(urlText.indexOf("192.168") != -1){
+        if(urlText.indexOf(localStorage.getItem('cameraIntranetAgent')) != -1){
           const { data } = await startUrl(obj);
           if(data){
             self.videoPageList = [];
@@ -565,7 +565,7 @@
           if(data){
             self.videoPageList = [];
             for(let i=0;i<data.length;i++){
-              let text = 'wss://lab.sxitdlc.com/wenchang/stream/';
+              let text = localStorage.getItem('cameraUrl');
               let url = data[i].result.body.data.ws_flv;
               url = url.split("rtp/");
               let newUrl = text+'rtp/'+url[1];

src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -437,9 +437,9 @@
       //MQTT订阅
       subscriptionMQTT(){
         let self = this;
-        this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-          username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-          password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+        this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+          username: localStorage.getItem('mqttUser'),
+          password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
           console.log("连接成功");

src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -403,9 +403,9 @@
       //MQTT订阅
       subscriptionMQTT(){
         let self = this;
-        this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-          username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-          password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+        this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+          username: localStorage.getItem('mqttUser'),
+          password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
           console.log("连接成功");

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

@@ -124,7 +124,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

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

@@ -123,7 +123,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     //返回
     backPage(){

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

@@ -120,7 +120,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/manage/qualificationApply/qualificationApplyDetail.vue

@@ -82,7 +82,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/manage/qualificationManage/qualificationManageCheck.vue

@@ -195,7 +195,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/manage/qualificationManage/qualificationManageDetail.vue

@@ -150,7 +150,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/manage/useGas/useGasDetail.vue

@@ -75,7 +75,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/manage/useGasManage/useGasManageCheck.vue

@@ -189,7 +189,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/manage/useGasManage/useGasManageDetail.vue

@@ -143,7 +143,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/student/qualificationApply/qualificationApplyDetail.vue

@@ -82,7 +82,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage3_0/student/useGas/useGasDetail.vue

@@ -75,7 +75,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage_syd/manage/infoRecord/abnormalRecordDetail.vue

@@ -130,7 +130,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage_syd/manage/infoRecord/enterRecordDetail.vue

@@ -80,7 +80,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     //返回
     backPage(){

src/views/gasManage_syd/manage/infoRecord/useRecordDetail.vue

@@ -120,7 +120,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage_syd/manage/useGasCheck/useGasCheckDetail.vue

@@ -93,7 +93,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     //审核
     usegasCheck(){

src/views/gasManage_syd/student/useGas/useGasDetail.vue

@@ -71,7 +71,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/gasManage_syd/student/useRecord/useRecordDetail.vue

@@ -120,7 +120,7 @@ export default {
     lookFile(item){
       let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
       console.log(visitUrl)
-      window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     /* 详情 */
     getInfo(id){

src/views/home.vue

@@ -263,19 +263,8 @@
           for(let i=0;i<self.routeData.length;i++){
             if(type == self.routeData[i].name){
               console.log("self.routeData[i].name",self.routeData[i].name)
-              if (localStorage.getItem('identityType') == 1){
-                window.open(process.env.VUE_APP_BIG_SCREEN_CAMPUS_BASE_API + '?identity=' + localStorage.getItem('identity'));
-                return
-              }else if(localStorage.getItem('identityType') == 2){
-                window.open(process.env.VUE_APP_BIG_SCREEN_FACULTY_BASE_API + '?identity=' + localStorage.getItem('identity'));
-                return
-              }else if(localStorage.getItem('identityType') == 0){
-                this.$alert('"'+title+'"没有分配具体权限，如有疑问，请联系管理员', {
-                  confirmButtonText: '确定',
-                  callback: action => {}
-                });
-                return
-              }
+              window.open(localStorage.getItem('screenUrl') + '?identity=' + localStorage.getItem('identity'));
+              return
             }
           }
           this.$alert('没有"'+title+'"系统权限，如有疑问，请联系管理员', {

src/views/login.vue

@@ -55,7 +55,7 @@ import { getCodeImg,initPage } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 import store from '@/store'
-import { getLogoInfo } from "@/api/system/publicConfig";
+import { getLogoInfo,getUrlConfig} from "@/api/system/publicConfig";
 
 export default {
   name: "Login",
@@ -134,6 +134,52 @@ export default {
         localStorage.setItem('rectangleLogo',response.data.rectangleLogo)
         localStorage.setItem('videoCover',response.data.videoCover)
       });
+      getUrlConfig().then(response => {
+        console.log('开发配置',response.data)
+        //判定http或者https
+        let urlText = window.location.href.split('://')[0]+'://';
+        if(urlText=='https://'){
+          //文件预览地址
+          localStorage.setItem('filePreviewUrl',urlText+response.data.fileExtranetUrl)
+
+          //摄像头代理访问地址
+          localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraExtranetAgent)
+          //摄像头地址ip段
+          localStorage.setItem('cameraIntranetAgent',response.data.cameraIntranetAgent)
+          //摄像头访问地址
+          localStorage.setItem('cameraUrl','wss://'+response.data.cameraExtranetUrl)
+          //MQTT地址
+          localStorage.setItem('mqttUrl',response.data.mqttExtranetUrl)
+          //MQTT账号
+          localStorage.setItem('mqttUser','wss://'+response.data.mqttExtranetUser)
+          //MQTT密码
+          localStorage.setItem('mqttPassword',response.data.mqttExtranetPassword)
+          //可视化大屏访问地址
+          localStorage.setItem('screenUrl',urlText+response.data.screenExtranetUrl)
+        }else if(urlText=='http://'){
+          //文件预览地址
+          localStorage.setItem('filePreviewUrl',urlText+response.data.fileIntranetUrl)
+          //摄像头代理访问地址
+          localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraExtranetAgent)
+          //摄像头地址ip段
+          localStorage.setItem('cameraIntranetAgent',response.data.cameraIntranetAgent)
+          //摄像头访问地址
+          localStorage.setItem('cameraUrl','wss://'+response.data.cameraIntranetUrl)
+          //MQTT地址
+          localStorage.setItem('mqttUrl','ws://'+response.data.mqttIntranetUrl)
+          //MQTT账号
+          localStorage.setItem('mqttUser',response.data.mqttIntranetUser)
+          //MQTT密码
+          localStorage.setItem('mqttPassword',response.data.mqttIntranetPassword)
+          //可视化大屏访问地址
+          localStorage.setItem('screenUrl',urlText+response.data.screenIntranetUrl)
+        }
+
+
+
+      });
+
+
     },
     getCode() {
       getCodeImg().then(res => {

src/views/secureAccess/approval/infoPage.vue

@@ -174,7 +174,7 @@ import {optionHazard} from "@/api/laboratory/hazard";
       lookFile(item){
         let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item.url;
         console.log(visitUrl)
-        window.open(window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+        window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
 
       },
       /** 导出按钮操作 */

src/views/secureAccess/approval_handle/addPage.vue

@@ -361,7 +361,7 @@
 
         var originUrl = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API+'/admin/'+item; //要预览文件的访问地址
 
-        window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(originUrl)));
+        window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(originUrl)));
       },
       /** 导师-懒加载 */
       selectUserListByName(query) {