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

bug 修改提交

wangqin
Joe 10 months ago
parent
ed85115325
commit
2d9b2cddcf
12 changed files with 544 additions and 34 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. 18
      ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
  2. 1
      ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
  3. 1
      ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue
  4. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue
  5. 49
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
  6. 464
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json
  7. 20
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/data.js
  8. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
  9. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
  10. 9
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
  11. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
  12. 3
      ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss

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

@ -17,6 +17,10 @@
</div> </div>
<img class="bottom-right" src="@screen/images/dialog/right-bottom.svg"> <img class="bottom-right" src="@screen/images/dialog/right-bottom.svg">
<div class="footer" v-if="$slots.footer">
<slot name="footer"></slot>
</div>
</BackgroundClip> </BackgroundClip>
</div> </div>
</Transition> </Transition>
@ -127,7 +131,7 @@ export default {
} }
.dialog-content { .dialog-content {
padding: 10px 20px 20px 20px; padding: 9px 21px 21px 21px;
max-height: 96vh; max-height: 96vh;
} }
@ -136,5 +140,17 @@ export default {
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
.footer {
display: flex;
align-items: center;
gap: 9px;
width: 100%;
justify-content: flex-end;
margin-bottom: 21px;
padding: 0 36px;
// padding: 21px 36px;
// padding-top: 9px;
}
} }
</style> </style>

1
ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
View File

@ -171,6 +171,7 @@ export default {
width: 100%; width: 100%;
gap: 15px 15px; gap: 15px 15px;
overflow-x: hidden; overflow-x: hidden;
padding-right: 9px;
.formItem { .formItem {
display: flex; display: flex;

1
ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue
View File

@ -79,6 +79,7 @@ export default {
color: #fff; color: #fff;
overflow-y: auto; overflow-y: auto;
height: 100%; height: 100%;
padding-right: 9px;
.node { .node {
width: 100%; width: 100%;

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

@ -544,7 +544,7 @@ export default {
text-shadow: 0px 1px 4px #f29600; text-shadow: 0px 1px 4px #f29600;
.num { .num {
font-size: 10px; // font-size: 10px;
} }
.unit { .unit {

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

@ -30,9 +30,6 @@
<!-- <Camera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 1" /> --> <!-- <Camera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 1" /> -->
<component :dialogData="dialogConfig.data" visible :device="dialogConfig.data" :is="dialogConfig.component" <component :dialogData="dialogConfig.data" visible :device="dialogConfig.data" :is="dialogConfig.component"
@change="handleCameraChange" @update:visible="handleCameraChange" /> @change="handleCameraChange" @update:visible="handleCameraChange" />
<!-- <InfoBoard :device="testData.device" :visible.sync="testData.visible"></InfoBoard> -->
</Bg1> </Bg1>
</template> </template>
@ -55,31 +52,31 @@ export default {
DrivingGuidance, DrivingGuidance,
InfoBoard, InfoBoard,
Bg1 Bg1
}, },
data() { data() {
return { return {
testData:{ // testData:{
visible:true, // visible:true,
device: { // device: {
"id": 904, // "id": 904,
"iotDeviceId": "81221-65535", // "iotDeviceId": "81221-65535",
"groupId": null, // "groupId": null,
"productId": 0, // "productId": 0,
"stakeMarkId": "k59+289", // "stakeMarkId": "k59+289",
"direction": "1", // "direction": "1",
"deviceName": "大学城入口站前板", // "deviceName": "大学城入口站前板",
"deviceType": 2, // "deviceType": 2,
"installationDate": null, // "installationDate": null,
"productionDate": null, // "productionDate": null,
"durableYears": null, // "durableYears": null,
"installationSite": null, // "installationSite": null,
"useState": null, // "useState": null,
"otherConfig": "{\"screenSize\":\"160*80\"}", // "otherConfig": "{\"screenSize\":\"160*80\"}",
"remark": null, // "remark": null,
"createTime": "2024-01-10T15:48:59.000+08:00", // "createTime": "2024-01-10T15:48:59.000+08:00",
"updateTime": null // "updateTime": null
} // }
}, // },
layerData: [], layerData: [],
active: "事件专题", active: "事件专题",
tabContentData: [], tabContentData: [],

464
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json
View File

@ -0,0 +1,464 @@
[
{
"id": 1882,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K60+000—K65+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1883,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K75+000—K81+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1884,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K101+000—K104+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1885,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K110+000—K112+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1886,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K147+000—K152+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1887,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K162+000—K166+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1888,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K205+000—K207+000",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1889,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K59+290",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1890,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K72+844",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1891,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K83+885",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1892,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K86+499",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1893,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K99+750",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1894,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K105+904",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1895,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K117+878",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1896,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K126+224",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1897,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K145+934",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1898,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K155+652",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1899,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K163+250",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1900,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K173+600",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1901,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K179+140",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
},
{
"id": 1902,
"iotDeviceId": null,
"groupId": null,
"productId": 285,
"stakeMarkId": "K190+500",
"direction": null,
"deviceName": "智能行车诱导系统",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": "116.147183",
"latitude": "35.612834"
},
{
"id": 99999,
"iotDeviceId": null,
"groupId": null,
"productId": 286,
"stakeMarkId": "k59+289",
"direction": "2",
"deviceName": "不知",
"deviceType": 12,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": null,
"remark": null,
"createTime": null,
"updateTime": null,
"longitude": null,
"latitude": null
}
]

20
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/data.js
View File

@ -0,0 +1,20 @@
// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
export const searchFormList = [
{
label: "岗位:",
key: "key009",
type: "select",
options: {
type: "daterange",
},
},
{
label: "驻点:",
key: "key018",
type: "select",
options: {
type: "daterange",
},
},
];

4
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
View File

@ -22,7 +22,7 @@
</ButtonGradient> </ButtonGradient>
</div> </div>
<InputSearch style="width: 402px;" /> <InputSearch style="width: 402px;" :formList="searchFormList" />
</div> </div>
<div class='body'> <div class='body'>
@ -35,6 +35,7 @@
import PeopleCard from "./../../components/PeopleCard/index.vue"; import PeopleCard from "./../../components/PeopleCard/index.vue";
import InputSearch from '@screen/components/InputSearch/index.vue'; import InputSearch from '@screen/components/InputSearch/index.vue';
import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue'; import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
import { searchFormList } from "./data";
export default { export default {
name: 'FirstResponders', name: 'FirstResponders',
@ -45,6 +46,7 @@ export default {
}, },
data() { data() {
return { return {
searchFormList
} }
} }
} }

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

@ -29,7 +29,7 @@
<div class="bottom"> <div class="bottom">
<ElSelect placeholder="请选择关键点" /> <ElSelect placeholder="请选择关键点" />
<RadioGroup :list="[{ key: 'input', label: '输入' }, { key: 'upload', label: '上传' }]" value="input" type="button" /> <RadioGroup :list="[{ key: 'input', label: '输入' }, { key: 'upload', label: '上传' }]" value="input" type="button" />
<ElInput placeholder="请输入调度指令" /> <ElInput v-model="test" placeholder="请输入调度指令" />
<ButtonGradient class="title-button special-button"> <ButtonGradient class="title-button special-button">
发送 发送
</ButtonGradient> </ButtonGradient>
@ -63,6 +63,7 @@ export default {
emit: ['fullHeight'], emit: ['fullHeight'],
data() { data() {
return { return {
test: null,
timeLine1List, timeLine1List,
// timeLine2List: Array.from({ length: 6 }).map(() => ({ // timeLine2List: Array.from({ length: 6 }).map(() => ({
// title: "接警记录", // title: "接警记录",

9
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
View File

@ -11,7 +11,12 @@
<TimeLine1 :data="timeLine1List" /> <TimeLine1 :data="timeLine1List" />
<TimeLine2 :data="timeLine2List" style="flex: 1;" /> <TimeLine2 :data="timeLine2List" style="flex: 1;" />
</div> </div>
<template #footer>
<Button style="padding: 0 24px;">确认</Button>
<Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"> 取消</Button>
</template>
</Dialog> </Dialog>
</template> </template>
@ -24,6 +29,7 @@ import { formList, timeLine1List } from "./data"
import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js" import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js"
import Video from "@screen/components/Video"; import Video from "@screen/components/Video";
import Carousel from "./Carousel/index.vue" import Carousel from "./Carousel/index.vue"
import Button from '@screen/components/Buttons/Button.vue';
export default { export default {
name: 'EventDetail', name: 'EventDetail',
@ -33,7 +39,8 @@ export default {
TimeLine1, TimeLine1,
TimeLine2, TimeLine2,
Video, Video,
Carousel Carousel,
Button
}, },
model: { model: {
prop: 'visible', prop: 'visible',

4
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
View File

@ -10,8 +10,8 @@
</Transition> </Transition>
<div class="footer"> <div class="footer">
<Button>修改</Button> <Button style="padding:0 24px;">保存</Button>
<Button style="background: #C9C9C9;">取消</Button> <Button style="background: #C9C9C9;padding:0 24px;">取消</Button>
</div> </div>
</div> </div>
</Dialog> </Dialog>

3
ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
View File

@ -260,7 +260,8 @@ div.el-picker-panel.el-date-range-picker.el-popper {
} }
} }
.current span { .current span,
.current a {
background-color: #56cefe; background-color: #56cefe;
} }
td.in-range div { td.in-range div {

Write Preview
Loading…
Cancel
Save