Browse Source

2024-08-15

develop
王钦 3 months ago
parent
commit
2ce4a69a98
  1. 6
      ruoyi-ui/src/api/MonthlyEquipment/index.js
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue
  3. 16
      ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
  4. 1
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/data/lcz.json
  5. 15
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
  6. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  7. 16
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
  8. 11
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue
  9. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue
  10. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
  11. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/index.vue
  12. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
  13. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
  14. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue
  15. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/charts.js
  16. 1
      ruoyi-ui/src/views/equipment/eqlist/index.vue
  17. 1
      ruoyi-ui/src/views/event/event/workBench.vue
  18. 1
      ruoyi-ui/src/views/event/strategy/event/autoControl.vue
  19. 1
      ruoyi-ui/src/views/workbench/config/components/offlineDeviceModal.vue
  20. 1
      ruoyi-ui/src/views/workbench/config/index.vue
  21. 4
      ruoyi-ui/vue.config.js

6
ruoyi-ui/src/api/MonthlyEquipment/index.js

@ -56,9 +56,9 @@ export function getSystemStatusExport(query) {
url += "&stakeMark=" +
query.stakeMark
}
if(query.deviceStatus){
url += "&deviceStatus=" +
query.deviceStatus
if(query.deviceState){
url += "&deviceState=" +
query.deviceState
}
if(query.useState){
url += "&useState=" +

2
ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue

@ -1,5 +1,5 @@
<template>
<component :is="getComponent(item.type)" v-bind="getBindData(item)" v-model="obverseValue"
<component :validate-event="false" :is="getComponent(item.type)" v-bind="getBindData(item)" v-model="obverseValue"
v-on="resolveListeners(item.ons)" :_config="item" />
</template>

16
ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue

@ -2,11 +2,12 @@
<ElForm :style="getStyle()" :model="modelFormData" :label-width="labelWidth" class="FormConfig" ref="ElFormRef"
size="mini">
<template v-for="(item, index) in formList">
<ElFormItem class="formItem" :rules="getRules(item)" v-if="formItemVisible(item)" :key="`${item.key}|${index}`"
<ElFormItem :class="item.required?'formItem formSelfReauired':'formItem'" :rules="getRules(item)" v-if="formItemVisible(item)" :key="`${item.key}|${index}`"
:label="item.label" :style="gridStyle(item, index)"
:prop="item.type !== 'MultipleLabelItem' ? item.key : void 0" :required="item.required">
:prop="item.type !== 'MultipleLabelItem' ? item.key : void 0">
<slot :name="item.key" :data="item" :formData="modelFormData">
<ProxyCom :value="getValue(item)" :item="item" @update:value="(data) => updateValue(item, data)" />
<!-- <component :is="getComponent(item.type)" v-bind="getBindData(item)" v-model="modelFormData[item.key]"
v-on="resolveListeners(item.ons)" /> -->
</slot>
@ -237,14 +238,14 @@ export default {
`${item.options?.placeholder || `${item.label}不能为空`}`
)
);
const err = ruleMatch(value);
if (err) return callback(err);
callback();
},
trigger: ["blur", "change"],
trigger: [],
},
];
else if (item.rules?.length)
@ -261,7 +262,7 @@ export default {
callback();
},
trigger: ["blur", "change"],
trigger: [],
},
];
},
@ -278,6 +279,11 @@ export default {
</script>
<style lang="scss" scoped>
::v-deep .formSelfReauired .el-form-item__label::before{
content: "*";
color: #ff4949;
margin-right: 4px;
}
.list-item {
display: inline-block;
margin-right: 10px;

1
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/data/lcz.json

@ -1091,7 +1091,6 @@
"K208+672":{"lng":116.0766,"lat":35.466565},
"K208+835":{"lng":116.075473,"lat":35.46542},
"K208+973":{"lng":116.07452,"lat":35.464456},
"K209+141":{"lng":116.073341,"lat":35.46329},
"K209+269":{"lng":116.072449,"lat":35.462398},
"K209+376":{"lng":116.071702,"lat":35.461652},

15
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue

@ -146,12 +146,21 @@ export default {
async handleSearch() {
const data = await this.$refs.FormConfigRef.validate();
if (!data.startStakeMark[0] || !data.startStakeMark[1])
if (!data.startStakeMark[0] || !data.startStakeMark[1]){
delete data.startStakeMark;
if (!data.endStakeMark[0] || !data.endStakeMark[1])
} else {
data.startStakeMark[0] = data.startStakeMark[0].padStart(3,'0')
data.startStakeMark[1] = data.startStakeMark[1].padStart(3,'0')
}
if (!data.endStakeMark[0] || !data.endStakeMark[1]){
delete data.endStakeMark;
} else {
data.endStakeMark[0] = data.endStakeMark[0].padStart(3,'0')
data.endStakeMark[1] = data.endStakeMark[1].padStart(3,'0')
}
this.activeIcon = null;
console.log(data, "data");
this.filterEnd(data);
},
async getDeviceTypeOptions() {

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

@ -19,6 +19,8 @@ const cameraIcon = {
"c1": require("@screen/images/deviceType/ballc_fault.svg"),
"d0": require("@screen/images/deviceType/balld_active.svg"),
"d1": require("@screen/images/deviceType/balld_fault.svg"),
"e0": require("@screen/images/deviceType/balle_active.svg"),
"e1": require("@screen/images/deviceType/balle_fault.svg"),
};
const boardIcon = {
// 雨棚

16
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js

@ -6,6 +6,8 @@ import { upperFirst, filter } from "lodash";
import {
WarningSubclassOptions,
} from "@screen/utils/enum.js";
import { getLnglat } from "./dataoffset";
/**
* @typedef {Object} Point
* @property {number} weight - The weight of the item.
@ -120,15 +122,16 @@ export class MarkerCluster {
}
}
const lnglat = getLnglat(e.extData)
aryPoints.push({
type: 'event', //类型。例如:交通事件、故障停车、摄像机等 【必传字段】
longitude: e.lnglat[0], //点坐标经度 【必传字段】
latitude: e.lnglat[1], //点坐标纬度 【必传字段】
longitude: lnglat[0], //点坐标经度 【必传字段】
latitude: lnglat[1], //点坐标纬度 【必传字段】
iconUrl: getIcon(e,'b'), // 图标 【必传字段】
// offset:[0,-65],
// size:[64,120],
offset: [0,-48],
size: [42,100],
GGoffsetX: 0,
GGoffsetY: 20,
otherInfo: {
...e,
stake: _stake,
@ -140,6 +143,7 @@ export class MarkerCluster {
}
})
if(aryPoints.length > 0){
console.log(aryPoints)
map2d.addPointByArr(
{pointList:aryPoints}, // 点位数据数组(按以下规范组装)
'jhlayers', // 当前添加的数据 唯一标识(删除该图层时也会用到)//./事件专题/交通事故.svg

11
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue

@ -160,6 +160,7 @@ export default {
10: "疲劳唤醒",
12: "行车诱导",
13: "设备箱",
15: "太阳能板",
16: "远端机"
}
if (result.code != 200) return;
@ -174,8 +175,14 @@ export default {
resCodes.push(i.result.code)
}
}
const resParam = JSON.parse(e.operParam)[0].devices
const aryRemark = [];
let resParam = {}
try{
resParam = JSON.parse(e.operParam)[0].devices
}catch(e){
console.log(e,'error')
resParam = [{deviceType:''}]
}
let aryRemark = [];
e.remark.split('_').filter(x=>{
aryRemark.push(x)
})

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue

@ -71,8 +71,6 @@ export default {
config[config.length-1].options.options = config[config.length-1].options.options.slice(0,7)
const value = this.eventSubclass;
let facilityType = 1;
if (value == "3-2") {
facilityType = 1;

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

@ -150,6 +150,12 @@ export default {
methods: {
handleSelect(activeName) {
this.activeName = activeName;
this.searchData={
pageSize: 12,
pageNum: 1,
eventState: null,
}
this.searchData.eventState = activeName == "-1" ? null : activeName;
this.searchData.pageSize = activeName==='-1'?12:15;
this.searchFormList = activeName == "-1" ? gjSearchFormList : gzSearchFormList ;;

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/index.vue

@ -150,7 +150,7 @@ export default {
}
.legend-num,
.legend-percert {
width: 50px;
width: 80px;
display: flex;
justify-content: center;
align-items: center;

3
ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue

@ -142,9 +142,6 @@ export default {
methods: {
onExportClick(){
const _data = this.data;
if(_data.type === 'year'){
_data.warningTime = _data.warningTime.substr(0,4)
}
exportFile({
method:'get',
url: "/perceivedEvents/warning/exportNonAutomaticWarningTimeType",

4
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js

@ -158,7 +158,7 @@ export const searchFormList2 = [
},
{
label: "使用状态:",
key: "deviceStatus",
key: "useState",
type: "select",
options: {
options: [
@ -169,7 +169,7 @@ export const searchFormList2 = [
},
{
label: "设备状态:",
key: "useState",
key: "deviceState",
type: "select",
options: {
options: [

4
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue

@ -30,8 +30,8 @@
</div>
</template>
</ElTableColumn>
<ElTableColumn prop="lossRate" width="80" label="丢包率"></ElTableColumn>
<ElTableColumn prop="rttAvg" width="80" label="平均延时"></ElTableColumn>
<ElTableColumn prop="lossRate" width="80" label="丢包率%"></ElTableColumn>
<ElTableColumn prop="rttAvg" width="80" label="平均延时ms"></ElTableColumn>
<ElTableColumn prop="networkQuality" width="80" label="网络质量"> </ElTableColumn>
<ElTableColumn prop="monitorTime" label="检测时间"> </ElTableColumn>
</Table>

2
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/charts.js

@ -16,9 +16,9 @@ let xData = [
];
let data1 = [200, 530, 920, 400, 600, 700, 300, 800, 900, 120, 570, 800];
let options = {
color: ["#30A0FF", "#69FAA1"],
tooltip: {
trigger: "axis",
valueFormatter: function (value) {
return value + " 起";
},

1
ruoyi-ui/src/views/equipment/eqlist/index.vue

@ -1357,7 +1357,6 @@ export default {
},
//
changeEqType(data) {
console.log(data, "data");
this.form.fEqId = null;
if (data == 0) {
this.showPlc = false;

1
ruoyi-ui/src/views/event/event/workBench.vue

@ -1606,7 +1606,6 @@
},
//
handleNodeClick(data) {
console.log(data, "data");
// children
if (data.children) {
//

1
ruoyi-ui/src/views/event/strategy/event/autoControl.vue

@ -648,7 +648,6 @@ export default {
},
//
getMsgFormSon(data) {
console.log(data, "data");
this.$set(
this.strategyForm.autoControl[data.index],
"content",

1
ruoyi-ui/src/views/workbench/config/components/offlineDeviceModal.vue

@ -503,7 +503,6 @@
},
//
changeEqType(data) {
console.log(data, "data");
this.form.fEqId = null;
if (data == 0) {
this.showPlc = false;

1
ruoyi-ui/src/views/workbench/config/index.vue

@ -2577,7 +2577,6 @@
},
//
handleNodeClick(data) {
// console.log(data, "data");
// children
if (data.children) {
//

4
ruoyi-ui/vue.config.js

@ -37,13 +37,13 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://127.0.0.1:8087`,
// target:`http://10.0.111.11:8097`,
target:`http://10.0.111.11:8097`,
// target: `http://10.168.66.196:8087`, //刘文阁
// target: `http://10.168.68.42:8087`, //王思祥
// target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟凡峰
// target: `http://10.168.79.46:8089`, //王家宝
target: `http://10.168.77.128:8087`, //王兴琳
// target: `http://10.168.77.128:8087`, //王兴琳
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",

Loading…
Cancel
Save