mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改BUG

wangqin
王钦 7 months ago
parent
3a20c18ad6
commit
6a9673433a
9 changed files with 43 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
  2. 9
      ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
  3. 11
      ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg
  4. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
  5. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
  6. 15
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  7. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
  8. 16
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
  9. 4
      ruoyi-ui/vue.config.js

12
ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
View File

@ -1,11 +1,9 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814973"> <g id="&#231;&#159;&#173;&#228;&#191;&#161;">
<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;"> <rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
<g id="Group 1142814681"> <g id="Group 1142814681">
<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/> <path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/> <path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
</g>
</g> </g>
</g> </g>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 974 B

9
ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
View File

@ -1,9 +0,0 @@
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#159;&#173;&#228;&#191;&#161;">
<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
<g id="Group 1142814681">
<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 974 B

11
ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg
View File

@ -0,0 +1,11 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814973">
<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
<g id="Group 1142814681">
<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

@ -139,7 +139,7 @@ export default {
methods: { methods: {
handleClickTabs() { }, handleClickTabs() { },
goDispatch() { goDispatch() {
this.$router.push(`/control/event/commandDispatch`); this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`);
}, },
goStrategy() { goStrategy() {
this.$router.push(`/control/device/strategy`); this.$router.push(`/control/device/strategy`);

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
View File

@ -274,7 +274,7 @@ export default {
} catch(e){ } catch(e){
} }
tab.forEach(async item=>{ tab.forEach(async item=>{
await this.handleDeviceImmediate(item); await this.handleDeviceImmediate(item,true);
}) })
}, },
handleCleared() { handleCleared() {

15
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
View File

@ -328,13 +328,14 @@ export const eventMap = {
// 感知事件 // 感知事件
async "事件专题/感知事件"(item, filterData, isDefault, cb) { async "事件专题/感知事件"(item, filterData, isDefault, cb) {
let loadingMessage; let loadingMessage;
if(!isDefault){
loadingMessage = Message.info({ loadingMessage = Message.info({
message: `${item.title}位置${!isDefault?'加载':'更新'}中...`, message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
duration: 0, duration: 0,
customClass: "loading-message", customClass: "loading-message",
iconClass: "el-icon-loading", iconClass: "el-icon-loading",
}); });
}
// if (!isDefault) { // if (!isDefault) {
// } // }

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

@ -115,9 +115,11 @@ import {
// import { provideMixin } from "./../../mixin"; // import { provideMixin } from "./../../mixin";
import { timeLine2List } from "./data"; import { timeLine2List } from "./data";
import request from "@/utils/request"; import request from "@/utils/request";
import { provideMixin } from "./../../mixin"
export default { export default {
name: "DisposalProcess", name: "DisposalProcess",
mixins: [provideMixin],
inject: ["adpScale"], inject: ["adpScale"],
// mixins: [provideMixin], // mixins: [provideMixin],
components: { components: {
@ -300,6 +302,7 @@ export default {
}, },
}, },
async mounted() { async mounted() {
this.eventId = this.detailData.id;
this.getProcess(); this.getProcess();
await this.disposalRecords(this.eventId); await this.disposalRecords(this.eventId);
}, },

16
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
View File

@ -40,10 +40,10 @@ export default {
...components, ...components,
}, },
props: { props: {
detailId: { // detailId: {
type: [String, Number], // type: [String, Number],
default: "162cb8824ea141f3a96a74ad81c22796", // default: "162cb8824ea141f3a96a74ad81c22796",
}, // },
}, },
provide() { provide() {
return { return {
@ -59,10 +59,18 @@ export default {
provideData: { provideData: {
detail: null, detail: null,
}, },
detailId: ''
}; };
}, },
created() { created() {
let h = window.location.href.split('=');
if(h.length === 2){
this.detailId = window.location.href.split('=')[1];
} else {
this.detailId = 'b825c7bbf4de43cdb8f689e270adf7a1';
}
this.getDetail(); this.getDetail();
}, },
methods: { methods: {
getDetail() { getDetail() {

4
ruoyi-ui/vue.config.js
View File

@ -52,9 +52,9 @@ module.exports = {
// target: `http://10.0.81.204:8087`, //现场后台 刘文阁 // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// target: `http://10.168.78.135: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.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.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝 // target: `http://10.168.56.165:8087`, //王家宝
// target: `http://10.168.77.128:8087`, //王兴琳 // target: `http://10.168.77.128:8087`, //王兴琳

Write Preview
Loading…
Cancel
Save