Merge remote-tracking branch 'origin/czks-地图合并' into czks-cmt-gwj地图合并

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: '重大风险点数',
+              label: '今日进矿石作业区车辆数',
-              count: '9'
+              count: 0
             },
             {
-              label: '较大风险点数',
+              label: '今日出矿石作业区车辆数',
-              count: '20'
+              count: 0
-            },
-            {
-              label: '一般风险点数',
-              count: '13'
-            },
-            {
-              label: '低风险性点数',
-              count: '3'
             }
           ]
         },
         {
-          title: '今日情况',
+          title: '杂货作业区',
           list: [
-            {
+
-              label: '今日进矿石作业区车辆数',
-              count: '-'
-            },
-            {
-              label: '今日出矿石作业区车辆数',
-              count: '-'
-            },
             {
               label: '今日进杂货作业区车辆数',
-              count: '-'
+              count: 0
             },
             {
               label: '今日出杂货作业区车辆数',
-              count: '-'
+              count: 0
             }
           ]
         }

src/views/map/components/menjinCzks.vue

@@ -114,24 +114,12 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '人员闸机',
+          title: '车辆闸机数',
-          img: require('../../../assets/map/menjin/ico1.png'),
-          label1: '今日进数',
-          count1: 0,
-          label2: '今日出数',
-          count2: 0,
-          label3: '今日剩余人数',
-          count3: 0
-        },
-        {
-          title: '车辆闸机',
           img: require('../../../assets/map/menjin/ico2.png'),
-          label1: '今日进数',
+          label1: '在线数',
-          count1: 0,
+          count1: 2
-          label2: '今日出数',
+          // label2: '离线数',
-          count2: 0,
+          // count2: 0
-          label3: '今日剩余车数',
-          count3: 0
         },
         {
           title: '摄像头数',

src/views/map/index.vue

@@ -452,16 +452,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',