From 6658bd4b23ce993a730a0e7f67319d1eaf756e89 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 17 Jul 2023 15:00:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=A8=A1=E5=9D=97-?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step12.vue           |  3 +++
 .../pages/creatProcess/qbrk/step13.vue           | 16 +++-------------
 .../pages/creatProcess/qbrk/step3.vue            | 16 +++-------------
 .../pages/creatProcess/qbrk/step6.vue            |  3 +++
 .../pages/creatProcess/qbrk/stepC3.vue           | 16 +++-------------
 .../pages/creatProcess/qbrk/stepC6.vue           |  3 +++
 6 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index cecff2a4e..57bae1ac4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index e2bbe7815..c219a7edb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 86c2691ee..d912e2c7a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 8d294bac4..b717f8392 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 268484d22..4f6470386 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 8f3ac26a5..5abb3e556 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/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

From f6d4da469acd6ce5db192a5c56fa4ff0a04bb35c Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 17 Jul 2023 15:01:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 7 ++++---
 vue.config.js     | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/index.html b/public/index.html
index a19d5b82d..0463b10c7 100644
--- a/public/index.html
+++ b/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="Cache-Control" content="no-cache, must-revalidate">
-    <meta http-equiv="expires" content="0">
+    <meta http-equiv="pragram" content="no-cache">
+    <meta http-equiv="Pragma" content="no-cache" />
+    <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>
diff --git a/vue.config.js b/vue.config.js
index d5c7bc7bd..490e0c371 100644
--- a/vue.config.js
+++ b/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.chunkFilename('js/[name].' + Timestamp + '.js').end();
+      config.output.filename('js/[name].' + Timestamp + '.js?v=' + Timestamp).end();
+      config.output.chunkFilename('js/[name].' + Timestamp + '.js?v=' + Timestamp).end();
       config.plugin('extract-css').tap(args => [{
-        filename: `css/[name].${Timestamp}.css`,
-        chunkFilename: `css/[name].${Timestamp}.css`
+        filename: `css/[name].${Timestamp}.css?v=` + Timestamp,
+        chunkFilename: `css/[name].${Timestamp}.css?v=` + Timestamp
       }])
 
       config.optimization

From f6298829272e9f5aa90323bbd422005313e55252 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 17 Jul 2023 17:41:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=94=B9=E4=B8=BAhistory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 7299ca608..863051a93 100644
--- a/src/router/index.js
+++ b/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