更新禅道BUG

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

@@ -224,7 +224,8 @@ export default {
         '重要事件已报送'
       ],
       linkEvent:[],
-      linkEventIndex:0
+      linkEventIndex:0,
+      remark: ''
     };
   },
 
@@ -380,6 +381,8 @@ export default {
       if (!isLt2M) {
         this.$message.error('上传图片或视频大小不能超过 20MB');
       }
+      this.remark = `${file.name} ${(file.size/1024/1024).toFixed(1)}MB`
+      console.log(this.remark,file,3334)
       return isLt2M;
     },
     // 上传成功
@@ -402,10 +405,12 @@ export default {
      
       if (this.context || this.imageUrl) {
         let content = "";
+        let remark = "";
         if (this.testRadio == "input") {
           content = this.context;
         } else {
           content = this.imageUrl;
+          remark = this.remark;
         }
         let type = this.containsArrayElement(this.imageUrl, this.fileType);
         let data = {
@@ -413,6 +418,7 @@ export default {
           processId: this.processId,
           processName: this.processName,
           context: content,
+          remark,
           // file: this.imageUrl,
           type: type && type.length > 0 ? type.join(",") : "text",
           source: 1,

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue

@@ -50,8 +50,11 @@ export default {
         modelVisible: {
             get() {
                 if (this.visible) {
+                    if(!this.fData.eventSubclass){
                         this.initData()
                     }
+                    
+                }
                 return this.visible;
             },
             set(val) {
@@ -65,11 +68,11 @@ export default {
     methods: {
         async initData() {
             let config = _.cloneDeep(configList['交通管制']);
-
             config[config.length-1].options.options = config[config.length-1].options.options.slice(0,7)
 
             const value = this.eventSubclass;
-            config[0].default = value;
+
+            
             let facilityType = 1;
             if (value == "3-2") {
                 facilityType = 1;
@@ -80,7 +83,7 @@ export default {
             }
             //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
             if (value && value != "3-1") {
-                getFacilities(facilityType, config)
+                 await getFacilities(facilityType, config)
             }
             config[1].default = this.controlType;
             if(value === '3-4'){
@@ -156,6 +159,8 @@ export default {
                 ],
             };
             config[13].options.options = cs[this.controlType]
+            
+            config[0].default = value;
             this.formConfigList = config;
         },
         onSubmit() {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue

@@ -8,13 +8,18 @@
             <h3>调度记录</h3>
             <span> {{ startTime }} 至 {{ endTime }} </span>
           </div>
-          <div class="body">
+          <div class="body" id="printbody">
               <div v-for="(item, index) in data" :key="index" style="display: flex;gap:10px">
                 <div style="width:130px">{{ beautifyOperationTime(item.operationTime) }}</div>
                 <div style="width:50px">{{ item.operatorName }}</div>
+                
                 <div style="width: 80px" v-if="item.processName && item.type !== 'text'">【{{ item.processName }}】</div>
                 <el-image v-if="['bmp','jpg','jpeg','png'].indexOf(item.type)!==-1" :preview-src-list="[uploadUrl +item.context]" :src="uploadUrl +item.context" style="width: 200px;height: auto"></el-image>
-                <video v-else-if="['mp4','avi','xmvb'].indexOf(item.type)!==-1"  :src="uploadUrl +item.context" style="width: 200px;height: 160px"  muted controls ></video>
+                <div v-else-if="['mp4','avi','xmvb'].indexOf(item.type)!==-1" style="flex:1;display: flex;flex-direction: column;" >
+                  <div >{{ item.remark }}</div>
+                  <video :src="uploadUrl +item.context" style="width: 200px;height: 160px"  muted controls ></video>
+                </div>
+                
                 <div style="flex:1" v-else>
                   <span style="width: 80px" v-if="item.processName">【{{ item.processName }}】</span>
                   {{ item.context }}</div>
@@ -73,7 +78,35 @@ export default {
   },
   methods: {
     print(){
-      window.print();
+      var printContent = document.getElementById('printbody').innerHTML;
+      var l=(screen.availWidth-1080)/2;
+      var t=(screen.availHeight-400)/2; 
+
+      var printWindow = window.open('', '_blank', 'height=400,width=1080,top='+t+',left='+l+',toolbar=no,menubar=no,location=no,status=yes');
+
+
+      printWindow.document.write('<html><head><title>打印区域</title>');
+
+
+      printWindow.document.write('</head><body onBlur="window.focus();">');
+
+      printWindow.document.write(`<div style="width:800px;text-align:center"><h3>调度记录</h3><h4> ${ this.startTime } 至 ${ this.endTime } </h4></div>`);
+      printWindow.document.write(``);
+      printContent = printContent.replace(/width: 130px;/g,'width: 170px;')
+      printContent = printContent.replace(/class="el-image__inner el-image__preview"/g,'style="width:400px;height:auto"')
+      printContent = printContent.replace(/display: flex; gap: 10px;/g,'display: flex; gap: 10px;margin-bottom:10px')
+      printContent = printContent.replace(/width: 200px; height: 160px;/g,'display: none; width: 200px; height: 160px;')
+    
+      console.log(printContent)
+      printWindow.document.write(printContent);
+
+
+      printWindow.document.write('</body></html>');
+
+
+
+
+      printWindow.print();
     },
     initData() {
       request({

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js

@@ -41,7 +41,7 @@ export const searchFormList = [
           label: "济南方向",
         },
         {
-          key: "2",
+          key: "",
           label: "双向",
         },
       ],

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js

@@ -77,7 +77,7 @@ export const searchFormList = [
           label: "济南方向",
         },
         {
-          key: "2",
+          key: "",
           label: "双向",
         },
       ],

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue

@@ -24,11 +24,11 @@
                   v-if="item.title.includes('雷达')"
                 />
                 <img
-                  src="@screen/images/layer/路测设备/雨棚可变信息标志.svg"
+                  src="@screen/images/deviceType/雨棚可变信息标志.svg"
                   v-if="item.title.includes('雨棚可变信息标志')"
                 />
                 <img
-                  src="@screen/images/layer/路测设备/站前悬臂式可变信息标志.svg"
+                  src="@screen/images/deviceType/站前悬臂式可变信息标志.svg"
                   v-if="item.title.includes('站前可变信息标志')"
                 />
                 <img
@@ -44,7 +44,7 @@
                   v-if="item.title.includes('设备箱')"
                 />
                 <img
-                  src="@screen/images/layer/路测设备/桥下球机.svg"
+                  src="@screen/images/deviceType/桥下球机.svg"
                   v-if="item.title.includes('桥下高清')"
                 /><img
                   src="@screen/images/deviceType/ball.svg"
@@ -63,11 +63,11 @@
                   v-if="item.title.includes('碰撞')"
                 />
                 <img
-                  src="@screen/images/layer/路测设备/360全景摄像机.svg"
+                  src="@screen/images/deviceType/360全景摄像机.svg"
                   v-if="item.title.includes('360°全景摄像机')"
                 />
                 <img
-                  src="@screen/images/layer/路测设备/180全景摄像机.svg"
+                  src="@screen/images/deviceType/180全景摄像机.svg"
                   v-if="item.title.includes('180°全景摄像机')"
                 />
                 <img

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js

@@ -158,7 +158,7 @@ export const searchFormList = [
           label: "济南方向",
         },
         {
-          key: "2",
+          key: "",
           label: "双向",
         },
       ],

ruoyi-ui/src/views/JiHeExpressway/pages/safe/files/index.vue

@@ -188,6 +188,7 @@ export default {
     onRefreshForm(){
       this.searchData.pageNum = 1;
       this.$refs.searchComp.handleResetForm();
+      this.handleSearch({fileName:''})  
     },
     handleSearch(data) {
       this.searchData = {

ruoyi-ui/src/views/event/event/dispatchYuan.vue

@@ -460,7 +460,7 @@
 
       <div v-else>是否确认执行?</div>
       <el-input v-model="IssuedItemContent" v-show="this.IssuedItem.flowPid != 7 && this.IssuedItem.flowId !=17 && this.IssuedItem.flowId !=18"/>
-      <div style="display:flex;justify-content:right">
+      <div style="display:flex;justify-content:right;">
         <div class="IssuedButton1" @click="cancelIssuedDialog">取 消</div>
         <div class="IssuedButton2" @click="changeIncHand">确 认</div>
       </div>

ruoyi-ui/vue.config.js

@@ -37,13 +37,13 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:8087`,
-        target:`http://10.0.111.11:8097`,
+        // target:`http://10.0.111.11:8097`,
         // target: `http://10.168.66.196:8087`, //刘文阁
         // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟凡峰
         // target: `http://10.168.79.46:8089`, //王家宝
-        // target: `http://10.168.77.128:8087`, //王兴琳
+        target: `http://10.168.77.128:8087`, //王兴琳
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",