解决冲突

gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Left.vue

@@ -13,15 +13,15 @@
       <div class="left">
         <div class="first">
           <span class="text">巡检年度计划</span>
-          <span>99次</span>
+          <span>23次</span>
         </div>
         <div class="second all-flex">
           <div class="left">泄露监测</div>
           <div class="right">防腐层监测</div>
         </div>
         <div class="third all-flex">
-          <div class="left">55次</div>
-          <div class="right">44次</div>
+          <div class="left">15次</div>
+          <div class="right">8次</div>
         </div>
         <div class="first fourth">
           <div class="">泄漏检测完成比例</div>
@@ -48,7 +48,7 @@
           <div class="right">8次</div>
         </div>
         <div class="first fourth">
-          <div class="">泄漏检测完成比例</div>
+          <div class="">防腐层检测完成比例</div>
         </div>
         <div class="fifth">
           <div class="contant">

gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/MapBottom.vue

@@ -179,7 +179,7 @@ import Pipe from "./Pipe.vue";
 let arr = [
   {
     id: 1,
-    name: "河北泽宏",
+    name: "燃气检测",
     unt: 1,
     type: 2,
     state: 3,
@@ -189,7 +189,7 @@ let arr = [
   },
   {
     id: 2,
-    name: "中诚然气",
+    name: "燃气泄漏检测",
     unt: 1,
     type: 2,
     state: 2,
@@ -199,7 +199,7 @@ let arr = [
   },
   {
     id: 3,
-    name: "中燃翔科",
+    name: "入户安检",
     unt: 2,
     type: 3,
     state: 1,
@@ -209,14 +209,136 @@ let arr = [
   },
   {
     id: 4,
-    name: "中诚燃气3月份巡检-1",
+    name: "探测器报警",
     unt: 2,
     type: 1,
     state: 3,
     utl: 1,
     value: ["2022-4-1", "2022-4-12"],
   },
-
+  {
+    id: 5,
+    name: "安装家用气体探测器",
+    unt: 1,
+    type: 3,
+    state: 3,
+    utl: 3,
+    value: ["2022-4-1", "2022-4-12"],
+  },
+  {
+    id: 6,
+    name: "入户安检",
+    unt: 1,
+    type: 2,
+    state: 3,
+    utl: 3,
+    value: ["2022-4-1", "2022-4-12"],
+  },
+  {
+    id: 7,
+    name: "探测器消警",
+    unt: 1,
+    type: 1,
+    state: 2,
+    utl: 2,
+    value: ["2022-4-1", "2022-4-12"],
+  },
+  {
+    id: 8,
+    name: "燃气泄漏",
+    unt: 1,
+    type: 3,
+    state: 2,
+    utl: 3,
+  },
+  {
+    id: 9,
+    name: "家用探测器报警",
+    unt: 1,
+    type: 2,
+    state: 3,
+    utl: 2,
+  },
+  {
+    id: 10,
+    name: "气体泄漏",
+    unt: 1,
+    type: 2,
+    state: 3,
+    utl: 3,
+  },
+  {
+    id: 11,
+    name: "火灾报警",
+    unt: 1,
+    type: 2,
+    state: 1,
+    utl: 2,
+  },
+  {
+    id: 12,
+    name: "入户安检",
+    unt: 1,
+    type: 1,
+    state: 3,
+    utl: 3,
+  },
+  {
+    id: 13,
+    name: "入户安检",
+    unt: 1,
+    type: 3,
+    state: 3,
+    utl: 4,
+  },
+  {
+    id: 14,
+    name: "气体泄漏",
+    unt: 1,
+    type: 3,
+    state: 1,
+    utl: 2,
+  },
+  {
+    id: 15,
+    name: "爆炸",
+    unt: 1,
+    type: 2,
+    state: 2,
+    utl: 4,
+  },
+  {
+    id: 16,
+    name: "爆炸",
+    unt: 1,
+    type: 3,
+    state: 3,
+    utl: 1,
+  },
+  {
+    id: 17,
+    name: "有毒气体泄漏",
+    unt: 1,
+    type: 3,
+    state: 1,
+    utl: 3,
+  },
+  {
+    id: 18,
+    name: "火灾",
+    unt: 1,
+    type: 3,
+    state: 4,
+    utl: 3,
+  },
+  {
+    id: 19,
+    name: "报警",
+    unt: 1,
+    type: 1,
+    state: 3,
+    utl: 3,
+  },
 ];
 export default {
   data() {

gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Middle.vue

@@ -13,15 +13,15 @@
       <div class="left">
         <div class="first">
           <span class="text">巡检年度计划</span>
-          <span>99次</span>
+          <span>20次</span>
         </div>
         <div class="second all-flex">
           <div class="left">泄露监测</div>
           <div class="right">防腐层监测</div>
         </div>
         <div class="third all-flex">
-          <div class="left">55</div>
-          <div class="right">44</div>
+          <div class="left">13</div>
+          <div class="right">7</div>
         </div>
       </div>
       <div class="right">
@@ -53,11 +53,11 @@ export default {
     return {
       bottomData: [
         [
-          { name: "裂缝", value: 20, color: "#604AFF" },
-          { name: "管道称重", value: 30, color: "#FFC337" },
-          { name: "其他", value: 40, color: "#86FF5B" },
-          { name: "腐蚀", value: 99, color: "#03C4F1" },
-          { name: "漏气", value: 18, color: "#1F8DF3" },
+          { name: "裂缝", value: 8, color: "#604AFF" },
+          { name: "管道称重", value: 16, color: "#FFC337" },
+          { name: "其他", value: 13, color: "#86FF5B" },
+          { name: "腐蚀", value: 7, color: "#03C4F1" },
+          { name: "漏气", value: 5, color: "#1F8DF3" },
         ],
       ],
     };

gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Right.vue

@@ -49,36 +49,50 @@ export default {
     return {
       arr: [
         {
-          companyName: "河北泽宏科技",
-          time: "2021-09-09 09:35",
-          text: "城市燃气",
+          companyName: "中燃祥科",
+          time: "2022-01-11 07:29",
+          text: "安装探头",
         },
         {
-          companyName: "河北汉宏",
-          time: "2021-05-11 14:16",
-          text: "天然气化工",
+          companyName: "河北泽宏",
+          time: "2022-01-13 07:29",
+          text: "安装管道",
         },
         {
-          companyName: "河北海康",
-          time: "2020-03-21 13:20",
-          text: "工业燃料",
+          companyName: "河北泽宏科技股份有限公司",
+          time: "2022-01-14 07:29",
+          text: "气体报警器",
         },
         {
-          companyName: "河北新奥",
-          time: "2022-03-02 13:59",
-          text: "天然气化工",
+          companyName: "政府部门",
+          time: "2022-01-15 07:29",
+          text: "安装设备监控",
         },
         {
-          companyName: "河北霄领",
-          time: "2020-01-16 10:19",
-          text: "天然气化工",
+          companyName: "中诚然气",
+          time: "2022-01-17 07:29",
+          text: "安装管道",
         },
         {
-          companyName: "河北泽宏公司",
-          time: "2020-07-19 09:21",
-          text: "城市燃气",
+          companyName: "中诚然气",
+          time: "2022-02-20 07:29",
+          text: "轻工路1号施工",
+        },
+        {
+          companyName: "中燃祥科",
+          time: "2022-02-21 07:29",
+          text: "轻工路1号施工",
+        },
+        {
+          companyName: "河北泽宏",
+          time: "2022-03-11 07:29",
+          text: "安装管道",
+        },
+        {
+          companyName: "河北泽宏",
+          time: "2022-04-16 07:29",
+          text: "安装设备监控",
         },
-
 
         // {
         //   companyName: 123,