Browse Source

bug

wangqin
zhoule 12 months ago
parent
commit
54a2bc2ef3
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  3. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
  4. 5
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
  5. 5
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
  6. 10
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
  7. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue

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

@ -165,7 +165,7 @@ export default {
.dialog-content { .dialog-content {
padding: 9px 21px 27px 21px; padding: 9px 21px 27px 21px;
max-height: 90vh; max-height: 75vh;
overflow-y: auto; overflow-y: auto;
} }

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@ -230,7 +230,7 @@ export const eventMap = {
iconClass: "el-icon-loading", iconClass: "el-icon-loading",
}); });
} }
const data = await getPerceiveEventList() const data = await getPerceiveEventList({warningState: 1})
.then(async (data) => { .then(async (data) => {
await delay(600); await delay(600);
return data; return data;

4
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@ -297,12 +297,12 @@ export function getEventTopicList(eventType) {
* 感知事件根据类型获取 * 感知事件根据类型获取
* @param {number} eventType * @param {number} eventType
*/ */
export function getPerceiveEventList() { export function getPerceiveEventList(data = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request({ request({
url: `/perceivedEvents/warning/perceivedEventsList`, url: `/perceivedEvents/warning/perceivedEventsList`,
method: "POST", method: "POST",
data: {}, data: {...data},
}) })
.then(({ code, rows }) => { .then(({ code, rows }) => {
if (code != 200) { if (code != 200) {

5
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue

@ -39,9 +39,9 @@
</div> </div>
<template #footer> <template #footer>
<Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
<Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false"> <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false">
取消</Button> 取消</Button>
<Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
@ -235,7 +235,8 @@ export default {
display: flex; display: flex;
gap: 9px; gap: 9px;
width: 836px; width: 836px;
height: 768px; // height: 768px;
min-height: 500px;
margin-top: 20px; margin-top: 20px;
flex-direction: column; flex-direction: column;

5
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue

@ -47,9 +47,9 @@
</div> </div>
<template #footer> <template #footer>
<Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
<Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false"> <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false">
取消</Button> 取消</Button>
<Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
@ -276,7 +276,8 @@ export default {
display: flex; display: flex;
gap: 9px; gap: 9px;
width: 836px; width: 836px;
height: 768px; min-height: 500px;
// height: 768px;
flex-direction: column; flex-direction: column;
.video-pic { .video-pic {

10
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue

@ -8,13 +8,13 @@
<Transition name="fade"> <Transition name="fade">
<Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions" labelWidth="120px" /> <Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions" labelWidth="120px" />
</Transition> </Transition>
</div>
<div class="footer"> <template #footer>
<Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
<Button style="background: #C9C9C9;padding:0 24px;" <Button style="background: #C9C9C9;padding:0 24px;"
@click.native="modelVisible = false, submitting = false">取消</Button> @click.native="modelVisible = false, submitting = false">取消</Button>
</div> <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
</div> </template>
</Dialog> </Dialog>
</template> </template>
@ -219,7 +219,7 @@ export default {
.EventDetailDialog { .EventDetailDialog {
gap: 9px; gap: 9px;
width: 1050px; width: 1050px;
height: 810px; // height: 810px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

8
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue

@ -151,8 +151,8 @@ export default {
dateTime: "2024", dateTime: "2024",
direction: "1", direction: "1",
dataList: [], dataList: [],
selectIndex: 2, selectIndex: 1,
selectId: 2, selectId: 1,
reset: false, reset: false,
type: "year", type: "year",
chart1List: [], chart1List: [],
@ -216,8 +216,8 @@ export default {
this.direction = "1"; this.direction = "1";
this.type = "year"; this.type = "year";
this.dateTime = "2024"; this.dateTime = "2024";
this.selectId = 2; this.selectId = 1;
this.selectIndex = 2; this.selectIndex = 1;
this.reset = true; this.reset = true;
this.searchQuery(); this.searchQuery();
}, },

Loading…
Cancel
Save