SunTao/xjsaas-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改定时器时间，修改路段查询条件

Browse Source
This commit is contained in:
SunTao
2025-01-21 13:02:19 +08:00
parent 1f407be64e
commit 9e7ffe485a
9 changed files with 373 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/components/Navbar.vue
+4 -1
View File
@@ -207,9 +207,12 @@ export default {
if (code === 200) {
this.messageList = rows;
this.noticeNum = total;
if(total > 99){
clearInterval(this.messageTimer);
}
}
});
}, 5000);
}, 120000);
getNoticeList({ read: 1 }).then(({ code, rows, total }) => {
if (code === 200) {
this.messageList = rows;
src/views/big-screen/index.vue
+6 -3
View File
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-10-17 11:34:00
* @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-01-10 15:24:02
* @LastEditTime: 2025-01-21 11:32:51
* @FilePath: \znxjxt-ui\src\views\big-screen\index.vue
* @Description: 大屏首页
-->
@@ -719,9 +719,12 @@ export default {
if (code === 200) {
this.messageList = rows;
this.noticeNum = total;
if(total > 99){
clearInterval(this.messageTimer);
}
}
});
}, 5000);
}, 120000);
getNoticeList({ read: 1 }).then(({ code, rows, total }) => {
if (code === 200) {
this.messageList = rows;
@@ -1142,7 +1145,7 @@ export default {
};
}
mapLineList(data).then(({ code, data }) => {
if (code === 200 && data) {
if (code === 200 && data.lines.length > 0) {
this.mapLegendList = data.basLinetypeSetting;
this.lineString = data.lines;
this.drawLine();
src/views/big-screen/overview-components/inspection-vehicles.vue
+2 -2
View File
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-11-08 09:40:18
* @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-12-27 16:01:37
* @LastEditTime: 2025-01-21 11:27:56
* @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue
* @Description: 总览大屏-巡检车辆
-->
@@ -238,7 +238,7 @@ export default {
}
}
);
}, 5000);
}, 120000);
getCarList({ no: this.tableInput, companyId: this.companyId }).then(
({ code, data }) => {
if (code === 200) {
src/views/xj/document/maintenance-notice/components/edit-dialog.vue
+340 -12
View File
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-11-20 11:58:33
* @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-01-15 16:18:16
* @LastEditTime: 2025-01-21 11:14:24
* @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\components\edit-dialog.vue
* @Description: 养护通知单编辑弹窗
-->
@@ -16,7 +16,139 @@
label-width="7rem"
>
<el-row :gutter="24">
<el-col :span="24">
<el-col :span="6">
<el-form-item label="病害成因:" prop="value2">
<el-select
v-model="editForm.value2"
placeholder="请选择病害成因"
clearable
>
<el-option
v-for="item in value2List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="路段类型:" prop="value1">
<el-select
v-model="editForm.value1"
placeholder="请选择路段类型"
clearable
>
<el-option
v-for="item in value1List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工区:" prop="value3">
<el-select
v-model="editForm.value3"
placeholder="请选择工区"
clearable
>
<el-option
v-for="item in value3List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="病害来源:" prop="value4">
<el-select
v-model="editForm.value4"
placeholder="请选择病害来源"
clearable
>
<el-option
v-for="item in value4List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="工作站:" prop="value5">
<el-select
v-model="editForm.value5"
placeholder="请选择工作站"
clearable
>
<el-option
v-for="item in value5List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车道:" prop="value7">
<el-select
v-model="editForm.value7"
placeholder="请选择车道"
clearable
>
<el-option
v-for="item in value7List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="桥梁:" prop="value8">
<el-select
v-model="editForm.value8"
placeholder="请选择方向"
clearable
>
<el-option
v-for="item in value8List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="隧道:" prop="value9">
<el-select
v-model="editForm.value9"
placeholder="请选择方向"
clearable
>
<el-option
v-for="item in value9List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="道路名称:" prop="segmentId">
<el-select
v-model="editForm.segmentId"
@@ -32,18 +164,114 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开始桩号:" prop="stakeStart">
<el-input v-model="editForm.stakeStart" placeholder="K0000+000" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="结束桩号:" prop="stakeEnd">
<el-input v-model="editForm.stakeEnd" placeholder="K0000+000" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="方向:" prop="value6">
<el-select
v-model="editForm.value6"
placeholder="请选择方向"
clearable
>
<el-option
v-for="item in value6List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="收费站:" prop="value10">
<el-select
v-model="editForm.value10"
placeholder="请选择路段"
clearable
>
<el-option
v-for="item in value10List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="收费站位置:" prop="value11">
<el-select
v-model="editForm.value11"
placeholder="请选择路段"
clearable
>
<el-option
v-for="item in value11List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="匝道类型:" prop="value12">
<el-select
v-model="editForm.value12"
placeholder="请选择匝道类型"
clearable
>
<el-option
v-for="item in value12List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="匝道立交:" prop="value13">
<el-select
v-model="editForm.value13"
placeholder="请选择匝道立交"
clearable
>
<el-option
v-for="item in value13List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="匝道立交方向:" prop="value14">
<el-select
v-model="editForm.value14"
placeholder="请选择匝道立交方向"
clearable
>
<el-option
v-for="item in value14List"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="24">
<el-col :span="24">
@@ -91,8 +319,11 @@
</el-form>
<el-card shadow="never">
<div slot="header" class="clearfix">
<span>选择病害</span>
<el-button style="float: right; padding: 3px 0" type="text"
<span style="font-size: 1.2rem">选择病害</span>
<el-button
style="float: right; padding: 3px 0"
type="text"
@click="viewSelected"
>查看已选数据</el-button
>
</div>
@@ -104,9 +335,9 @@
:inline="true"
label-width="100px"
>
<el-form-item label="道路名称" prop="segmentName">
<el-form-item label="道路名称" prop="segmentId">
<el-select
v-model="diseaseForm.segmentName"
v-model="diseaseForm.segmentId"
placeholder="请选择路段"
filterable
clearable
@@ -382,6 +613,34 @@ export default {
return {
// 编辑表单
editForm: {
// 病害成因
value2: "",
// 路段类型
value1: "",
// 工区id
value3: "",
// 病害来源
value4: "",
// 工作站id
value5: "",
// 方向
value6: "",
// 车道
value7: "",
// 桥梁
value8: "",
// 隧道
value9: "",
// 收费站
value10: "",
// 收费站位置
value11: "",
// 匝道类型
value12: "",
// 匝道立交
value13: "",
// 匝道立交方向
value14: "",
// 病害id
defectId: "",
// 道路名称
@@ -395,8 +654,70 @@ export default {
// 养护内容
// taskDescription: [""],
},
// 病害成因下拉数据
value2List: [],
// 路段类型下拉数据
value1List: [],
// 工区下拉数据
value3List: [],
// 病害来源下拉数据
value4List: [],
// 工作站下拉数据
value5List: [],
// 方向下拉
value6List: [],
// 车道下拉
value7List: [],
// 桥梁下拉
value8List: [],
// 隧道下拉
value9List: [],
// 收费站下拉
value10List: [],
// 收费站位置下拉
value11List: [],
// 匝道下拉
value12List: [],
// 匝道立交下拉
value13List: [],
// 匝道立交方向下拉
value14List: [],
// 表单验证规则
rules: {
value2: [
{
required: true,
message: "请选择病害成因",
trigger: "change",
},
],
value1: [
{ required: true, message: "请选择路段类型", trigger: "change" },
],
value3: [{ required: true, message: "请选择工区", trigger: "change" }],
value4: [
{ required: true, message: "请选择病害来源", trigger: "change" },
],
value5: [
{ required: true, message: "请选择工作站", trigger: "change" },
],
value6: [{ required: true, message: "请选择方向", trigger: "change" }],
value7: [{ required: true, message: "请选择车道", trigger: "change" }],
value8: [{ required: true, message: "请选择桥梁", trigger: "change" }],
value9: [{ required: true, message: "请选择隧道", trigger: "change" }],
value10: [
{ required: true, message: "请选择收费站", trigger: "change" },
],
value11: [
{ required: true, message: "请选择收费站位置", trigger: "change" },
],
value12: [{ required: true, message: "请选择匝道", trigger: "change" }],
value13: [
{ required: true, message: "请选择匝道立交", trigger: "change" },
],
value14: [
{ required: true, message: "请选择匝道立交方向", trigger: "change" },
],
segmentId: [
{ required: true, message: "请选择路段", trigger: "change" },
],
@@ -442,7 +763,7 @@ export default {
// 病害列表查询条件
diseaseForm: {
segmentName: "",
segmentId: "",
defectType: "",
classType: "",
taskId: "",
@@ -488,7 +809,7 @@ export default {
handler(val) {
this.editForm = {
...val,
segmentId: val.segmentId === "未知路段" ? "" : val.segmentId,
segmentId: val.segmentId === "999999999" ? "" : val.segmentId,
id: null,
defectId: val.id,
createdTime: null,
@@ -613,6 +934,13 @@ export default {
}
});
},
/**
* @description: 查看已选中的表格数据
* @param {*}
* @return {*}
*/
viewSelected() {},
},
};
</script>
src/views/xj/document/maintenance-notice/index.vue
+4 -4
View File
@@ -16,9 +16,9 @@
:inline="true"
label-width="5rem"
>
<el-form-item label="道路名称" prop="segmentName">
<el-form-item label="道路名称" prop="segmentId">
<el-select
v-model="noticeForm.segmentName"
v-model="noticeForm.segmentId"
placeholder="请选择路段"
clearable
filterable
@@ -356,7 +356,7 @@ export default {
// 查询表单
noticeForm: {
// 道路名称
segmentName: "",
segmentId: "",
// 上下行
inspectDirection: "",
// 是否紧急
@@ -511,7 +511,7 @@ export default {
this.$refs.noticeForm.resetFields();
this.noticeForm = {
// 道路名称
segmentName: "",
segmentId: "",
// 上下行
inspectDirection: "",
// 是否紧急
src/views/xj/inspection-report/daily-monitoring/index.vue
+3 -3
View File
@@ -16,9 +16,9 @@
:inline="true"
label-width="5rem"
>
<el-form-item label="道路名称" prop="segmentName">
<el-form-item label="道路名称" prop="segmentId">
<el-select
v-model="dailyForm.segmentName"
v-model="dailyForm.segmentId"
placeholder="请选择路段"
clearable
>
@@ -73,7 +73,7 @@ export default {
data() {
return {
dailyForm: {
segmentName: "",
segmentId: "",
},
// 选择分公司下拉数据
segmentList: [],
src/views/xj/inspection/confirmation-management/index.vue
+4 -4
View File
@@ -17,9 +17,9 @@
:inline="true"
label-width="100px"
>
<el-form-item label="道路名称" prop="segmentName">
<el-form-item label="道路名称" prop="segmentId">
<el-select
v-model="queryParams.segmentName"
v-model="queryParams.segmentId"
placeholder="请选择路段"
clearable
filterable
@@ -324,7 +324,7 @@ export default {
return {
// 搜索表单参数
queryParams: {
segmentName: "",
segmentId: "",
classType: "",
defectType: "",
state: "",
@@ -495,7 +495,7 @@ export default {
*/
resetQuery() {
this.queryParams = {
segmentName: "",
segmentId: "",
defectType: "",
state: "",
inspectDirection: "",
src/views/xj/inspection/disease-management/components/merge-dialog.vue
+5 -5
View File
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-11-04 10:54:59
* @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-01-14 11:49:25
* @LastEditTime: 2025-01-21 10:48:00
* @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\components\merge-dialog.vue
* @Description: 病害管理-合并病害弹窗
-->
@@ -19,9 +19,9 @@
>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="道路名称" prop="segmentName">
<el-form-item label="道路名称" prop="segmentId">
<el-select
v-model="mergeForm.segmentName"
v-model="mergeForm.segmentId"
placeholder="请选择路段"
clearable
>
@@ -269,7 +269,7 @@ export default {
// 表单绑定
mergeForm: {
// 道路名称绑定
segmentName: "",
segmentId: "",
// 病害类型绑定
classType: "",
defectType: "",
@@ -356,7 +356,7 @@ export default {
this.searchForm = {};
this.mergeForm = {
// 道路名称绑定
segmentName: "",
segmentId: "",
// 病害类型绑定
defectType: "",
classType: "",
src/views/xj/inspection/road-management/index.vue
+5 -5
View File
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-10-11 15:14:16
* @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-01-15 16:52:53
* @LastEditTime: 2025-01-21 10:48:28
* @FilePath: \znxjxt-ui\src\views\xj\inspection\road-management\index.vue
* @Description: 巡检信息-路产管理
-->
@@ -17,9 +17,9 @@
:inline="true"
label-width="100px"
>
<el-form-item label="道路名称" prop="segmentName">
<el-form-item label="道路名称" prop="segmentId">
<el-select
v-model="queryParams.segmentName"
v-model="queryParams.segmentId"
placeholder="请选择道路名称"
filterable
clearable
@@ -390,7 +390,7 @@ export default {
// 查询表单
queryParams: {
// 道路名称
segmentName: "",
segmentId: "",
// 路产类型
equipmentType: "",
// 校验状态
@@ -555,7 +555,7 @@ export default {
resetQuery() {
this.searchForm = {};
this.queryParams = {
segmentName: "",
segmentId: "",
equipmentType: "",
dataStatus: "",
inspectDirection: "",