Browse Source

梁山收费站颜色调整,异常设备筛选条件

develop
王兴琳 3 hours ago
parent
commit
a8637c3bba
  1. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/data.js
  3. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
  4. 130
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/data.js
  5. 57
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/index.vue
  6. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue

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

@ -73,7 +73,7 @@ export const DeviceForMap = {
type = 'b'
} else if(ctype && (ctype === '2-4'||ctype === '2-2')){
type = 'c'
}
}
return boardIcon[`${type}${+!bool}`];
},
},
@ -113,7 +113,7 @@ export const DeviceForMap = {
deviceType: "10",
dialog: "FatigueWakesUp",
},
太阳能板: {
离网光伏供电: {
deviceType: "15",
dialog: "SolarEnergy",
},
@ -286,7 +286,7 @@ export const eventMap = {
);
addDataPreHandle(removeData);
markerClusterIns.addData(removeData, isDefault);
this.emitter.emit("selectedCompleted", item);
cacheRemoveFunc[`地图事件专题/${item.title}`] = () => {
@ -472,4 +472,4 @@ function removeDataPreHandle(markers) {
};
lngLatMapHandle(markers, cb);
window.renderData?.(window.page); //移除后,重新渲染弹出框更新数据
}
}

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/data.js

@ -180,7 +180,7 @@ export const canvasList = [
},
{ name: "沙河停车区", code: "K159+156", distance: 70 },
{ name: "梁山东收费站", code: "K173+950", distance: 70 },
{ name: "梁山收费站", code: "K179+396", distance: 70, icon: "tag4" },
{ name: "梁山收费站", code: "K179+396", distance: 70 },
{ name: "梁山服务区", code: "K186+061", distance: 70 },
{ name: "嘉祥西收费站", code: "K190+495", distance: 70 },
{

4
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue

@ -152,13 +152,13 @@
</div>
</el-col>
<el-col :span="5" >
<span >音量(1-9)</span>
<span style="font-size: 15px" >音量(1-9)</span>
</el-col>
<el-col :span="6" >
<el-input-number placeholder="" v-model="tableInfo.executeConfig.outVol" :min="1":max="9"></el-input-number>
</el-col>
<el-col :span="6" style="margin-left: 5px;" >
<span >循环次数(1-16)</span>
<span style="font-size: 15px">循环次数(1-16)</span>
</el-col>
<el-col :span="6" >
<el-input-number placeholder="" v-model="tableInfo.executeConfig.repeatTimes" :min="1":max="16"></el-input-number>

130
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/data.js

@ -3,6 +3,60 @@ import * as PresetFormItems from "@screen/common/PresetFormItems.js";
// import { merge, cloneDeep } from "lodash";
import {directionOptions} from '@screen/utils/enum.js';
import {cloneDeep, merge} from "lodash";
const station = {
label: "桩号:",
key: "stakeMark",
required: true,
type: "MultipleLabelItem",
options: {
options: [
{
prefix: {
text: "K",
style: {
color: "#3DE8FF",
},
},
key: "stakeMark[0]",
rules: [
{
message: "请补全桩号",
callback(value, data) {
if (value || data.stakeMark[1]){
return /^0\d{2}|\d{3}$/.test(value);
} else {
return true
}
},
}
],
},
{
prefix: {
text: "+",
style: {
color: "#3DE8FF",
},
},
key: "stakeMark[1]",
rules: [
{
message: "请补全桩号",
callback(value, data) {
if (value || data.stakeMark[0]){
return /^0\d{2}|\d{3}$/.test(value);
} else {
return true
}
},
}
],
},
],
},
};
export const searchFormList = [
{
label: "处理状态:",
@ -24,9 +78,79 @@ export const searchFormList = [
type: "datePicker",
options: {
type: "daterange",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
},
},
{
label: "设备类型:",
key: "deviceType",
type: "select",
clearable: true,
options: {
options: [
{ key: 1, label: "摄像机" },
{ key: 2, label: "可变信息标志" },
{ key: 3, label: "气象监测器" },
{ key: 4, label: "出口诱导灯" },
{ key: 5, label: "语音广播" },
{ key: 6, label: "护栏碰撞" },
{ key: 7, label: "毫米波雷达" },
{ key: 8, label: "合流区预警" },
{ key: 9, label: "智慧锥桶" },
{ key: 10, label: "激光疲劳唤醒" },
{ key: 11, label: "一类交通量调查站" },
{ key: 12, label: "行车诱导" },
{ key: 13, label: "智能设备箱" },
{ key: 14, label: "光线在线监测" },
{ key: 15, label: "太阳能板" },
{ key: 16, label: "远端机" },
{ key: 17, label: "一体机柜" },
{ key: 18, label: "一体机柜空调" }
],
},
},
{
...station,
label: "开始桩号:",
required: false,
},
merge(cloneDeep(station), {
options: {
options: [
{
key: "endStakeMark[0]",
rules: [
{
message: "请补全桩号",
callback(value, data) {
if (value || data.endStakeMark[1]){
return /^0\d{2}|\d{3}$/.test(value);
} else {
return true
}
},
}
],
},
{
key: "endStakeMark[1]",
rules: [
{
message: "请补全桩号",
callback(value, data) {
if (value || data.endStakeMark[0]){
return /^0\d{2}|\d{3}$/.test(value);
} else {
return true
}
},
}
],
},
],
},
label: "结束桩号:",
required: false,
}),
];

57
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/index.vue

@ -153,10 +153,25 @@ export default {
startTime = data.warningTime[0]+' 00:00:00'
endTime = data.warningTime[1]+' 23:59:59'
}
let dStakeMark = data.stakeMark;
let time = data.createTime;
let dendStakeMark = data.endStakeMark;
let stakeMark = dStakeMark[0] ? `K${dStakeMark[0].padStart(3,'0')}+${dStakeMark[1].padStart(3,'0')}` : '';
let endStakeMark = '';
if (dendStakeMark) {
endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0].padStart(3,'0')}+${dendStakeMark[1].padStart(3,'0')}` : '';
}
this.searchData = {
...this.searchData,
status: (data.status===undefined||data.status===''?null:data.status),
startTime: (time===null||time===''?null: time[0]),
endTime: (time===null||time===''?null: time[1]),
deviceType: (data.deviceType===undefined||data.deviceType===''?null:data.deviceType),
stakeMark: stakeMark,
endStakeMark: endStakeMark,
};
this.initData();
},
@ -176,29 +191,29 @@ export default {
// this.deviceTypeCount=result.rows.data
// }).this.$confirm(`:`+deviceTypeCount)
// },
diagnosis(row) {
const self = this;
this.isDiagnosing = true;
request({
url: `/business/switch/deviceDiagnostics`,
method: "post",
data: {
deviceIp:row.deviceIp,
diagnosis(row) {
const self = this;
this.isDiagnosing = true;
request({
url: `/business/switch/deviceDiagnostics`,
method: "post",
data: {
deviceIp:row.deviceIp,
deviceType:row.deviceType
}
}
}).then((result) => {
this.isDiagnosing = false;
if (result.code != 200) {
return Message.error(result?.msg);
}
self.deviceTypeCount = result.msg;
this.isDiagnosing = false;
if (result.code != 200) {
return Message.error(result?.msg);
}
self.deviceTypeCount = result.msg;
self.$confirm(`诊断结果:` + self.deviceTypeCount,"诊断异常",{
type: "warning"
});
}).catch((error) => {
});
}).catch((error) => {
this.isDiagnosing = false;
console.error("请求失败:", error);
});
console.error("请求失败:", error);
});
},
//
showDisposal(row){
@ -221,9 +236,9 @@ export default {
})
}).catch(function() {});
},
//
initData() {
request({
url: `/deviceOfflineRecord/list`,

8
ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue

@ -6,12 +6,12 @@
</section>
<section class="row_02">
<el-tabs class="full_tab" v-model="activeName" @tab-click="changeTabs">
<el-tab-pane label="短临预报" name="first">
<SortFaceForecast :regionList="regionList" />
</el-tab-pane>
<el-tab-pane label="站点气象信息查询" name="second">
<WeatherInfoQuery ref="infoQuery" />
</el-tab-pane>
<el-tab-pane label="短临预报" name="first">
<SortFaceForecast :regionList="regionList" />
</el-tab-pane>
<el-tab-pane label="气象预警" name="third">
<WeatherWarning />
</el-tab-pane>
@ -97,7 +97,7 @@ export default {
.row_01 {
display: flex; flex-direction: row; align-items: stretch;
.unit_02{
width: 49vw;
width: 49vw;
}
.unit_01{ margin-right: 14px;flex:1}
}

Loading…
Cancel
Save