Browse Source

Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!140
sy-water-data-board-ui
潘裕艺 10 months ago
parent
commit
ff8091a593
  1. 6
      src/views/dike/runManage/enginerring/inspectionPlan/index.vue
  2. 11
      src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue
  3. 20
      src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
  4. 6
      src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

6
src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@ -476,11 +476,9 @@ export default {
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.planType === "0" scope.row.planType === "0"
? "日常检查" ? "年度计划"
: scope.row.planType === "1" : scope.row.planType === "1"
? "年度检查" ? "月度计划"
: scope.row.planType === "2"
? "特别检查"
: "-" : "-"
}}</span> }}</span>
</template> </template>

11
src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue

@ -28,7 +28,7 @@
<div class="row-item"> <div class="row-item">
<div class=""> <div class="">
<div class="tc-text2">巡查范围</div> <div class="tc-text2">巡查范围</div>
<div class="tc-text1">{{ detailData.scope }}</div> <div class="tc-text1">{{ detailData.scope || "-" }}</div>
</div> </div>
<div class=""> <div class="">
<div class="tc-text2">巡查路线名称</div> <div class="tc-text2">巡查路线名称</div>
@ -38,7 +38,9 @@
<div class="row-item"> <div class="row-item">
<div class=""> <div class="">
<div class="tc-text2">巡查路线类型</div> <div class="tc-text2">巡查路线类型</div>
<div class="tc-text1">{{ detailData.lineType }}</div> <div class="tc-text1">
{{ getLineTypeLabel(detailData.lineType) }}
</div>
</div> </div>
<div class=""> <div class="">
<div class="tc-text2">巡查人</div> <div class="tc-text2">巡查人</div>
@ -346,6 +348,11 @@ export default {
handleDelImage(rowItem, index) { handleDelImage(rowItem, index) {
rowItem.handleImages.splice(index, 1); rowItem.handleImages.splice(index, 1);
}, },
getLineTypeLabel(type) {
return (
this.xcClassfyOptions.find((v) => v.dictValue === type)?.dictLabel || ""
);
},
submit() { submit() {
return this.detailData; return this.detailData;
}, },

20
src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue

@ -71,7 +71,12 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="巡查路线类型" prop="type" class="ml-24"> <el-form-item label="巡查路线类型" prop="type" class="ml-24">
<el-select :disabled="!canEdit" class="w-240" v-model="formData.type"> <el-select
:disabled="!canEdit"
class="w-240"
v-model="formData.type"
@change="handleChangeLineType"
>
<el-option <el-option
v-for="(item, index) in xcClassfyOptions" v-for="(item, index) in xcClassfyOptions"
:key="index" :key="index"
@ -138,6 +143,7 @@
remote remote
reserve-keyword reserve-keyword
@change="handleChangeXcItem" @change="handleChangeXcItem"
@focus="handleGetRemoteProjectMethod('')"
placeholder="请输入关键词搜索" placeholder="请输入关键词搜索"
:remote-method="handleGetRemoteProjectMethod" :remote-method="handleGetRemoteProjectMethod"
> >
@ -305,7 +311,7 @@ export default {
timeView: { timeView: {
timeField: "create_time", timeField: "create_time",
}, },
type: "", type: this.formData.type || "",
}, },
cv: { cv: {
name: "name", name: "name",
@ -437,7 +443,15 @@ export default {
this.checkTreeData = _treeData; this.checkTreeData = _treeData;
}); });
}, },
// 线
handleChangeLineType() {
if (this.formData.xcId) {
this.formData.xcName = "";
this.formData.xcId = "";
this.xcProjectList = [];
this.checkTreeData = [];
}
},
handleChangeXcItem(val) { handleChangeXcItem(val) {
const res = this.xcProjectList.find((item) => item.name === val); const res = this.xcProjectList.find((item) => item.name === val);
if (res.id) { if (res.id) {

6
src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

@ -309,7 +309,11 @@
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" align="center" label="巡查路线名称" /> <el-table-column prop="name" align="center" label="巡查路线名称">
<template #default="{ row }">
{{ row.name }}
</template>
</el-table-column>
<el-table-column prop="type" align="center" label="巡查类型"> <el-table-column prop="type" align="center" label="巡查类型">
<template #default="{ row }"> <template #default="{ row }">
{{ {{

Loading…
Cancel
Save