Merge remote-tracking branch 'origin/develop' into develop

2022-06-27 13:07:05 +08:00
parent c99f19bd04 7757d1db53
commit 7492c47462
10 changed files with 80 additions and 8 deletions
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="cloud-login">
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -9,15 +9,65 @@
    <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
    <meta http-equiv="expires" content="0">
    <title>标准法规管理系统</title>
-    <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
-<!--     vconsole调试工具-->
+    <style>
+      .logo {
+        position: absolute;
+        top: 5.8vh;
+        left: 9vw;
+        width: 160px;
+        height: 61px;background: url("static/images/logo2.png") no-repeat center;
+        background-position: center left;
+        background-size: 100% 100%;
+      }
+      .cloud-login{
+        position: relative;
+        width: 100%;
+        height: 100%;
+        background: url("static/images/BG.png");
+        background-size: 100% 100%;  //
+        background-repeat: no-repeat;  //
+        background-attachment: fixed;
+      }
+      #headerId {margin:0;}
+      .p1Class {color: #fff;font-size: 25px;}
+      .inner-header {height:65vh;width:100%;margin:0;padding:0;}
+      .flex {display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;}
+    </style>
+    <script src="static/polyfill/proxy.min.js"></script>
+    <!--     vconsole调试工具-->
 <!--    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->
 <!--    <script type="text/javascript">-->
 <!--      var vConsole = new VConsole();-->
 <!--    </script>-->
+    <script type="text/javascript">
+      (function(window) {
+        var theUA = window.navigator.userAgent.toLowerCase();
+        if (
+                // theUA.indexOf('trident') > -1 && theUA.indexOf('rv:11.0') > -1
+                (theUA.indexOf("compatible") > -1 && theUA.indexOf("msie") > -1) || (theUA.indexOf('trident') > -1 && theUA.indexOf('rv:11.0') > -1)
+        ) {
+          var str2 = "<div id=\"headerId\" class=\"header\">\n" +
+                  "        <div class=\"logo\"></div>\n" +
+                  "\n" +
+                  "        <div class=\"inner-header flex\">\n" +
+                  "            <p class=\"p1Class\">检测到您使用的是IE浏览器,建议您更换为谷歌浏览器或火狐浏览器</p>\n" +
+                  "<!--            <a id=\"UrlId\" href=\"\">无需等待，点击进入</a>-->\n" +
+                  "        </div>\n" +
+                  "    </div>";
+          document.writeln(str2);
+          console.log("浏览器不合格")
+          document.execCommand("Stop");
+        }
+        else{
+          console.log("浏览器合格")
+        }
+      })(window);
+    </script>
  </head>
  <body class="el-drawer-body">
    <div id="app"></div>
    <!-- built files will be auto injected -->
  </body>
+
+
 </html>
@@ -0,0 +1,4 @@
+(function(){function l(){function n(a){return a?"object"===typeof a||"function"===typeof a:!1}var p=null;var g=function(a,b){function f(){}if(!n(a)||!n(b))throw new TypeError("Cannot create proxy with a non-object as target or handler");p=function(){f=function(a){throw new TypeError("Cannot perform '"+a+"' on a proxy that has been revoked");}};var e=b;b={get:null,set:null,apply:null,construct:null};for(var k in e){if(!(k in b))throw new TypeError("Proxy polyfill does not support trap '"+k+"'");b[k]=e[k]}"function"===
+typeof e&&(b.apply=e.apply.bind(e));var c=this,g=!1,q=!1;"function"===typeof a?(c=function(){var h=this&&this.constructor===c,d=Array.prototype.slice.call(arguments);f(h?"construct":"apply");return h&&b.construct?b.construct.call(this,a,d):!h&&b.apply?b.apply(a,this,d):h?(d.unshift(a),new (a.bind.apply(a,d))):a.apply(this,d)},g=!0):a instanceof Array&&(c=[],q=!0);var r=b.get?function(a){f("get");return b.get(this,a,c)}:function(a){f("get");return this[a]},v=b.set?function(a,d){f("set");b.set(this,
+a,d,c)}:function(a,b){f("set");this[a]=b},t={};Object.getOwnPropertyNames(a).forEach(function(b){if(!((g||q)&&b in c)){var d={enumerable:!!Object.getOwnPropertyDescriptor(a,b).enumerable,get:r.bind(a,b),set:v.bind(a,b)};Object.defineProperty(c,b,d);t[b]=!0}});e=!0;Object.setPrototypeOf?Object.setPrototypeOf(c,Object.getPrototypeOf(a)):c.__proto__?c.__proto__=a.__proto__:e=!1;if(b.get||!e)for(var m in a)t[m]||Object.defineProperty(c,m,{get:r.bind(a,m)});Object.seal(a);Object.seal(c);return c};g.revocable=
+function(a,b){return{proxy:new g(a,b),revoke:p}};return g};var u="undefined"!==typeof process&&"[object process]"==={}.toString.call(process)||"undefined"!==typeof navigator&&"ReactNative"===navigator.product?global:self;u.Proxy||(u.Proxy=l(),u.Proxy.revocable=u.Proxy.revocable);})()
@@ -2076,6 +2076,9 @@
                              this.form.modelDataNameVerify=[]
                              this.form.modelDataZrUserVerify=[]
                              this.form.QCDWID= ''
+                              this.form.menuId = this.form['TXLBBUSSMenuId']
+                                console.log(this.form)
+                                console.log(this.form.menuId)
                              this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
                              this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
                              this.form['id'] = bringData.id
@@ -2209,6 +2209,7 @@
                        this.form.treeType = 'sarMs'
                    }
                }
+                this.formKey++
                this.modalShowFlag1 = false
                this.$forceUpdate()
            },
@@ -2411,7 +2412,7 @@
                    this.rules.commentText[0].required = true;
                }
            },
-            async saveConfStand(standId) {
+            saveConfStand(standId) {
                if(this.form.menuId && this.form.menuId !== ''){
                    let search = {}
                    let list = []
@@ -2425,6 +2426,9 @@
                            _this: this
                        }, res => {
                            const history = res;
+                            this.$message.success("入库成功")
+                            this.submitLoading = false
+                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                            resolve(history)
                        })
                    })
@@ -2455,6 +2459,8 @@
                                    this.form.reviseStatus = 'buss2_'+this.form.standStatus
                                    this.form.textStatusBuss = '6jnqba2mby'
                                    const json = JSON.stringify(this.form);
+                                    this.processCreateBuss(json)
+return
                                    this.$http.post('lawss/activiti/completeTask', {
                                        taskIds: this.taskIds,
                                        userId : this.userId,
@@ -2493,11 +2499,8 @@
                _formData.append('infoJson', json)
                processCreateBuss(_formData).then(res => {
                    if (res.result === '操作成功' || res.ok) {
-                        this.$message.success("入库成功")
                        // 自动匹配配置标准
                        this.saveConfStand(res.data)
-                        this.submitLoading = false
-                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                    } else {
                        this.$message.warning(res.message)
                        this.isSubmit = false
@@ -36,7 +36,8 @@
                    @formSelectLawsCancel = "formSelectLawsCancel"
                    @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                    @formChoiceQCDW = "formChoiceQCDW"
-            />
+                    @formChoiceZRR1 = "formChoiceZRR1"
+                />
                <ProcessTitle>
                    <template slot="title">文件汇总</template>
                </ProcessTitle>
@@ -1210,6 +1211,9 @@
                this.drawerTitle = title
                this.modalShowFlagZRBM = true
            },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
            formChoiceQCDW(type, title, id){
                this.choiceQCDW(type, title, id)
            },
@@ -2246,6 +2250,7 @@
                        this.form.treeType = 'sarMs'
                    }
                }
+                this.formKey++
                this.modalShowFlag1 = false
                this.$forceUpdate()
            },
@@ -2348,6 +2348,7 @@
                        this.form.treeType = 'sarMs'
                    }
                }
+                this.formKey++
                this.modalShowFlag1 = false
                this.$forceUpdate()
            },
@@ -36,6 +36,7 @@
                        @formSelectLawsCancel = "formSelectLawsCancel"
                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                        @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
                />
                <ProcessTitle>
                    <template slot="title">文件汇总</template>
@@ -1211,6 +1212,9 @@
                this.drawerTitle = title
                this.modalShowFlagZRBM = true
            },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
            formChoiceQCDW(type, title, id){
                this.choiceQCDW(type, title, id)
            },
@@ -2247,6 +2251,7 @@
                        this.form.treeType = 'sarMs'
                    }
                }
+                this.formKey++
                this.modalShowFlag1 = false
                this.$forceUpdate()
            },
@@ -2359,6 +2359,7 @@
                        this.form.treeType = 'sarMs'
                    }
                }
+                this.formKey++
                this.modalShowFlag1 = false
                this.$forceUpdate()
            },