From 181a4018bef808069a2d241805ae74c80fa008ee Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 25 Apr 2023 13:50:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 157487fd..84a79866 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -61,17 +61,16 @@
 </template>
 
 <script>
+import {scrollBoard} from '@jiaminghi/data-view'
 import Vue from "vue"
 import {mapState} from 'vuex'
-import AiSwiper from './AiSwiper.vue'
+import AiDvMap from "./AiDvMap";
 import chartList from './AiEchart/echartTpls'
 import AiMonitor from "./AiMonitor/AiMonitor";
-import AiDvMap from "./AiDvMap";
-import AiDvPanel from "./layout/AiDvPanel/AiDvPanel";
+import AiSwiper from './AiSwiper.vue'
 import AiDvDisplay from "./layout/AiDvDisplay/AiDvDisplay";
+import AiDvPanel from "./layout/AiDvPanel/AiDvPanel";
 import AiDvSummary from "./layout/AiDvSummary/AiDvSummary";
-import AiSprite from "./AiSprite";
-import {scrollBoard} from '@jiaminghi/data-view'
 
 Vue.use(scrollBoard)
 
@@ -103,9 +102,9 @@ export default {
       if (!this.data) {
         return []
       }
-      return this.data.type === 'map' ? this.data[this.data.dataType].map(e => {
+      return this.data.type === 'map' ? this.data[this.data.dataType]?.map(e => {
         return {lng: e['经度'], lat: e['纬度'], label: e['地区名称'], ...e}
-      }) : this.data[this.data.dataType]
+      }) || [] : this.data[this.data.dataType]
     },
     currentType: v => v.data.type
   },

From 9c37fa04143c120be14e64d2ed8d0aa09f3dc8f4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 25 Apr 2023 14:05:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=AD=A3=E5=88=99=E5=BC=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/lib/js/regular.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/lib/js/regular.js b/ui/lib/js/regular.js
index b85a6935..5e919d00 100644
--- a/ui/lib/js/regular.js
+++ b/ui/lib/js/regular.js
@@ -11,5 +11,6 @@ export default {
   },
   zh: /^[\u4e00-\u9fa5]+$/,
   email: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
-  ip: /((?:(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d))/
+  ip: /((?:(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d))/,
+  idNumber: /^[1-9]\d{5}(19\d{2}|20[0-2]\d)(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9xX])$/
 }