Browse Source

更改

wangqin
zhangzhang 12 months ago
parent
commit
04a170b9f0
  1. 2
      ruoyi-ui/src/assets/styles/JiHeExpressway.scss
  2. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
  3. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
  4. 93
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
  5. 1
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
  6. 1191
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
  7. 41
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
  8. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
  9. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
  10. 4
      ruoyi-ui/src/views/login.vue
  11. 1
      ruoyi-ui/vue.config.js

2
ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@ -11,7 +11,7 @@
} }
.el-form-item { .el-form-item {
margin-bottom: 8px; margin-bottom: 15px;
} }
.el-form-item__label { .el-form-item__label {

12
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue

@ -206,12 +206,12 @@ export default {
this.formList[0].options.options = result; this.formList[0].options.options = result;
this.formList[0].default = result[0].key; this.formList[0].default = result[0].key;
this.formList[0].options.options.push({ // this.formList[0].options.options.push({
disabled: false, // disabled: false,
key: 0, // key: 0,
label: "无", // label: "",
}); // });
console.log(this.formList[0].options.options); // console.log(this.formList[0].options.options);
}, },
handleSubmit() { handleSubmit() {
this.$refs.FormConfigRef.validate().then((data) => { this.$refs.FormConfigRef.validate().then((data) => {

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

@ -6,6 +6,7 @@ export const searchFormList = [
label: "事件状态:", label: "事件状态:",
key: "eventState", key: "eventState",
type: "RadioGroup", type: "RadioGroup",
default: "0",
options: { options: {
options: [ options: [
{ {
@ -29,6 +30,7 @@ export const searchFormList = [
label: "方向:", label: "方向:",
key: "direction", key: "direction",
type: "RadioGroup", type: "RadioGroup",
default: "济南方向",
options: { options: {
options: [ options: [
{ {

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

@ -1,5 +1,5 @@
<template> <template>
<div class='RoadNetworkMonitoring'> <div class="RoadNetworkMonitoring">
<!-- 搜索栏 --> <!-- 搜索栏 -->
<div class="filter"> <div class="filter">
<ButtonGradient @click="onRefresh" class="refresh-btn"> <ButtonGradient @click="onRefresh" class="refresh-btn">
@ -9,47 +9,71 @@
刷新 刷新
</ButtonGradient> </ButtonGradient>
<InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ dFormData: { eventState: 0 } }" <InputSearch
@handleSearch="handleSearch" /> style="width: 402px"
:formList="searchFormList"
:formConfigOptions="{ dFormData: { eventState: '0' } }"
@handleSearch="handleSearch"
/>
</div> </div>
<!-- 内容 --> <!-- 内容 -->
<div class="body"> <div class="body">
<RoadStateCard v-for="(item, index) in data" :key="index" :cardData="item" @firstBtnClick="firstBtnClick" <RoadStateCard
@lastBtnClick="lastBtnClick" /> v-for="(item, index) in data"
:key="index"
:cardData="item"
@firstBtnClick="firstBtnClick"
@lastBtnClick="lastBtnClick"
/>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<div class="footer"> <div class="footer">
<Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'" :page-sizes="[12, 16, 20, 30, 50]" <Pagination
:page-size="searchData.pageSize" :current-page.sync="searchData.pageNum" layout="total, sizes, prev, pager, next" @current-change="initData"
:total="total"> @size-change="onSizeChange"
width="'100%'"
:page-sizes="[12, 16, 20, 30, 50]"
:page-size="searchData.pageSize"
:current-page.sync="searchData.pageNum"
layout="total, sizes, prev, pager, next"
:total="total"
>
</Pagination> </Pagination>
</div> </div>
<EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" @update:value="handleClose" /> <EventDetailDialog
<EventDispatchDialog :visible="eventDispatchDialogVisible" @update:value="handleClose" :eventId="eventId" /> :visible="eventDetailDialogVisible"
:formData="detailDialogFormData"
@update:value="handleClose"
/>
<EventDispatchDialog
:visible="eventDispatchDialogVisible"
@update:value="handleClose"
:eventId="eventId"
/>
</div> </div>
</template> </template>
<script> <script>
import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue"; import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
import Pagination from '@screen/components/Pagination.vue'; import Pagination from "@screen/components/Pagination.vue";
import InputSearch from '@screen/components/InputSearch/index.vue'; import InputSearch from "@screen/components/InputSearch/index.vue";
import RoadStateCard from '@screen/components/RoadStateCard/index.vue'; import RoadStateCard from "@screen/components/RoadStateCard/index.vue";
import EventDetailDialog from "./EventDetailDialog/index"; import EventDetailDialog from "./EventDetailDialog/index";
import EventDispatchDialog from "./EventDispatchDialog/index"; import EventDispatchDialog from "./EventDispatchDialog/index";
import { searchFormList } from './data'; import { searchFormList } from "./data";
import request from "@/utils/request"; import request from "@/utils/request";
const directionMapping = { const directionMapping = {
'1': '菏泽方向', 1: "菏泽方向",
'2': '双向', 2: "双向",
'3': '济南方向' 3: "济南方向",
} };
export default { export default {
name: 'RoadNetworkMonitoring', name: "RoadNetworkMonitoring",
components: { components: {
Pagination, Pagination,
RoadStateCard, RoadStateCard,
@ -57,7 +81,7 @@ export default {
EventDispatchDialog, EventDispatchDialog,
EventDetailDialog, EventDetailDialog,
Pagination, Pagination,
ButtonGradient ButtonGradient,
}, },
data() { data() {
return { return {
@ -67,13 +91,13 @@ export default {
detailDialogFormData: {}, detailDialogFormData: {},
total: 0, total: 0,
data: [], data: [],
eventId: '0', eventId: "0",
searchData: { searchData: {
pageSize: 16, pageSize: 16,
pageNum: 1, pageNum: 1,
eventState: 0, eventState: "0",
}, },
} };
}, },
created() { created() {
this.initData(); this.initData();
@ -82,15 +106,15 @@ export default {
initData() { initData() {
request({ request({
// url: `/dc/system/event/dispatchEventList`, // url: `/dc/system/event/dispatchEventList`,
url: '/dc/system/event/list', url: "/dc/system/event/list",
method: "get", method: "get",
params: this.searchData, params: this.searchData,
}).then((result) => { }).then((result) => {
if (result.code != 200) return Message.error(result?.msg); if (result.code != 200) return Message.error(result?.msg);
this.total = result.total; this.total = result.total;
result.rows.forEach(it => { result.rows.forEach((it) => {
it.stringDirection = directionMapping[it.direction] || it.direction; it.stringDirection = directionMapping[it.direction] || it.direction;
}) });
this.data = result.rows; this.data = result.rows;
}); });
}, },
@ -126,7 +150,7 @@ export default {
}); });
}, },
lastBtnClick(id) { lastBtnClick(id) {
console.log(id) console.log(id);
this.eventDispatchDialogVisible = true; this.eventDispatchDialogVisible = true;
this.eventId = id; this.eventId = id;
}, },
@ -137,8 +161,10 @@ export default {
let dStakeMark = data.stakeMark; let dStakeMark = data.stakeMark;
let dendStakeMark = data.endStakeMark; let dendStakeMark = data.endStakeMark;
let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : ''; let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : "";
let endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : ''; let endStakeMark = dendStakeMark[0]
? `K${dendStakeMark[0]}+${dendStakeMark[1]}`
: "";
this.searchData = { this.searchData = {
...this.searchData, ...this.searchData,
@ -155,12 +181,12 @@ export default {
handleClose() { handleClose() {
this.eventDetailDialogVisible = false; this.eventDetailDialogVisible = false;
this.eventDispatchDialogVisible = false; this.eventDispatchDialogVisible = false;
} },
} },
} };
</script> </script>
<style lang='scss' scoped> <style lang="scss" scoped>
.RoadNetworkMonitoring { .RoadNetworkMonitoring {
padding: 21px; padding: 21px;
@ -175,7 +201,6 @@ export default {
// justify-content: flex-end; // justify-content: flex-end;
justify-content: space-between; justify-content: space-between;
.refresh-btn { .refresh-btn {
} }
} }

1
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue

@ -1,6 +1,5 @@
<template> <template>
<Dialog v-model="modelVisible" title="收费站管制统计" style="width: 100%"> <Dialog v-model="modelVisible" title="收费站管制统计" style="width: 100%">
{{ modelVisible }}
<div class="search"> <div class="search">
<InputSearch <InputSearch
:formList="searchFormList" :formList="searchFormList"

1191
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue

File diff suppressed because it is too large

41
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue

@ -46,7 +46,7 @@
></Empty> ></Empty>
<div ref="queryChart" class="keep-ratio"></div> <div ref="queryChart" class="keep-ratio"></div>
</div> </div>
<div style="position: relative"> <div style="position: relative; bottom: 15px">
<Empty <Empty
v-if="isEmpty02" v-if="isEmpty02"
class="floatEmpty" class="floatEmpty"
@ -55,7 +55,7 @@
<el-table <el-table
:border="false" :border="false"
:data="tableData" :data="tableData"
height="480" height="420"
header-align="left" header-align="left"
empty-text=" " empty-text=" "
> >
@ -112,7 +112,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="foot"> <div class="footer">
<Pagination <Pagination
@current-change="changePage" @current-change="changePage"
width="'100%'" width="'100%'"
@ -327,7 +327,6 @@ export default {
} }
} }
this.equipments = allList; this.equipments = allList;
console.log("Equipments", allList);
}); });
}, },
setStatus(id, status) { setStatus(id, status) {
@ -415,6 +414,33 @@ export default {
}, },
async mounted() { async mounted() {
await this.initData(); await this.initData();
// let data = [5, 2, 6, 8, 1, 0, 3, 4, 7, 9];
// for (var i = 0; i < data.length; i++) {
// for (var j = i + 1; j < data.length; j++) {
// if (data[i] > data[j]) {
// var temp = data[i];
// data[i] = data[j];
// data[j] = temp;
// }
// }
// }
// data.sort(function (a, b) {
// return a - b;
// });
// for (var i = 0; i < data.length - 1; i++) {
// var minIndex = i;
// for (var j = i + 1; j < arr.length; j++) {
// if (data[minIndex] > data[j]) {
// minIndex = j;
// }
// }
// if (i != minIndex) {
// var temp = data[i];
// data[minIndex] = data[i];
// data[i] = temp;
// }
// }
// console.log("", data);
}, },
}; };
</script> </script>
@ -630,4 +656,11 @@ export default {
} }
} }
} }
.footer {
margin: 15px 0;
height: 36px;
display: flex;
align-items: center;
justify-content: center;
}
</style> </style>

2
ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js

@ -106,7 +106,7 @@ var options = {
"梁山-枢纽", "梁山-枢纽",
"鄄郓-枢纽", "鄄郓-枢纽",
"嘉祥西-枢纽", "嘉祥西-枢纽",
"王官-枢纽", "王官-枢纽",
], ],
position: "top", position: "top",
axisLabel: { axisLabel: {

2
ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue

@ -32,6 +32,7 @@
type="input" type="input"
params="word" params="word"
:disable="true" :disable="true"
placeholder="请输入敏感词,回车搜索"
@handleSearch="handleSearch" @handleSearch="handleSearch"
/> />
</div> </div>
@ -83,6 +84,7 @@
<Pagination <Pagination
:total="numTotal" :total="numTotal"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-sizes="[35, 70, 105, 140, 175]"
:page-size="pageSize" :page-size="pageSize"
layout="total,sizes,prev, pager, next, jumper" layout="total,sizes,prev, pager, next, jumper"
@size-change="handleSizeChange" @size-change="handleSizeChange"

4
ruoyi-ui/src/views/login.vue

@ -18,9 +18,7 @@
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
type="text" type="text"
auto-complete="off"
placeholder="请输入用户名" placeholder="请输入用户名"
class="username"
> >
<img <img
slot="prefix" slot="prefix"
@ -263,7 +261,7 @@ export default {
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
border: 1px solid rgba(0, 145, 67, 0.5); border: 1px solid rgba(0, 145, 67, 0.5);
// margin-left: 20px; caret-color: #39adff;
} }
::v-deep .el-checkbox__label { ::v-deep .el-checkbox__label {

1
ruoyi-ui/vue.config.js

@ -54,6 +54,7 @@ module.exports = {
// 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.65.156:8097`, //孟
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",

Loading…
Cancel
Save