合并分支 'fix_foton_20230613' 到 'master'

Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-laws-system-front!97

public/index.html

@@ -5,9 +5,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="pragram" content="no-cache">
-    <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="expires" content="0">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+    <meta http-equiv="Expires" content="0">
     <title>标准法规管理系统</title>
     <script src="static/polyfill/proxy.min.js"></script>
     <style>

src/pages/processCenter/pages/creatProcess/qbrk/step12.vue

@@ -2263,6 +2263,7 @@
                 }
                 this.modalShowFlag1 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCancel(){
                 this.modalShowFlag1  = false
@@ -2282,6 +2283,7 @@
                 }
                 this.modalShowFlag2 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
@@ -2301,6 +2303,7 @@
                 }
                 this.modalShowFlag3 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -2383,19 +2383,6 @@
                 }
               this.formKey++
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2414,6 +2401,7 @@
                 }
                 this.modalShowFlag1 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCancel(){
                 this.modalShowFlag1  = false
@@ -2433,6 +2421,7 @@
                 }
                 this.modalShowFlag2 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
@@ -2452,6 +2441,7 @@
                 }
                 this.modalShowFlag3 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false

src/pages/processCenter/pages/creatProcess/qbrk/step3.vue

@@ -2274,19 +2274,6 @@
                 }
                 this.formKey++
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2305,6 +2292,7 @@
                 }
                 this.modalShowFlag1 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCancel(){
                 this.modalShowFlag1  = false
@@ -2324,6 +2312,7 @@
                 }
                 this.modalShowFlag2 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
@@ -2343,6 +2332,7 @@
                 }
                 this.modalShowFlag3 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false

src/pages/processCenter/pages/creatProcess/qbrk/step6.vue

@@ -2638,6 +2638,7 @@
                 }
                 this.modalShowFlag1 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCancel(){
                 this.modalShowFlag1  = false
@@ -2657,6 +2658,7 @@
                 }
                 this.modalShowFlag2 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
@@ -2676,6 +2678,7 @@
                 }
                 this.modalShowFlag3 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false

src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue

@@ -2261,19 +2261,6 @@
                 }
                 this.formKey++
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2292,6 +2279,7 @@
                 }
                 this.modalShowFlag1 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCancel(){
                 this.modalShowFlag1  = false
@@ -2311,6 +2299,7 @@
                 }
                 this.modalShowFlag2 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
@@ -2330,6 +2319,7 @@
                 }
                 this.modalShowFlag3 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false

src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue

@@ -2640,6 +2640,7 @@
                 }
                 this.modalShowFlag1 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCancel(){
                 this.modalShowFlag1  = false
@@ -2659,6 +2660,7 @@
                 }
                 this.modalShowFlag2 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
@@ -2678,6 +2680,7 @@
                 }
                 this.modalShowFlag3 = false
                 this.$forceUpdate()
+                this.formKey++
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false

src/router/index.js

@@ -4466,7 +4466,7 @@ Router.prototype.push = function push (location) {
 
 const router = new Router({
   routes,
-  mode: 'hash', // default: hash ,history
+  mode: 'history', // default: hash ,history
   scrollBehavior (to, from, savedPosition) {
     if (savedPosition) {
       return savedPosition

vue.config.js

@@ -53,11 +53,11 @@ module.exports = {
       .set('process', resolve('./src/pages/processCenter/pages'))
     if (process.env.NODE_ENV === 'production') {
       // 给js和css配置版本号
-      config.output.filename('js/[name].' + Timestamp + '.js').end();
+      config.output.filename('js/[name].' + Timestamp + '.js?v=' + Timestamp).end();
-      config.output.chunkFilename('js/[name].' + Timestamp + '.js').end();
+      config.output.chunkFilename('js/[name].' + Timestamp + '.js?v=' + Timestamp).end();
       config.plugin('extract-css').tap(args => [{
-        filename: `css/[name].${Timestamp}.css`,
+        filename: `css/[name].${Timestamp}.css?v=` + Timestamp,
-        chunkFilename: `css/[name].${Timestamp}.css`
+        chunkFilename: `css/[name].${Timestamp}.css?v=` + Timestamp
       }])
 
       config.optimization