Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue

@@ -8,16 +8,16 @@
       <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
     </div>
     <div class="foote">
-          <Button @click.native="handleEventRelieve" style="width: 100px;">
+      <Button @click.native="handleEventRelieve" style="width: 100px;" v-if="data.eventState == '0'">
-            事件解除
+        误报
-          </Button>
+      </Button>
-          <Button @click.native="goDispatch" style="width: 100px;">
+      <Button @click.native="goDispatch" style="width: 100px;">
-            设备管控
+        设备管控
-          </Button>
+      </Button>
-          <Button @click.native="goDispatch" style="width: 100px;">
+      <Button @click.native="goDispatch" style="width: 100px;">
-            调度处置
+        调度处置
-          </Button>
+      </Button>
-      </div>
+    </div>
   </Dialog>
 </template>
 
@@ -138,30 +138,39 @@ export default {
   },
   methods: {
     handleClickTabs() { },
-    goDispatch(){
+    goDispatch() {
       this.$router.push(`/control/event/commandDispatch`);
     },
-    goStrategy(){
+    goStrategy() {
       this.$router.push(`/control/device/strategy`);
     },
     handleEventRelieve() {
-      
+
-      this.$confirm("确定解除事件吗？", "提示", {
+      this.$confirm("确定事件误报吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          let data = new FormData();
+          // let data = new FormData();
-          data.append("eventId", this.dialogData.id);
+          // data.append("eventId", this.dialogData.id);
-          postCompleteEvent(data).then((result) => {
+          // postCompleteEvent(data).then((result) => {
-            console.log('--------',result)
+          //   console.log('--------', result)
-            if (result.code != 200) return [];
+          //   if (result.code != 200) return [];
-            this.$message.success("事件解除成功");
+          //   this.$message.success("成功");
-            this.$emit('traffic-relieve',this.data);
+          //   this.$emit('traffic-relieve', this.data);
+          // });
+          request({
+            url: `dc/system/event/${this.data.eventType}/${this.dialogData.id}`,
+            method: "delete",
+          }).then((result) => {
+            if (result.code == 200) Message.success("成功！");
+            else Message.error(result?.msg);
+
+            this.$emit('traffic-relieve', this.data);
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };
@@ -217,13 +226,14 @@ export default {
     }
   }
 }
-  .foote{
+
-    display: flex;
+.foote {
-    align-items: center;
+  display: flex;
-    gap: 9px;
+  align-items: center;
-    width: 100%;
+  gap: 9px;
-    justify-content: flex-end;
+  width: 100%;
-    margin:20px 0px -20px 0px;
+  justify-content: flex-end;
-    
+  margin: 20px 0px -20px 0px;
-  }
+
+}
 </style>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue

@@ -153,7 +153,7 @@ export default {
   },
   watch: {
     dataRecord(e) {
-      console.log(e)
+      this.bindRecord()
     },
   },
   data() {
@@ -475,7 +475,11 @@ export default {
       request({
         url: `/business/dcOperLog/list`,
         method: "get",
-        params: {...this.searchData,operType:this.dataRecord.operType},
+        params: {
+          ...this.searchData,
+          operType:this.dataRecord.operType,
+           startTime:this.dataRecord.operTime[0],
+           endTime:this.dataRecord.operTime[1]}
       })
         .then((result) => {
           if (result.code != 200) return;

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue

@@ -70,7 +70,7 @@
         >
           <el-button class="input">点击上传</el-button>
         </el-upload>
-        <ElSelect v-model="context" clearable placeholder="请选择常用语">
+        <ElSelect v-model="text" clearable placeholder="请选择常用语">
           <ElOption
             v-for="item in phrasesOptions"
             :key="item"
@@ -141,6 +141,7 @@ export default {
       options: [],
       processId: "",
       context: "",
+      text: "",
       phrasesOptions: [],
       headers: {
         Authorization: "Bearer " + getToken(),
@@ -161,6 +162,11 @@ export default {
         }
       });
     },
+    text(newVlaue, oldValue) {
+      if (newVlaue) {
+        this.context = newVlaue;
+      }
+    },
   },
   methods: {
     filterDistance(distance) {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue

@@ -260,12 +260,12 @@ export default {
       }
 
       .content-item-right {
-        overflow: hidden;
       }
     }
 
     .box-item {
       position: relative;
+
       height: 8px;
       width: 289px;
       background: linear-gradient(
@@ -293,6 +293,7 @@ export default {
       );
       border-radius: 2px 2px 2px 2px;
       opacity: 1;
+      overflow: hidden;
     }
 
     .box-item:nth-child(2)::before {
@@ -308,6 +309,7 @@ export default {
       );
       border-radius: 2px 2px 2px 2px;
       opacity: 1;
+      overflow: hidden;
     }
 
     .num {

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue

@@ -192,6 +192,7 @@ export default {
           drawRoundRect(context, 385, 406, 320, 24, 10, gr);
           drawRoundRect(context, 385, 440, 320, 24, 10, gr);
           // drawRoundRect(context, 385, 474, 320, 24, 10, gr);
+          // drawRoundRect(context, 385, 510, 320, 24, 10, gr);
           await this.getNonAutomaticWarningFacility(this.formData);
         });
       });

ruoyi-ui/vue.config.js

@@ -53,8 +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.72.174:8087`, //赵祥龙
+        target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝
         // target: `http://10.168.77.128:8087`, //王兴琳