Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

 module.exports = {
 module.exports = {
     base: '/monitor/',
     base: '/monitor/',
-    title: 'A-View-5',
+    title: 'A-view智能综合监控平台',
     description: '当前版本：V5.2.0',
     description: '当前版本：V5.2.0',
     dest: 'dist',
     dest: 'dist',
     lastUpdated: 'Last Updated',
     lastUpdated: 'Last Updated',
@@ -12,13 +12,24 @@ module.exports = {
         nav: [
         nav: [
             {text: '首页', link: '/'},
             {text: '首页', link: '/'},
             {text: '5.2.0', link: '/version520/'},
             {text: '5.2.0', link: '/version520/'},
-            {text: '设计器', link: 'http://192.168.0.75:6677/#/login'},
+            {text: '设计器', link: 'http://192.168.0.75:8087/#/login'},
             {text: '报表设计', link: 'http://192.168.0.75:8086/'}
             {text: '报表设计', link: 'http://192.168.0.75:8086/'}
         ],
         ],
         sidebar: {
         sidebar: {
+            '/version/': [
+                {
+                    title: '监控历史版本',
+                    collapsable: false,
+                    children: [
+                        {title: '山西版本', path: '/version/version300'},
+                        {title: '浙江和天津版本', path: '/version/version320'},
+                        {title: '最新版本', path: '/version520/'},
+                    ]
+                }
+            ],
             '/version520/': [
             '/version520/': [
                 {
                 {
-                    title: '版本5.2.2=0',
+                    title: '版本5.2.0',
                     collapsable: false,
                     collapsable: false,
                     children: [
                     children: [
                         {title: '版本说明', path: '/version520/'},
                         {title: '版本说明', path: '/version520/'},

 ---
 ---
 home: true
 home: true
 heroImage: /logo.png
 heroImage: /logo.png
-actionText: 开启5.0 →
-actionLink: /version520/
+actionText: 监控文档 →
+actionLink: /version/
 footer:  Copyright © 2022 鸿果科技 Report All Rights Reserved
 footer:  Copyright © 2022 鸿果科技 Report All Rights Reserved
 ---
 ---
 
 
@@ -12,7 +12,7 @@ footer:  Copyright © 2022 鸿果科技 Report All Rights Reserved
 <div class="features">
 <div class="features">
   <div class="feature">
   <div class="feature">
     <h2>技术先进</h2>
     <h2>技术先进</h2>
-    <p>使用最流行的技术SpringBoot、Vue、LayUI、Element。</p>
+    <p>使用最流行的技术SpringBoot、Vue3、LayUI、Element plus、JQuery、CSS3。</p>
   </div>
   </div>
   <div class="feature">
   <div class="feature">
     <h2>设计器</h2>
     <h2>设计器</h2>

+::: tip 监控版本
+代码分支：5.2.0 （陆续开放中，2022-06-22完成）<br/>
+版本相关包：svn://192.168.0.70/版本管理/2.version/aview.5.2.0（陆续开放中，2022-06-22完成）
+:::
+
+| 序号  | 功能      |         详情         |
+|-----|---------|:------------------:|
+| 1   | 监控系统稳定性 | 5.2.0版本累计修复BUG300+ |
+| 2   | 各个现场支撑  |        29次         |
+| 3   | 功能点开发   |        10个         |
+
+
+
+::: tip 首页明确统计规则展示
+在右上角展示统计规则
+:::
+![img](../picture/520/README/1.png) <br>
+
+::: warning
+这是一个警告
+:::
+
+::: danger
+这是一个危险警告
+:::
+
+::: details
+这是一个详情块，在 IE / Edge 中不生效
+:::
+
+
+
+::: danger STOP
+危险区域，禁止通行
+:::
+
+::: details 点击查看代码
+```js
+console.log('你好，VuePress！')
+```
+:::
+
+
+
+``` js
+export default {
+  name: 'MyComponent',
+  // ...
+}
+```
+
+
+
+``` html
+<ul>
+  <li
+    v-for="todo in todos"
+    :key="todo.id"
+  >
+    {{ todo.text }}
+  </li>
+</ul>
+```
+
+
+``` js{1,4,6-7}
+export default { // Highlighted
+  data () {
+    return {
+      msg: `Highlighted!
+      This line isn't highlighted,
+      but this and the next 2 are.`,
+      motd: 'VuePress is awesome',
+      lorem: 'ipsum',
+    }
+  }
+}
+```
+
+
+
+ 
+
+
+

+::: danger
+这是一个危险警告
+:::

+::: danger
+这是一个危险警告
+:::

@@ -225,7 +225,14 @@
             if (o.removeClass(s), layui.each(c, function (t, l) {
             if (o.removeClass(s), layui.each(c, function (t, l) {
                 var c, f = "", v = "function" == typeof a[l];
                 var c, f = "", v = "function" == typeof a[l];
                 if (a[l]) {
                 if (a[l]) {
-                    var c = v ? f = a[l](d, r) : !a[l][0].test(d);
+                    // 资源，选择资源协议报错
+                   let regTest = function (itemVal){
+                       if(a[l][0] == ''){
+                           return false;
+                       }
+                       return !a[l][0].test(itemVal);
+                   }
+                    var c = v ? f = a[l](d, r) : regTest(d);
                     if (f = f || a[l][1], "required" === l && (f = o.attr("lay-reqText") || f), c) return "tips" === u ? i.tips(f, function () {
                     if (f = f || a[l][1], "required" === l && (f = o.attr("lay-reqText") || f), c) return "tips" === u ? i.tips(f, function () {
                         return "string" == typeof o.attr("lay-ignore") || "select" !== r.tagName.toLowerCase() && !/^checkbox|radio$/.test(r.type) ? o : o.next()
                         return "string" == typeof o.attr("lay-ignore") || "select" !== r.tagName.toLowerCase() && !/^checkbox|radio$/.test(r.type) ? o : o.next()
                     }(), {tips: 1}) : "alert" === u ? i.alert(f, {title: "提示", shadeClose: !0}) : i.msg(f, {
                     }(), {tips: 1}) : "alert" === u ? i.alert(f, {title: "提示", shadeClose: !0}) : i.msg(f, {
@@ -270,4 +277,4 @@
             f.render(null, e)
             f.render(null, e)
         }, 50)
         }, 50)
     }), v.on("submit", r, d).on("click", "*[lay-submit]", d), e(l, f)
     }), v.on("submit", r, d).on("click", "*[lay-submit]", d), e(l, f)
-});
+});

@@ -83,7 +83,7 @@
                 label-width="120px">
                 label-width="120px">
 
 
             <el-form-item label="编号" prop="id">
             <el-form-item label="编号" prop="id">
-                <el-input :size="$global.elementConfig.size.input" v-model="ajConfigFrom.id" clearable></el-input>
+                <el-input :size="$global.elementConfig.size.input" v-model="ajConfigFrom.id"  :disabled="disabled" clearable ></el-input>
             </el-form-item>
             </el-form-item>
 
 
 
 

@@ -214,6 +214,7 @@ export default {
             page: 1,
             page: 1,
             limit: 10,
             limit: 10,
         });
         });
+        let disabled = Vue.ref(false);
         //按钮下拉框
         //按钮下拉框
         let typeOptions = Vue.ref([
         let typeOptions = Vue.ref([
             {
             {
@@ -245,6 +246,7 @@ export default {
         });
         });
         //新增弹框
         //新增弹框
         const addAj = () => {
         const addAj = () => {
+            disabled.value = false;
             clearForm();
             clearForm();
             cacheVisible.value = true;
             cacheVisible.value = true;
             pageList();
             pageList();
@@ -325,6 +327,7 @@ export default {
             addOrUpdate.value = true;
             addOrUpdate.value = true;
             ajConfigFrom.value = row;
             ajConfigFrom.value = row;
             cacheVisible.value = true;
             cacheVisible.value = true;
+            disabled.value = true;
             pageList();
             pageList();
             menuList();
             menuList();
         }
         }
@@ -490,7 +493,8 @@ export default {
             search,
             search,
             butColumns,
             butColumns,
             detailColumns,
             detailColumns,
-            couponSelected
+            couponSelected,
+            disabled
         }
         }
     }
     }