diff --git a/src/views/Main/InspectionCard/index.vue b/src/views/Main/InspectionCard/index.vue index d90376c..6696506 100644 --- a/src/views/Main/InspectionCard/index.vue +++ b/src/views/Main/InspectionCard/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/Main/MonitoringCard/index.vue b/src/views/Main/MonitoringCard/index.vue index 3f1bbcb..f31c6ae 100644 --- a/src/views/Main/MonitoringCard/index.vue +++ b/src/views/Main/MonitoringCard/index.vue @@ -7,7 +7,9 @@
测报设施建设
-
{{ chartData.cz + chartData.cd + chartData.yx || 0 }}
+
+ {{ chartData.cz + chartData.cd + chartData.yx || 0 }} +
@@ -30,29 +32,29 @@ @@ -138,7 +147,7 @@ onMounted(() => { line-height: 40px; letter-spacing: 0em; - font-variation-settings: 'opsz' auto; + font-variation-settings: "opsz" auto; color: #36b29e; } } diff --git a/src/views/Main/ProjectCountCard/index.vue b/src/views/Main/ProjectCountCard/index.vue index b9556dc..a657d3c 100644 --- a/src/views/Main/ProjectCountCard/index.vue +++ b/src/views/Main/ProjectCountCard/index.vue @@ -6,14 +6,14 @@ diff --git a/src/views/Main/SafetyAppraise/index.vue b/src/views/Main/SafetyAppraise/index.vue index f693b3b..9fa8c69 100644 --- a/src/views/Main/SafetyAppraise/index.vue +++ b/src/views/Main/SafetyAppraise/index.vue @@ -9,15 +9,15 @@
{{ item?.name || '' }}
-->
-
{{ safetyData.rws || 0 }}
+
{{ safety.rws || 0 }}
任务数
-
{{ safetyData.djd || 0 }}
+
{{ safety.djd || 0 }}
待鉴定
-
{{ safetyData.yjd || 0 }}
+
{{ safety.yjd || 0 }}
已鉴定
@@ -41,7 +41,7 @@ @@ -105,7 +119,7 @@ onMounted(() => { .appraise-item { width: 104px; height: 119px; - background: url('@/assets/card/safety-item-bg.png') no-repeat; + background: url("@/assets/card/safety-item-bg.png") no-repeat; display: flex; flex-direction: column; align-items: center; @@ -119,8 +133,8 @@ onMounted(() => { text-align: center; letter-spacing: 0em; - font-variation-settings: 'opsz' auto; - font-feature-settings: 'kern' on; + font-variation-settings: "opsz" auto; + font-feature-settings: "kern" on; color: #ffffff; } .count { diff --git a/src/views/RegionSelect/data.json b/src/views/RegionSelect/data.json new file mode 100644 index 0000000..5661fd7 --- /dev/null +++ b/src/views/RegionSelect/data.json @@ -0,0 +1,229 @@ +[ + { + "bbox": [112.96024, 22.515129, 114.05999, 23.933001], + "name": "广州", + "center": [113.280637, 23.125178], + "centroid": [113.544372, 23.329249], + "childrenNum": 11, + "level": "city", + "code": 440100, + "filename": "440000/440100", + "fullname": "广州市" + }, + { + "bbox": [112.851798, 23.887925, 114.749345, 25.516771], + "name": "韶关", + "center": [113.591544, 24.801322], + "centroid": [113.779323, 24.81941], + "childrenNum": 10, + "level": "city", + "code": 440200, + "filename": "440000/440200", + "fullname": "韶关市" + }, + { + "bbox": [113.751447, 22.396362, 114.627798, 22.858504], + "name": "深圳", + "center": [114.085947, 22.547], + "centroid": [114.143142, 22.643377], + "childrenNum": 9, + "level": "city", + "code": 440300, + "filename": "440000/440300", + "fullname": "深圳市" + }, + { + "bbox": [113.087152, 21.831707, 114.323623, 22.442955], + "name": "珠海", + "center": [113.553986, 22.224979], + "centroid": [113.337286, 22.160135], + "childrenNum": 3, + "level": "city", + "code": 440400, + "filename": "440000/440400", + "fullname": "珠海市" + }, + { + "bbox": [116.244545, 23.039807, 117.154769, 23.645793], + "name": "汕头", + "center": [116.708463, 23.37102], + "centroid": [116.575361, 23.322231], + "childrenNum": 7, + "level": "city", + "code": 440500, + "filename": "440000/440500", + "fullname": "汕头市" + }, + { + "bbox": [112.392509, 22.642248, 113.393396, 23.57343], + "name": "佛山", + "center": [113.122717, 23.028762], + "centroid": [112.949778, 23.004314], + "childrenNum": 5, + "level": "city", + "code": 440600, + "filename": "440000/440600", + "fullname": "佛山市" + }, + { + "bbox": [112.004262, 21.564101, 113.262652, 22.856274], + "name": "江门", + "center": [113.094942, 22.590431], + "centroid": [112.676451, 22.284348], + "childrenNum": 7, + "level": "city", + "code": 440700, + "filename": "440000/440700", + "fullname": "江门市" + }, + { + "bbox": [109.654937, 20.211718, 110.977012, 21.955387], + "name": "湛江", + "center": [110.364977, 21.274898], + "centroid": [110.109828, 21.047893], + "childrenNum": 9, + "level": "city", + "code": 440800, + "filename": "440000/440800", + "fullname": "湛江市" + }, + { + "bbox": [110.326052, 21.37101, 111.683381, 22.704328], + "name": "茂名", + "center": [110.919229, 21.659751], + "centroid": [110.958736, 22.008884], + "childrenNum": 5, + "level": "city", + "code": 440900, + "filename": "440000/440900", + "fullname": "茂名市" + }, + { + "bbox": [111.361963, 22.76978, 112.883296, 24.388666], + "name": "肇庆", + "center": [112.472529, 23.051546], + "centroid": [112.210411, 23.536359], + "childrenNum": 8, + "level": "city", + "code": 441200, + "filename": "440000/441200", + "fullname": "肇庆市" + }, + { + "bbox": [113.816742, 22.428739, 115.425289, 23.960218], + "name": "惠州", + "center": [114.412599, 23.079404], + "centroid": [114.507032, 23.234461], + "childrenNum": 5, + "level": "city", + "code": 441300, + "filename": "440000/441300", + "fullname": "惠州市" + }, + { + "bbox": [115.317153, 23.373658, 116.939418, 24.937115], + "name": "梅州", + "center": [116.117582, 24.299112], + "centroid": [116.084478, 24.201791], + "childrenNum": 8, + "level": "city", + "code": 441400, + "filename": "440000/441400", + "fullname": "梅州市" + }, + { + "bbox": [114.917794, 20.582636, 116.933747, 23.471865], + "name": "汕尾", + "center": [115.364238, 22.774485], + "centroid": [115.53778, 23.004558], + "childrenNum": 4, + "level": "city", + "code": 441500, + "filename": "440000/441500", + "fullname": "汕尾市" + }, + { + "bbox": [114.242004, 23.165271, 115.593048, 24.792869], + "name": "河源", + "center": [114.697802, 23.746266], + "centroid": [114.962729, 24.043541], + "childrenNum": 6, + "level": "city", + "code": 441600, + "filename": "440000/441600", + "fullname": "河源市" + }, + { + "bbox": [111.283333, 21.50023, 112.370054, 22.68897], + "name": "阳江", + "center": [111.975107, 21.859222], + "centroid": [111.779569, 22.02617], + "childrenNum": 4, + "level": "city", + "code": 441700, + "filename": "440000/441700", + "fullname": "阳江市" + }, + { + "bbox": [111.927472, 23.447558, 113.930319, 25.191693], + "name": "清远", + "center": [113.051227, 23.685022], + "centroid": [112.879397, 24.313361], + "childrenNum": 8, + "level": "city", + "code": 441800, + "filename": "440000/441800", + "fullname": "清远市" + }, + { + "bbox": [113.522913, 22.654368, 114.26032, 23.141331], + "name": "东莞", + "center": [113.746262, 23.046237], + "centroid": [113.879966, 22.931879], + "level": "city", + "code": 441900, + "fullname": "东莞市" + }, + { + "bbox": [113.157045, 22.201302, 113.692052, 22.772595], + "name": "中山", + "center": [113.382391, 22.521113], + "centroid": [113.398784, 22.517323], + "level": "city", + "code": 442000, + "fullname": "中山市" + }, + { + "bbox": [116.368468, 23.426312, 117.192935, 24.232809], + "name": "潮州", + "center": [116.632301, 23.661701], + "centroid": [116.790217, 23.783155], + "childrenNum": 3, + "level": "city", + "code": 445100, + "filename": "440000/445100", + "fullname": "潮州市" + }, + { + "bbox": [115.606537, 22.886208, 116.633557, 23.775534], + "name": "揭阳", + "center": [116.355733, 23.543778], + "centroid": [116.124317, 23.334057], + "childrenNum": 5, + "level": "city", + "code": 445200, + "filename": "440000/445200", + "fullname": "揭阳市" + }, + { + "bbox": [111.060547, 22.36467, 112.52172, 23.325586], + "name": "云浮", + "center": [112.044439, 22.929801], + "centroid": [111.798791, 22.813664], + "childrenNum": 5, + "level": "city", + "code": 445300, + "filename": "440000/445300", + "fullname": "云浮市" + } +] diff --git a/src/views/RegionSelect/index.vue b/src/views/RegionSelect/index.vue index 58524bd..8466397 100644 --- a/src/views/RegionSelect/index.vue +++ b/src/views/RegionSelect/index.vue @@ -11,32 +11,59 @@ check-strictly render-after-expand :props="treeSelectProps" - node-key="id" + node-key="code" @change="changeRegion" />