kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

Browse Source
This commit is contained in:
yanran200730
2023-04-25 14:32:57 +08:00
parent aca3b38dab 9c37fa0414
commit 0f752889fd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/AiDvRender.vue
View File

@@ -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
},

3
ui/lib/js/regular.js
View File

@@ -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])$/
}