From 050ade3e2f439cad66186073a56ee881a6060758 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 15 Mar 2024 14:54:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=20=E7=A7=BB=E9=99=A4=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=20=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Descriptions.vue               | 32 ++++----------
 .../Home/components/Dialogs/Camera/index.vue  | 42 +++++++------------
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
index 16d177eb..df76b8c5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
@@ -1,18 +1,11 @@
 <template>
   <div class="Descriptions keep-ratio" origin="left" :style="getStyle()">
-    <div
-      class="item"
-      v-for="(item, index) in getResolveList"
-      :key="`${item.key || item.label}${index}`"
-      :style="[gridStyle(item, index), transformStyle(itemStyle)]"
-    >
-      <div
-        class="text title"
-        :style="{
-          ...transformStyle(titleStyle),
-          width: labelWidth,
-        }"
-      >
+    <div class="item" v-for="(item, index) in getResolveList" :key="`${item.key || item.label}${index}`"
+      :style="[gridStyle(item, index), transformStyle(itemStyle)]">
+      <div class="text title" :style="{
+    ...transformStyle(titleStyle),
+    width: labelWidth,
+  }">
         <p>
           <slot :name="`title-${item.key || item.label}`" :data="item">
             {{ item.label || "-" }}
@@ -20,18 +13,9 @@
         </p>
         :
       </div>
-      <ContentText
-        :style="transformStyle(titleStyle)"
-        class="content text"
-        :data="data"
-        :_config="item"
-      >
+      <ContentText :style="transformStyle(titleStyle)" class="content text" :data="data" :_config="item">
         <template #default="{ value }">
-          <slot
-            :name="`content-${item.key || item.label}`"
-            :value="value"
-            :data="item"
-          >
+          <slot :name="`content-${item.key || item.label}`" :value="value" :data="item">
             {{ value }}
           </slot>
         </template>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index 988044bd..b7e3f240 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -7,19 +7,11 @@
           <Descriptions :list="list" :data="data" style="gap: 18px">
             <template #content-deviceName>
               <span>{{ dialogData.deviceName || "-" }}</span>
-              <img
-                @click="controlDialogVisible = true"
-                v-if="
-                  [0, '0'].includes(
-                    dialogData.parseOtherConfig &&
-                      dialogData.parseOtherConfig.ptzCtrl
-                  )
-                "
-                src="@screen/images/camera-control-icon.svg"
-                width="18px"
-                height="18px"
-                style="cursor: pointer"
-              />
+              <img @click="controlDialogVisible = true" v-if="[0, '0'].includes(
+    dialogData.parseOtherConfig &&
+    dialogData.parseOtherConfig.ptzCtrl
+  )
+    " src="@screen/images/camera-control-icon.svg" width="18px" height="18px" style="cursor: pointer" />
             </template>
           </Descriptions>
         </ElTabPane>
@@ -33,10 +25,7 @@
       </div>
     </div>
 
-    <CameraControlDialog
-      :deviceId="dialogData.iotDeviceId"
-      v-model="controlDialogVisible"
-    />
+    <CameraControlDialog :deviceId="dialogData.iotDeviceId" v-model="controlDialogVisible" />
   </Dialog>
 </template>
 
@@ -79,14 +68,14 @@ export default {
           label: "道路名称",
           key: "roadName",
         },
-        {
-          label: "设备编号",
-          key: "deviceCode",
-        },
-        {
-          label: "所属机构",
-          key: "organizationName",
-        },
+        // {
+        //   label: "设备编号",
+        //   key: "deviceCode",
+        // },
+        // {
+        //   label: "所属机构",
+        //   key: "organizationName",
+        // },
         {
           label: "设备桩号",
           key: "stakeMark",
@@ -126,6 +115,7 @@ export default {
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
+    console.log(this.data, "this.data");
   },
   methods: {
     visibleClose(bool) {
@@ -190,7 +180,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }

From 5a53f074d2b3166c2056ab003e2c5bb70e4a4c0b Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 15 Mar 2024 14:55:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20add=E8=B5=B5=E7=A5=A5=E9=BE=99?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=90=8E=E7=AB=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/vue.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 1a83dbf6..c18cb129 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -53,7 +53,8 @@ module.exports = {
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
         // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥 
+        target: `http://10.168.68.42:8087`, //王思祥
+        // target: `http://10.168.65.194:8087`, //赵祥龙
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From d545c15fc9cc64813040790353418f97614e920b Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 15 Mar 2024 15:06:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20=20=E9=A6=96=E9=A1=B5=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E8=8A=82=E7=82=B9=E8=BF=87=E5=A4=9A=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=82=B9=E5=BC=80=E9=97=AE=E9=A2=98=E4=B8=B4=E6=97=B6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/map.js     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 12e76a5b..9f7be8b9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -102,6 +102,13 @@ export class MarkerCluster {
       "font-size:15px; background:#6f5757; color:#b39b9b;",
       this.infoWindow
     );
+    //data.length 大于 5 取前5个数, 否则直接返回data
+    const pageSize = 6;
+    let pageNum = 1;
+    const dataFisrtPage =
+      data.length > pageSize
+        ? data.slice((pageNum - 1) * pageSize, pageSize)
+        : data;
 
     this.infoWindow.setContent(`<div
     style="
@@ -119,7 +126,7 @@ export class MarkerCluster {
         <img class="info-close" style="width: 12px;cursor: pointer;" src="${require("@screen/images/dialog/icon-close.svg")}" />
       </div>
       <div style="padding: 15px 9px;flex: 1; overflow: auto;" class="info-window-content">
-        ${data
+        ${dataFisrtPage
           .map(
             (item) => `
               <div style="cursor: pointer; padding: 3px 6px;display: flex;align-items: center; gap: 6px;" class="info-window-item">