From bcd826dd048a2ac780fcf2da64cde758fd34004e Mon Sep 17 00:00:00 2001
From: liulixin <zycloud@zycloud.com>
Date: Tue, 27 Feb 2024 11:30:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/czks_index.vue | 66 ++++++++++---------------
 1 file changed, 27 insertions(+), 39 deletions(-)

diff --git a/src/views/map/components/czks_index.vue b/src/views/map/components/czks_index.vue
index 020064a..b2003a7 100644
--- a/src/views/map/components/czks_index.vue
+++ b/src/views/map/components/czks_index.vue
@@ -1,19 +1,5 @@
 <template>
   <div class="fensongsi_index">
-    <div class="block1">
-      <layout-title title="沧州矿石气象监测数据"/>
-      <div class="options">
-        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
-          <div class="title">{{ item.title }}</div>
-          <div class="circular">
-            <img :src="item.img" alt="">
-          </div>
-          <div class="label">
-            {{ item.count }}
-          </div>
-        </div>
-      </div>
-    </div>
     <div class="block2">
       <layout-title title="风险辨识管控"/>
       <div class="options">
@@ -41,7 +27,7 @@
       </div>
     </div>
     <div class="block4">
-      <layout-title title="口门管理"/>
+      <layout-title title="进出记录管理"/>
       <div class="options">
         <div v-for="(item,index) in block4OptionsList" :key="index" class="option">
           <div class="title">{{ item.title }}</div>
@@ -55,6 +41,23 @@
         </div>
       </div>
     </div>
+    <div class="block1">
+      <layout-title title="气象监测数据"/>
+      <div class="options">
+        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
+          <div class="title">{{ item.title }}</div>
+          <div class="circular">
+            <img :src="item.img" alt="">
+          </div>
+          <div class="label">
+            {{ item.count }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+
   </div>
 </template>
 
@@ -138,44 +141,29 @@ export default {
       ],
       block4OptionsList: [
         {
-          title: '风险指数',
+          title: '矿石作业区',
           list: [
             {
-              label: '重大风险点数',
-              count: '9'
+              label: '今日进矿石作业区车辆数',
+              count: 0
             },
             {
-              label: '较大风险点数',
-              count: '20'
-            },
-            {
-              label: '一般风险点数',
-              count: '13'
-            },
-            {
-              label: '低风险性点数',
-              count: '3'
+              label: '今日出矿石作业区车辆数',
+              count: 0
             }
           ]
         },
         {
-          title: '今日情况',
+          title: '杂货作业区',
           list: [
-            {
-              label: '今日进矿石作业区车辆数',
-              count: '-'
-            },
-            {
-              label: '今日出矿石作业区车辆数',
-              count: '-'
-            },
+
             {
               label: '今日进杂货作业区车辆数',
-              count: '-'
+              count: 0
             },
             {
               label: '今日出杂货作业区车辆数',
-              count: '-'
+              count: 0
             }
           ]
         }

From 68a367cbc3068cbcf450c25eff43a8e7cb5a677d Mon Sep 17 00:00:00 2001
From: liulixin <zycloud@zycloud.com>
Date: Tue, 27 Feb 2024 16:56:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjinCzks.vue | 22 +++++-----------------
 src/views/map/index.vue                 | 10 ----------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/views/map/components/menjinCzks.vue b/src/views/map/components/menjinCzks.vue
index 64aaf19..9450a2b 100644
--- a/src/views/map/components/menjinCzks.vue
+++ b/src/views/map/components/menjinCzks.vue
@@ -114,24 +114,12 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '人员闸机',
-          img: require('../../../assets/map/menjin/ico1.png'),
-          label1: '今日进数',
-          count1: 0,
-          label2: '今日出数',
-          count2: 0,
-          label3: '今日剩余人数',
-          count3: 0
-        },
-        {
-          title: '车辆闸机',
+          title: '车辆闸机数',
           img: require('../../../assets/map/menjin/ico2.png'),
-          label1: '今日进数',
-          count1: 0,
-          label2: '今日出数',
-          count2: 0,
-          label3: '今日剩余车数',
-          count3: 0
+          label1: '在线数',
+          count1: 2
+          // label2: '离线数',
+          // count2: 0
         },
         {
           title: '摄像头数',
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index f98c4e7..2aff97e 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -445,16 +445,6 @@ export default {
           containAuthorization: [],
           eliminateAuthorization: [],
           list: [
-            {
-              label: '人员',
-              dialog_width: '800px',
-              check: false,
-              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
-              type: 'PERSON',
-              containAuthorization: [],
-              eliminateAuthorization: []
-            },
             {
               label: '车辆',
               dialog_width: '600px',