Merge branch '3.3.5&3.3.6-qiPingDingWei' into dbdx-web

src/utils/request.js

@@ -53,11 +53,24 @@ service.interceptors.request.use(config => {
     url = url.slice(0, -1);
     config.params = {};
     config.url = url;
+    if (config.url.indexOf('..') != -1) {
+      loadingCount --;
+      messageData = Message({
+        message: '请求包含非法参数',
+        type: 'error',
+        offset:100
+      })
+      setTimeout(function(){
+        messageData = null
+      },1000);
+      return
+    }
   }
   // 弹层相关
   loadingCount ++;
   return config
 }, error => {
+  console.log('config2',config)
   // 弹层相关
     loadingCount --;
     if(loadingCount===0){
@@ -223,4 +236,14 @@ export function downloadUrl(fileUrl,fleName) {
   };
   x.send();
 }
+
+export function dataEncode(str) {
+  let s = "";
+  if (str === null || str === undefined || str === "") {
+    return "";
+  }
+  s = str.replace("..", "");
+  return s;
+}
+
 export default service

src/utils/ruoyi.js

@@ -374,13 +374,13 @@ export function CreateOneFormPage(code) {
   LODOP = getLodop()
   LODOP.PRINT_INIT('') //打印初始化
   LODOP.SET_PRINT_STYLE('Bold', 1) //设置对象风格
-  LODOP.ADD_PRINT_TEXT(90,35,300,200,code,) //(上边距,左边距,打印宽度,打印高度,打印文本内容)
+  LODOP.ADD_PRINT_TEXT(94,35,300,200,code,) //(上边距,左边距,打印宽度,打印高度,打印文本内容)
   LODOP.SET_PRINT_STYLEA(0,'FontSize', 8) //设置对象风格
   LODOP.SET_PRINT_PAGESIZE(1, 500, 300, '') //设定纸张大小
   LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%')//设置缩放
   LODOP.SET_PREVIEW_WINDOW(2, 2, 0, 0, 0, '')//设置窗口
   //LODOP.ADD_PRINT_HTM(2,80,160,160, document.getElementById("form1").innerHTML);//增加超文本项
-  LODOP.ADD_PRINT_BARCODE(8,53,100, 100,'QRCode',code);
+  LODOP.ADD_PRINT_BARCODE(4,53,100, 100,'QRCode',code);//二维码位置
   LODOP.PREVIEW() //打印预览
   // LODOP.PRINT() //直接打印
 }

src/views/comprehensive/message/warningNotice/infoPage.vue

@@ -109,7 +109,8 @@
           <div class='info-box'>
             <div>
               <p>气瓶规格：</p>
-              <p>{{infoData.specification}}</p>
+              <p v-for="(item,index) in gasBottleLevel"
+                 v-show="item.dictValue == infoData.specification">{{item.dictLabel}}</p>
             </div>
           </div>
         </div>
@@ -203,6 +204,7 @@
   import { laboratoryWarningNoticeLogUpdate} from '@/api/gasBottleManage/index'
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
   import lookVideoDialog from '@/components/lookVideoDialog/lookVideoDialog.vue'
+  import { gasManageConfigName } from '@/api/gasManage3_0/gasManageSYD'
   export default {
     name: 'infoPage',
     components: {
@@ -230,13 +232,17 @@
             { required: true, message: "请输入处理备注", trigger: "change" },
             { required: true, message: "请输入处理备注", validator: this.spaceJudgment, trigger: "change" },
           ],
-        }
+        },
+        gasBottleLevel:[],
       }
     },
     created(){
     },
     mounted(){
       this.getInfo();
+      this.getDicts("gasBottleLevel").then((response) => {
+        this.$set(this,'gasBottleLevel',response.data);
+      });
     },
     methods:{
       upDispose(){

src/views/hazardManagement/gasBottleManage/beaconList/index.vue

@@ -171,12 +171,12 @@
           if(this.needCLodop()){
             //打印
             if(this.dialogForm.beaconTag[0]){
-              let data = JSON.parse(JSON.stringify({code:this.dialogForm.beaconTag}))
-              let num = parseInt((20 - data.code.length)/2);
-              for(let i=0;i<num;i++){
-                data.code = ' '+data.code+' ';
-              }
-              this.CreateOneFormPage(data.code);
+              // let data = JSON.parse(JSON.stringify({code:this.dialogForm.beaconTag}))
+              // let num = parseInt((20 - data.code.length)/2);
+              // for(let i=0;i<num;i++){
+              //   data.code = ' '+data.code+' ';
+              // }
+              this.CreateOneFormPage(this.dialogForm.beaconTag);
               this.$set(this,'dialogType',false);
             }else{
               this.msgError('参数异常')
@@ -203,12 +203,12 @@
                 if(this.needCLodop()){
                   //打印
                   if(obj.beaconTag[0]){
-                    let data = JSON.parse(JSON.stringify({code:obj.beaconTag}))
-                    let num = parseInt((20 - data.code.length)/2);
-                    for(let i=0;i<num;i++){
-                      data.code = ' '+data.code+' ';
-                    }
-                    this.CreateOneFormPage(data.code);
+                    // let data = JSON.parse(JSON.stringify({code:obj.beaconTag}))
+                    // let num = parseInt((20 - data.code.length)/2);
+                    // for(let i=0;i<num;i++){
+                    //   data.code = ' '+data.code+' ';
+                    // }
+                    this.CreateOneFormPage(obj.beaconTag);
                     this.$set(this,'dialogType',false);
                   }else{
                     this.msgError('参数异常')

src/views/login.vue

@@ -135,11 +135,17 @@ export default {
         localStorage.setItem('videoCover',response.data.videoCover)
       });
       getUrlConfig().then(response => {
+        //判定ws或者wss
+        if(window.location.href.indexOf('https') != -1){
+          //MQTT地址
+          localStorage.setItem('mqttUrl','wss://'+Decrypt(response.data.mqttExtranetUrl))
+        }else{
+          //MQTT地址
+          localStorage.setItem('mqttUrl','ws://'+Decrypt(response.data.mqttIntranetUrl))
+        }
         //判定http或者https
         let urlText = window.location.href.split('://')[0]+'://';
-
         let outerNet=window.location.href.indexOf(Decrypt(response.data.ipIdentify)) == -1//true外网 false 内网
-
         if(outerNet){//外网
           //文件预览地址
           localStorage.setItem('filePreviewUrl',urlText+Decrypt(response.data.fileExtranetUrl))
@@ -149,8 +155,6 @@ export default {
           localStorage.setItem('ipIdentify',Decrypt(response.data.ipIdentify))
           //摄像头访问地址
           localStorage.setItem('cameraUrl','wss://'+Decrypt(response.data.cameraExtranetUrl))
-          //MQTT地址
-          localStorage.setItem('mqttUrl','wss://'+Decrypt(response.data.mqttExtranetUrl))
           //MQTT账号
           localStorage.setItem('mqttUser',Decrypt(response.data.mqttExtranetUser))
           //MQTT密码
@@ -166,8 +170,6 @@ export default {
           localStorage.setItem('ipIdentify',Decrypt(response.data.ipIdentify))
           //摄像头访问地址
           localStorage.setItem('cameraUrl','wss://'+Decrypt(response.data.cameraIntranetUrl))
-          //MQTT地址
-          localStorage.setItem('mqttUrl','ws://'+Decrypt(response.data.mqttIntranetUrl))
           //MQTT账号
           localStorage.setItem('mqttUser',Decrypt(response.data.mqttIntranetUser))
           //MQTT密码

vue.config.js

@@ -64,6 +64,13 @@ module.exports = {
     config.plugins.delete('preload') // TODO: need test
     config.plugins.delete('prefetch') // TODO: need test
 
+    // output: {
+    //   path: path.resolve(__dirname, './dist'),
+    //     filename: '[name].[chunkhash].js',
+    //     chunkFilename: 'chunks/[name].[chunkhash].js',
+    //     libraryTarget: 'umd'
+    // },
+
 
     // 图片转base64
     // const imagesRule = config.module.rule('images');
@@ -98,6 +105,9 @@ module.exports = {
     config
       .when(process.env.NODE_ENV !== 'development',
         config => {
+          //修改打包切片输出名称
+          config.output.filename('static/js/[name][chunkhash:8].js');
+          config.output.chunkFilename('static/js/[name]-[chunkhash:8].js');
           config
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')