更新

ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue

@@ -1,14 +1,7 @@
 <template>
   <div
     class="BackgroundClip"
-    :style="{
+    :style="compStyle"
-      '--clip-path': clipPath,
-      '--border-path': borderPath,
-      '--border-color': borderColor,
-      '--bg-color': bgColor,
-      width: width,
-      top: top,
-    }"
     :class="borderPath ? 'hasBorder' : 'noBoarder'"
   >
     <slot />
@@ -27,6 +20,10 @@ export default {
       type: String,
       default: null,
     },
+    right: {
+      type: String,
+      default: null,
+    },
     clipPath: {
       type: String,
       default: null,
@@ -44,6 +41,25 @@ export default {
       default: null,
     },
   },
+  computed:{
+    compStyle(){
+      let obj = {
+        '--clip-path': this.clipPath,
+        '--border-path': this.borderPath,
+        '--border-color': this.borderColor,
+        '--bg-color': this.bgColor,
+        width: this.width,
+        top: this.top,
+    }
+    if(this.right){
+      obj["margin-left"] = "auto";
+      obj["margin-right"] = this.right;
+    }else{
+      obj["margin"] = "auto";
+    }
+    return obj;
+    }
+  }
 };
 </script>
 

ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue

@@ -6,7 +6,7 @@
           clipPath="polygon(calc(100% - var(--clip-width)) 0, 100% var(--clip-width), 100% 100%, var(--clip-width) 100%, 0 calc(100% - var(--clip-width)), 0 0)"
           borderColor="linear-gradient(180deg, rgba(78, 174, 204, .9), rgba(78, 174, 204, 0))"
           bgColor="linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%)"
-          ref="DialogContentRef" :width="width" :top="top">
+          ref="DialogContentRef" :width="width" :top="top" :right="right">
           <div class="dialog-title">
             <img class="title-icon" src="@screen/images/dialog/title-icon.svg" />
             <span>{{ title }}</span>
@@ -52,6 +52,10 @@ export default {
       type: String,
       default: null,
     },
+    right: {
+      type: String,
+      default: null,
+    },
     title: {
       type: String,
     },
@@ -145,7 +149,7 @@ export default {
   position: relative;
   box-sizing: border-box;
   top: 20%;
-  margin: auto;
+  // margin: auto;
   padding-bottom: 20px;
   // margin: calc(var(--border-width) / 2);
 

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue

@@ -0,0 +1,39 @@
+<template>
+  <div class="early_warning">
+    <p @click="onShowCtt">
+      <i class="el-icon-message-solid" v-if="isShowCtt"></i>
+      <i class="el-icon-bell" v-else></i>
+    </p>
+    <Dialog v-model="isShowCtt" title="事件预警" width="600px" top="100px" right="30px" noneMask>
+      <WarningList></WarningList>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import WarningList from "./WarningList.vue";
+export default {
+  data() {
+    return {
+      isShowCtt:false
+    };
+  },
+  components: {
+    Dialog, WarningList
+  },
+  computed: {
+  },
+  methods: {
+    onShowCtt(){
+      this.isShowCtt = !this.isShowCtt;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.early_warning{
+
+}
+</style>

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="warning_list">
+    <el-tabs v-model="activeTab" @tab-click="onChangeTab">
+      <el-tab-pane label="告警事件" name="first">用户管理</el-tab-pane>
+      <el-tab-pane label="待确认事件" name="second">配置管理</el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import request from "@/utils/request";
+export default {
+  data() {
+    return {
+      activeTab:"first"
+    };
+  },
+  components: {
+  },
+  computed: {
+  },
+  methods: {
+    onChangeTab(tab, event){
+      console.log(tab, event);
+      this.getMainData();
+    },
+    getMainData(){
+      request({
+        // url: `/business/dcBatchFunctionsJobGroup`,
+        url: `/perceivedEvents/warning/perceivedEventsList`,
+        method: "GET",
+        params:{}
+      })
+        .then((result) => {
+          if (result.code != 200) return;
+          console.log( result.data , "刚发的刚发的发多少++++");
+        })
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.warning_list{
+
+}
+</style>

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue

@@ -15,6 +15,8 @@
       <CustomMenu :menuData="menuRight" prefix="r" class="rightMenu">
         <!-- @onChange="onChange" :activeIndex="activeIndex" -->
       </CustomMenu>
+      <!-- 预警 -->
+      <EarlyWarning class="early_warning"></EarlyWarning>
       <UserArea class="topButton"></UserArea>
     </div>
     <RecentPages class="recent"></RecentPages>
@@ -24,6 +26,7 @@
 import menuData from "@/common/menuData";
 import CustomMenu from "./CustomMenu.vue";
 import Clock from "./Clock.vue";
+import EarlyWarning from './EarlyWarning.vue'
 import UserArea from './UserArea.vue'
 import RecentPages from "../RecentPages/index.vue";
 export default {
@@ -36,6 +39,7 @@ export default {
     };
   },
   components: {
+    EarlyWarning,
     CustomMenu,
     Clock,
     UserArea,
@@ -116,53 +120,9 @@ export default {
       width: 500px;
     }
 
+    .early_warning{ width: 26px; overflow: hidden;}
     .topButton{
-      width: 190px;
+      width: 164px;
-    }
-
-    .user {
-      width: 200px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 14px;
-      font-weight: normal;
-      color: #fff;
-      line-height: 16px;
-
-      .name {
-        display: inline-block;
-        margin: 0 10px;
-      }
-
-      .icon {
-        display: inline-block;
-        margin: 0 13px;
-      }
-
-      .icon-001 {
-        display: inline-block;
-        width: 12px;
-        height: 14px;
-      }
-
-      .icon-002 {
-        display: inline-block;
-        width: 9px;
-        height: 5px;
-      }
-
-      .icon-003 {
-        display: inline-block;
-        width: 18px;
-        height: 16px;
-      }
-
-      .icon-004 {
-        display: inline-block;
-        width: 15px;
-        height: 15px;
-      }
     }
   }
   .recent{

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue

@@ -483,6 +483,7 @@ export default {
           this.mode
         );
       } else {
+        console.log(this.tpl , "tttttttttppplllll")
         this.dataForm = infoBoardUtils.dialogSourceFormat(
           this.tpl,
           this.type,

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="boardPreview" ref="compBox">
         <div class="boardBox" :style="boardStyle" v-if="isReady">
-            <p class="boardTxt" v-for="item,index in contentArr" :key="index" :style="boardTxtStyle" v-html="item" v-if="(index + 1) <= lineTotal">
+            <p class="boardTxt" v-for="item,index in contentArr" :key="index" :style="boardTxtStyle" v-html="item"
+                v-if="(index + 1) <= lineTotal">
             </p>
         </div>
     </div>

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue

@@ -37,13 +37,14 @@
       </div>
     </el-form>
 
-    <taskEditDialog v-model="isEditingTask" :groupId="groupId" :time="time" :deviceDic="deviceDic" :deviceList="deviceList"
+    <taskEditDialog v-model="isEditingTask" :groupId="groupId" :time="time" :deviceDic="deviceDic"
-      :propData="editData" @onSubmit="onSubmit" />
+      :deviceList="deviceList" :propData="editData" @onSubmit="onSubmit" />
 
   </div>
 </template>
 
 <script>
+import request from "@/utils/request";
 import { deviceTypeDic } from "@screen/utils/enum.js"
 import { getDeviceList } from "@screen/utils/api/device.js"
 import taskEditDialog from "./taskEditDialog.vue";
@@ -85,11 +86,11 @@ export default {
       temp.functions[1].params.CONTENT = temp.functions[1].params.CONTENT.replaceAll(/\\n/g, '\\\\n').replaceAll(/=/g, '\\=').replaceAll(/,/g, '\\,').replaceAll(/&nbsp/g, ' ');
       this.editData = {
         id: this.propData.jobId,
-        direction: temp.direction || temp.devices[0].direction,
+        direction: temp.direction,
-        deviceType: temp.deviceType || temp.devices[0].deviceType,
+        deviceType: temp.deviceType,
         devices: temp.devices,
         params: temp.functions[1].params,
-        screenSize: temp.screenSize || temp.devices[0].screenSize || this.deviceDic[temp.devices[0].id].screenSize
+        screenSize: temp.screenSize
       };
       console.log(this.editData , "+++======");
       this.isCompReady = true;
@@ -108,7 +109,17 @@ export default {
       // this.$emit("onModify", {devices});
     },
     onDelete(){
-
+      request({
+        url: `/business/dcBatchFunctionsJob/` + this.propData.jobId,
+        method: "DELETE",
+        // params: {
+        //   jobGroup: this.propData.id
+        // },
+      })
+        .then((result) => {
+          if (result.code != 200) return;
+          Message.success("删除成功");
+        })
     },
     initBasicData(){
       

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue

@@ -206,7 +206,12 @@ export default {
         // { "STAY": 90, "ACTION": "1", "SPEED": "0", "COLOR": "ffff00", "FONT": "3", "FONT_SIZE": "24", "CONTENT": "长清收费站\\\\n出入口封闭", "width": "160", "height": "80", "formatStyle": "2" }
         this.editData.type2 = BoardUtils.contentToDeviceItem(this.propData.params);
       }else{
-
+        let arr = this.propData.screenSize.split("*");
+        this.editData.type2 = {
+          displayAreaWidth: +arr[0],
+          displayAreaHeight: +arr[1]
+        };
+        alert(JSON.stringify());
       }
     },
     onEditBoard(){
@@ -273,10 +278,11 @@ export default {
 
       let params = this.processParams();
     
+
       if(this.mode == "add"){
 
       }
-      addTaskRequest(devices, params, { deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize, jobGroup: this.groupId, time:this.time }).then(res=>{
+      addTaskRequest(this.groupId, devices, params, { deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize }).then(res=>{
         console.log(res)
       });
       this.$emit("onSubmit")

ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js

@@ -1,7 +1,7 @@
 
 import request from '@/utils/request'
 
-export function addTaskRequest(devices, params, others) {
+export function addTaskRequest(jobGroup, devices, params, others) {
     let temp = [{
         ...others,
         devices: devices,
@@ -27,6 +27,7 @@ export function addTaskRequest(devices, params, others) {
         ]
     }];
     let data = {
+        jobGroup,
         callParameter: JSON.stringify(temp)
     }
     // console.log(JSON.stringify(data));

ruoyi-ui/vue.config.js

@@ -52,9 +52,9 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // 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.66.196:8087`, //正晨后台 连现场物联 刘文阁2
         // 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`, //王兴琳