From e3848c892b0e4538f6ed998a43d45197bed0ad0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Mon, 26 Feb 2024 10:39:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=AE=A1=E8=BE=96=E8=B7=AF=E6=AE=B5,?=
 =?UTF-8?q?=E8=B7=AF=E6=AE=B5=E9=87=8C=E7=A8=8B=E5=8A=A0km=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/JiHeExpressway/components/Card1/index.vue    | 2 +-
 .../views/jurisdictionalManagement/index.vue               | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue
index dc21c63a..fe136d79 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue
@@ -6,7 +6,7 @@
         <span>{{ item.label }}: </span>
         <span>
           <slot :name="`form-${item.key}`" :data="cardData">
-            {{ getValue(item.key) }}
+            {{ getValue(item.key) }}{{ item.suffix }}
           </slot>
         </span>
       </p>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue
index d5e86e10..ccf5c1e6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue
@@ -101,7 +101,8 @@ export default {
         },
         {
           key: "mileage",
-          label: "路段里程"
+          label: "路段里程",
+          suffix: "km"
         }
       ],
       // data: Array.from({ length: 20 }).map(() => ({
@@ -213,11 +214,11 @@ export default {
       line-height: 16px;
 
       span:first-child {
-        color: rgba(0, 179, 204, 1)#000;
+        color: #FFDB82;
       }
 
       span:last-child {
-        color: rgba(217, 0, 27, 1)
+        color: #00EBC1;
       }
     }
   }

From bd98f65045e0ab7ed9358485bc5e60f84021044c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Mon, 26 Feb 2024 10:40:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessDataManagement/views/emergencyAgencies/index.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue
index d3352520..ac0da082 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue
@@ -121,7 +121,7 @@ export default {
       await confirm({ message: "是否要删除该机构?" });
 
       request({
-        url: `/business/shifts/${data.id}`,
+        url: `/business/organization/${data.dcOrganizations.id}`,
         method: "DELETE",
         data: {}
       })
@@ -168,7 +168,7 @@ export default {
         }
       }).then(result => {
         if (result.code != 200) return;
-
+        
         this.data = result.rows;
         this.setTotal(result.total)
       }).finally(() => {

From 27febc35efeb5268e2b46a06acf371863a504fd2 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Mon, 26 Feb 2024 15:53:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/components/Pagination.vue  | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Pagination.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Pagination.vue
index f4070358..97dcbe14 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Pagination.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Pagination.vue
@@ -1,61 +1,67 @@
 <template>
-  <ElPagination v-on="$listeners" v-bind="getProps" ref="ElPaginationRef" class="Pagination" />
+  <ElPagination
+    v-on="$listeners"
+    v-bind="getProps"
+    ref="ElPaginationRef"
+    class="Pagination"
+  />
 </template>
 
 <script>
 export default {
-  name: 'Pagination',
+  name: "Pagination",
   computed: {
     getProps() {
       return {
         // total
-        layout: "prev, pager, next, sizes, jumper",
+        layout: "prev, pager, next, sizes, jumper,total",
         ...this.$attrs,
         small: true,
-      }
-    }
+      };
+    },
   },
   mounted() {
     if (!this.$refs.ElPaginationRef) return;
 
-    const jumpPageDom = this.$refs.ElPaginationRef.$el.querySelector(".el-pagination__jump");
+    const jumpPageDom = this.$refs.ElPaginationRef.$el.querySelector(
+      ".el-pagination__jump"
+    );
 
     if (jumpPageDom?.childNodes?.[0]?.nodeValue)
       jumpPageDom.childNodes[0].nodeValue = "跳至";
-  }
-}
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .Pagination {
   // color: #fff;
 
   ::v-deep {
-
-    >button,
-    >ul li {
+    > button,
+    > ul li {
       background: #064258;
       border-radius: 2px 2px 2px 2px;
       opacity: 1;
       color: #fff;
     }
 
-    >button {
+    > button {
       padding: 0 3px;
-      border: 1px solid #00B3CC;
+      border: 1px solid #00b3cc;
     }
 
-    >ul li {
-      background: linear-gradient(180deg, #004960 0%, #004B62 100%);
+    > ul li {
+      background: linear-gradient(180deg, #004960 0%, #004b62 100%);
       margin: 0 1.5px;
 
       &.active {
-        background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
       }
     }
 
     .el-pagination__total {
-      color: #FFF;
+      color: #fff;
     }
 
     .el-pagination__sizes {

From 846d776ccc7c46e2eca5d3575e74842f0162032b Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Mon, 26 Feb 2024 16:31:08 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/eventSource/assets/charts.js   |   6 +-
 .../components/eventSource/index.vue          | 191 ++++++++++--------
 2 files changed, 116 insertions(+), 81 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js
index c2b70d9f..6ea73b0c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js
@@ -125,16 +125,18 @@ var options = {
     data: lengData,
     formatter: function (name) {
       let target = 0;
+      let percent = 0;
       if (!mainData) return "";
       for (let i = 0; i < window.mainData.length; i++) {
         if (window.mainData[i].name === name) {
           target = window.mainData[i].value;
+          percent = window.mainData[i].percent;
         }
       }
-      console.log('starget',target)
+      console.log("starget", target);
       var arr = [
         "{ast|" + name + "}",
-        "{bst|" + Math.round((target * 100).toFixed(0)) + "%  }",
+        "{bst|" + Math.round((percent * 100).toFixed(0)) + "%  }",
         "{cst|" + Math.round(target) + "起}",
       ];
       return arr.join("  ");
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
index 92eb61d0..4ec2128f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
@@ -1,49 +1,56 @@
 <template>
-  <div @resize="changeReisze" class='congestion'>
+  <div @resize="changeReisze" class="congestion">
     <WgtTitle :title="'感知事件源分析'"></WgtTitle>
     <div class="board">
-      <div class="charts keep-ratio " id="eventSource"></div>
+      <div class="charts keep-ratio" id="eventSource"></div>
     </div>
   </div>
 </template>
-  
-<script>
 
-import WgtTitle from '../../../widgets/title'
+<script>
+import WgtTitle from "../../../widgets/title";
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
-import { getWarningSourceGroup } from '../../../../../../../api/event/perceiveEvent';
+import { getWarningSourceGroup } from "../../../../../../../api/event/perceiveEvent";
 
 const drawRoundRect = (ctx, x, y, width, height, radius, gr) => {
-  // ctx, 矩形距离x坐标位置, 矩形距离y坐标的位置, 矩形的宽, 矩形的长,圆角角度 
+  // ctx, 矩形距离x坐标位置, 矩形距离y坐标的位置, 矩形的宽, 矩形的长,圆角角度
   ctx.beginPath();
   ctx.fillStyle = gr;
-  ctx.arc(x + radius, y + radius, radius, Math.PI, Math.PI * 3 / 2);
+  ctx.arc(x + radius, y + radius, radius, Math.PI, (Math.PI * 3) / 2);
   ctx.lineTo(width - radius + x, y);
-  ctx.arc(width - radius + x, radius + y, radius, Math.PI * 3 / 2, Math.PI * 2);
+  ctx.arc(
+    width - radius + x,
+    radius + y,
+    radius,
+    (Math.PI * 3) / 2,
+    Math.PI * 2
+  );
   ctx.lineTo(width + x, height + y - radius);
-  ctx.arc(width - radius + x, height - radius + y, radius, 0, Math.PI * 1 / 2);
+  ctx.arc(
+    width - radius + x,
+    height - radius + y,
+    radius,
+    0,
+    (Math.PI * 1) / 2
+  );
   ctx.lineTo(radius + x, height + y);
-  ctx.arc(radius + x, height - radius + y, radius, Math.PI * 1 / 2, Math.PI);
+  ctx.arc(radius + x, height - radius + y, radius, (Math.PI * 1) / 2, Math.PI);
   ctx.closePath();
   //ctx.stroke();
-  ctx.fill()
-}
+  ctx.fill();
+};
 
 export default {
-  name: 'EventSource',
+  name: "EventSource",
   components: {
-    WgtTitle
+    WgtTitle,
   },
   data() {
-    return {
-
-    }
+    return {};
   },
 
-  created() {
-
-  },
+  created() {},
   methods: {
     changeReisze() {
       this.myChart.resize();
@@ -52,7 +59,7 @@ export default {
   mounted() {
     setTimeout(() => {
       this.$nextTick(() => {
-        var myChart = echarts.init(document.getElementById('eventSource'));
+        var myChart = echarts.init(document.getElementById("eventSource"));
 
         getWarningSourceGroup().then((res) => {
           if (res.code == 200) {
@@ -63,32 +70,36 @@ export default {
             let chartData = [
               {
                 average: 0,
-                name: '视频AI',
-                percent: 0.3
+                name: "视频AI",
+                percent: 0.3,
               },
               {
                 average: 0,
-                name: '雷达识别',
-                percent: 0.2
-              }, {
+                name: "雷达识别",
+                percent: 0.2,
+              },
+              {
                 average: 0,
-                name: '锥桶',
-                percent: 0.1
-              }, {
+                name: "锥桶",
+                percent: 0.1,
+              },
+              {
                 average: 0,
-                name: '护栏碰撞',
-                percent: 0.2
-              }, {
+                name: "护栏碰撞",
+                percent: 0.2,
+              },
+              {
                 average: 0,
-                name: '扫码报警',
-                percent: 0.1
-              }, {
+                name: "扫码报警",
+                percent: 0.1,
+              },
+              {
                 average: 0,
-                name: '非机预警',
-                percent: 0.1
+                name: "非机预警",
+                percent: 0.1,
               },
-            ]
-            data.forEach(it => {
+            ];
+            data.forEach((it) => {
               if (it.warningSource == 1) {
                 chartData[0].average += it.number;
               }
@@ -109,9 +120,16 @@ export default {
               }
               // total ++;
               // drawRoundRect(context, 231, 37 + (index * 27), 138, 20, 12, gr);
-            })
+            });
             // console.log('data',chartData)
-            let colorList = ['#006EDF', '#00FF00', '#FFC30D', '#FF8400', '#1DA7FF', '#2967EA'];
+            let colorList = [
+              "#006EDF",
+              "#00FF00",
+              "#FFC30D",
+              "#FF8400",
+              "#1DA7FF",
+              "#2967EA",
+            ];
             let lengData = [];
             let mainData = [];
 
@@ -126,55 +144,70 @@ export default {
                 name: it.name,
                 color: colorList[i],
                 value: it.average,
-                percent: (it.average / total) || 0
-              })
+                percent: it.average / total || 0,
+              });
             }
             window.mainData = mainData;
-            // console.log('mainData', mainData)
+            console.log("mainData", mainData);
             chartsStatistics.title.text = `{tb|${total}}`;
             chartsStatistics.title.subtext = "{zb|总数}";
 
             chartsStatistics.legend.data = lengData;
             chartsStatistics.series[0].data = mainData;
-
-            myChart.on('mouseover', (params) => {
-              // console.log('params',params)
-              if (params.componentType == 'graphic') {
-                return
-              }
-              chartsStatistics.title.text = `{tb|${params.percent}%}`;
-              chartsStatistics.title.subtext = `{zb|${params.data.name}}`;
-              // chartsStatistics.title.left = "22%";
-              myChart.setOption(chartsStatistics);
-            })
-
-            // 用户鼠标移出时，重新开始自动切换
-            myChart.on('mouseout', (params) => {
-              chartsStatistics.title.text = `{tb|${total}}`;
-              chartsStatistics.title.subtext = "{zb|总数}";
-              // chartsStatistics.title.left = "25%";
-              myChart.setOption(chartsStatistics);
-            })
+            // chartsStatistics.legend.formatter = (name) => {
+            //   let target = 0;
+            //   if (!mainData) return "";
+            //   for (let i = 0; i < window.mainData.length; i++) {
+            //     if (window.mainData[i].name === name) {
+            //       target = window.mainData[i].value;
+            //     }
+            //   }
+            //   console.log("starget", target);
+            //   var arr = [
+            //     "{ast|" + name + "}",
+            //     "{bst|" + Math.round((target * 100).toFixed(0)) + "%  }",
+            //     "{cst|" + Math.round(target) + "起}",
+            //   ];
+            //   return arr.join("  ");
+            // };
+
+            // myChart.on("mouseover", (params) => {
+            //   // console.log('params',params)
+            //   if (params.componentType == "graphic") {
+            //     return;
+            //   }
+            //   chartsStatistics.title.text = `{tb|${params.percent}%}`;
+            //   chartsStatistics.title.subtext = `{zb|${params.data.name}}`;
+            //   // chartsStatistics.title.left = "22%";
+            //   myChart.setOption(chartsStatistics);
+            // });
+
+            // // 用户鼠标移出时，重新开始自动切换
+            // myChart.on("mouseout", (params) => {
+            //   chartsStatistics.title.text = `{tb|${total}}`;
+            //   chartsStatistics.title.subtext = "{zb|总数}";
+            //   // chartsStatistics.title.left = "25%";
+            //   myChart.setOption(chartsStatistics);
+            // });
             // }
-
           }
 
           myChart.setOption(chartsStatistics);
-        })
+        });
 
         const domMap = document.getElementById("eventSource");
         let parentDiv = domMap.firstChild;
         // 创建canvas
-        let canvas = document.createElement('canvas');
+        let canvas = document.createElement("canvas");
         canvas.width = parentDiv.offsetWidth;
         canvas.height = parentDiv.offsetHeight;
         parentDiv.appendChild(canvas);
-        const context = canvas.getContext('2d');
+        const context = canvas.getContext("2d");
 
         // 填充渐变颜色
         let gr = context.createLinearGradient(230, 0, 360, 0);
-        gr.addColorStop(1, 'rgba(92,197,255,0)');
-        gr.addColorStop(0, 'rgba(92,197,255,0.3)');
+        gr.addColorStop(1, "rgba(92,197,255,0)");
+        gr.addColorStop(0, "rgba(92,197,255,0.3)");
         drawRoundRect(context, 214, 15, 134, 21, 12, gr);
         drawRoundRect(context, 214, 42, 134, 21, 12, gr);
         drawRoundRect(context, 214, 69, 134, 21, 12, gr);
@@ -184,17 +217,14 @@ export default {
 
         context.lineWidth = 1; // 设置线段宽度
 
-
-
         this.myChart = myChart;
-
       });
     });
   },
-}
+};
 </script>
-  
-<style lang='scss' scoped>
+
+<style lang="scss" scoped>
 .congestion {
   width: 100%;
 
@@ -206,11 +236,15 @@ export default {
     border-radius: 5px 5px 5px 5px;
     opacity: 1;
     border: 1px solid;
-    border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
+    border-image: linear-gradient(
+        360deg,
+        rgba(55, 231, 255, 0.3),
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
     display: flex;
     justify-content: space-between;
     align-items: center;
-
   }
 }
 
@@ -219,4 +253,3 @@ export default {
   width: 100%;
 }
 </style>
-  
\ No newline at end of file

From bf358d31fed6bc8206c22fd7c0a5be379bb35d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Mon, 26 Feb 2024 17:18:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BB=A5=E5=8F=8A=E6=A1=A9=E5=8F=B7=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=8F=90=E4=BA=A4=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AddNEditDialog.vue             | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
index 02f494fa..d5ece2e0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
@@ -57,35 +57,35 @@ export default {
             options: []
           }
         },
-        {
-          label: "机构类型:",
-          key: "organizationType",
-          required: true,
-          type: 'select',
-          ons: {
-            change: (value, { data }) => {
-              if (value == 1) {
-                data.parentId = null;
-              }
-
-              this.formList[0].options.options.forEach((item, index) => {
-                item.disabled = value == 1
-              })
-            }
-          },
-          options: {
-            options: [
-              {
-                key: 1,
-                label: "路管中心"
-              },
-              {
-                key: 2,
-                label: "驻点"
-              },
-            ]
-          }
-        },
+        // {
+        //   label: "机构类型2233:",
+        //   key: "organizationType",
+        //   required: true,
+        //   type: 'select',
+        //   ons: {
+        //     change: (value, { data }) => {
+        //       if (value == 1) {
+        //         data.parentId = null;
+        //       }
+
+        //       this.formList[0].options.options.forEach((item, index) => {
+        //         item.disabled = value == 1
+        //       })
+        //     }
+        //   },
+        //   options: {
+        //     options: [
+        //       {
+        //         key: 1,
+        //         label: "路管中心"
+        //       },
+        //       {
+        //         key: 2,
+        //         label: "驻点"
+        //       },
+        //     ]
+        //   }
+        // },
         {
           label: "机构名称:",
           key: "organizationName",
@@ -199,7 +199,11 @@ export default {
           if (this.data) data.id = this.data.dcOrganizations.id;
 
           if (typeof data.parentId != 'number') data.parentId = 0;
-          if (data.stakeMark[0]) data.stakeMark = `K${data.stakeMark[0]}+${data.stakeMark[1]}`;
+          if (data.stakeMark[0]) {
+            data.stakeMark = `K${data.stakeMark[0]}+${data.stakeMark[1]}`
+          }else{
+            data.stakeMark = ''
+          }
 
           request({
             url: `/business/organization`,