Browse Source

Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

sy-water-data-board-ui
hxh 1 month ago
parent
commit
55985114c0
  1. 10
      src/layout/components/Navbar.vue
  2. 36
      src/store/modules/permission.js
  3. 12
      src/views/dike/runManage/dangerWeakProject/inspectGroup/index.vue
  4. 8
      src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/index.vue
  5. 11
      src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
  6. 7
      src/views/dike/runManage/dangerWeakProject/inspectProjects/index.vue
  7. 2
      src/views/dike/runManage/dangerWeakProject/inspectReport/index.vue
  8. 2
      src/views/dike/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
  9. 7
      src/views/dike/runManage/dangerWeakProject/inspectStatistics/index.vue
  10. 7
      src/views/dike/runManage/dangerWeakProject/inspectTasks/index.vue
  11. 3
      src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
  12. 3
      src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
  13. 3
      src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
  14. 75
      src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
  15. 29
      src/views/dike/runManage/patrolMaintenance/defectList/index.vue
  16. 5
      src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
  17. 10
      src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue
  18. 3
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
  19. 73
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
  20. 2
      src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
  21. 12
      src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
  22. 12
      src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
  23. 2
      src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
  24. 8
      src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
  25. 10
      src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
  26. 12
      src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue
  27. 8
      src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/index.vue
  28. 8
      src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue
  29. 7
      src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue
  30. 2
      src/views/sluice/runManage/dangerWeakProject/inspectReport/index.vue
  31. 2
      src/views/sluice/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
  32. 7
      src/views/sluice/runManage/dangerWeakProject/inspectStatistics/index.vue
  33. 15
      src/views/sluice/runManage/dangerWeakProject/inspectTasks/index.vue
  34. 3
      src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
  35. 3
      src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
  36. 3
      src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
  37. 75
      src/views/sluice/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
  38. 30
      src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
  39. 5
      src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
  40. 10
      src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue
  41. 3
      src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
  42. 8
      src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue
  43. 10
      src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
  44. 4
      vue.config.js

10
src/layout/components/Navbar.vue

@ -146,9 +146,16 @@ export default {
}
}
},
mounted() {
if (!this.selectTab) {
let res = this.newTopMenus.find((v) => v.label === "一张图");
if (res) {
this.handleSelectTab(res);
}
}
},
methods: {
handleSelectTab(e) {
console.log("handleSelectTab >>> ", e);
sessionStorage.setItem("topTab", e.value);
this.$store.dispatch("changeTopTab", e.value);
if (e.value === "sluice") {
@ -166,7 +173,6 @@ export default {
},
});
} else if (e.label === "一张图") {
console.log("e >>> ", e);
if (
typeof e.component === "string" &&
e.component.toLowerCase() === "iframe"

36
src/store/modules/permission.js

@ -19,7 +19,7 @@ const permission = {
routes: [],
addRoutes: [],
originRoutes: [],
selectTab: sessionStorage.getItem("topTab") || "dike",
selectTab: sessionStorage.getItem("topTab") || "",
namesJumpMenu: [], // 跳转菜单
},
mutations: {
@ -164,6 +164,7 @@ const permission = {
// 切换tab
changeTopTab({ commit, dispatch }, payload) {
console.log("payload >>>>> ", payload);
commit("SET_SELECT_TAB", payload);
dispatch("changeRoutes");
},
@ -199,30 +200,37 @@ function filterAsyncRouter(asyncRouterMap) {
function resolveChildrenRoutes(routes, pickRoute = permission.state.selectTab) {
if (!routes?.length) return;
let pickRoutePath = `/${pickRoute}`;
let tempRoutesArr = [];
let tempRoutesNameArr = [];
let newChildrenRoutes = [];
if (!pickRoutes.includes(pickRoutePath)) {
// TODO
}
let pathPickRoutesArr = [];
let namePickRoutesArr = [];
// 去掉掉不需要的菜单
let newRoutes = routes.filter((v) => {
// 提取需要拾取的路由菜单
if (pickRoutes.includes(v.path)) {
tempRoutesArr.push(v);
pathPickRoutesArr.push(v);
}
// 只要是名称叫“一张图”的都不展示在菜单上
if (v.meta?.title && pickRouteNames.includes(v.meta.title)) {
if (!v.hidden)
tempRoutesNameArr.push({
if (!v.hidden) {
namePickRoutesArr.push({
...v,
label: v.meta.title,
value: v.path,
});
}
}
return !pickRoutes.includes(v.path) && v.meta?.title !== "一张图";
});
if (tempRoutesArr.length) {
let parentRoute = tempRoutesArr.filter(
// 提取三大模块菜单的子路由
let pickChildrenRoutes = [];
if (pathPickRoutesArr.length) {
let parentRoute = pathPickRoutesArr.filter(
(v) => v.path === pickRoutePath
)?.[0];
if (parentRoute) {
newChildrenRoutes =
pickChildrenRoutes =
parentRoute.children
?.map((v) => {
return {
@ -252,18 +260,18 @@ function resolveChildrenRoutes(routes, pickRoute = permission.state.selectTab) {
}
}
// tempRoutesNameArr 赋值给 namesJumpMenu
permission.state.namesJumpMenu = tempRoutesNameArr;
// namePickRoutesArr 赋值给 namesJumpMenu
permission.state.namesJumpMenu = namePickRoutesArr;
return {
topTabList: tempRoutesArr.map((v) => {
topTabList: pathPickRoutesArr.map((v) => {
return {
orderNum: v.orderNum,
label: v.meta.title,
value: v.path.slice(1),
};
}),
newRoutes: [...newChildrenRoutes, ...newRoutes],
newRoutes: [...pickChildrenRoutes, ...newRoutes],
};
}

12
src/views/dike/runManage/dangerWeakProject/inspectGroup/index.vue

@ -218,7 +218,7 @@ export default {
class="search-btn mb-10"
style="margin-right: 16px"
type="success"
v-hasPermi="['df:run:jc:group:add']"
v-hasPermi="['df:run:dangerProj:group:add']"
@click="handleAddNew()"
>创建</el-button
>
@ -243,18 +243,22 @@ export default {
<el-table-column prop="deptName" align="center" label="创建单位" />
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['df:run:dangerProj:group:view']"
>查看</el-button
>
<el-button
v-hasPermi="['df:run:jc:group:edit']"
v-hasPermi="['df:run:dangerProj:group:edit']"
type="text"
size="small"
@click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button
v-hasPermi="['df:run:jc:group:delete']"
v-hasPermi="['df:run:dangerProj:group:delete']"
type="text"
size="small"
@click="handleDel(scope.row)"

8
src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@ -4,7 +4,12 @@
<div class="items-list-page slider-right-body">
<div class="pl-20 pr-20 pt-20 flex justify-between">
<el-button type="primary" @click="handleAddNew">新增项目</el-button>
<el-button
type="primary"
@click="handleAddNew"
v-hasPermi="['df:run:dangerProj:items:add']"
>新增项目</el-button
>
</div>
<div class="items-list-box">
<div
@ -31,6 +36,7 @@
</div>
<i
class="el-icon-error font-14 del-btn"
v-hasPermi="['df:run:dangerProj:items:delete']"
@click.stop="handleDel(item)"
></i>
</div>

11
src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue

@ -276,23 +276,27 @@ export default {
>
<div
class="question-row w-full"
v-for="item2 in item.children"
v-for="(item2, index2) in item.children"
:key="item2.id"
>
<div class="flex">
<div class="question-col flex-shrink-0">问题</div>
<div class="question-col flex-shrink-0">
检查项{{ index2 + 1 }}
</div>
<div class="question-col flex-1">
{{ item2.content }}
</div>
</div>
<div class="question-select">
<el-button
size="small"
:disabled="isDisabled"
:type="item2.level === '0' ? 'primary' : ''"
@click="item2.level = '0'"
>正常</el-button
>
<el-button
size="small"
:disabled="isDisabled"
:type="item2.level === '1' ? 'primary' : ''"
@click="item2.level = '1'"
@ -359,6 +363,7 @@ export default {
:limit="99"
>
<el-button
size="small"
type="primary"
@click="handleClickItem(item2)"
:disabled="isDisabled"
@ -451,6 +456,8 @@ export default {
.question-select {
padding: 10px;
border-bottom: 1px solid #f0f0f0;
display: flex;
justify-content: center;
}
}
}

7
src/views/dike/runManage/dangerWeakProject/inspectProjects/index.vue

@ -331,7 +331,11 @@ export default {
</el-table-column>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['df:run:dangerProj:proj:view']"
>查看</el-button
>
<el-button
@ -339,6 +343,7 @@ export default {
v-if="scope.row.state != '1'"
size="small"
@click="handleEdit(scope.row)"
v-hasPermi="['df:run:dangerProj:proj:check']"
>核查</el-button
>
<el-button

2
src/views/dike/runManage/dangerWeakProject/inspectReport/index.vue

@ -285,7 +285,7 @@ export default {
type="text"
size="small"
@click="handleCheckReport(scope.row)"
v-hasPermi="['df:run:jc:report:view']"
v-hasPermi="['df:run:dangerProj:report:view']"
>查看报告</el-button
>
</template>

2
src/views/dike/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue

@ -146,7 +146,7 @@ export default {
border-bottom: 1px solid #e5e5e5;
}
.canvas {
width: 500px;
width: 100%;
height: 200px;
padding: 10px;
}

7
src/views/dike/runManage/dangerWeakProject/inspectStatistics/index.vue

@ -260,7 +260,7 @@ export default {
ref="pieRef2"
title="任务数统计"
echartsTitle="任务总数"
class="question-item ml-20"
class="question-item"
:itemData="questionLevelList.slice(4, 6)"
></Pie>
<Pie
@ -310,13 +310,8 @@ export default {
}
}
.question-box {
display: flex;
flex-wrap: wrap;
padding: 24px;
.question-item {
flex-shrink: 0;
width: 48%;
margin-right: 10px;
margin-bottom: 12px;
}
}

7
src/views/dike/runManage/dangerWeakProject/inspectTasks/index.vue

@ -271,7 +271,7 @@ export default {
class="search-btn"
style="margin-left: auto"
type="success"
v-hasPermi="['df:run:jc:task:add']"
v-hasPermi="['df:run:dangerProj:task:add']"
@click="handleGoDetails()"
>添加</el-button
>
@ -310,17 +310,18 @@ export default {
type="text"
size="small"
@click="handlePreview(scope.row)"
v-hasPermi="['df:run:dangerProj:task:view']"
>查看</el-button
>
<el-button
v-hasPermi="['df:run:jc:task:edit']"
v-hasPermi="['df:run:dangerProj:task:edit']"
type="text"
size="small"
@click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button
v-hasPermi="['df:run:jc:task:delete']"
v-hasPermi="['df:run:dangerProj:task:delete']"
type="text"
size="small"
@click="handleDel(scope.row)"

3
src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue

@ -134,7 +134,8 @@
:data="tableData"
border
>
<el-table-column prop="id" align="center" label="单号"/>
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="checkingName" align="center" label="巡查名称"/>
<el-table-column prop="type" align="center" label="巡查类型">
<template slot-scope="scope">

3
src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue

@ -149,7 +149,8 @@
<div class="line" ref="lineRef"></div>
</div>
<el-table :height="tableHeight" :data="tableData" border>
<el-table-column prop="id" align="center" label="单号" />
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="detail.name" align="center" label="巡查名称" />
<el-table-column align="center" label="巡查类型">
<template slot-scope="scope">

3
src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue

@ -30,7 +30,7 @@
:disabled="$route.query.mode === 'check'"
v-model="form.time"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -107,7 +107,6 @@
<el-select
clearable
size="small"
class="w-202 ml-10"
:disabled="$route.query.mode === 'check'"
v-model="scope.row.itemId"
filterable

75
src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue

@ -180,6 +180,51 @@
</template>
</el-table-column>
</el-table>
<div v-if="this.$route.query.status === '5'">
<div class="form-row-title">验收意见</div>
<el-form ref="form" :model="acceptanceForm" :rules="acceptanceRules" label-width="120px" label-position="right">
<el-row :gutter="48">
<el-col :span="8">
<el-form-item label="复核人:" prop="operator">
<el-input
disabled
placeholder="请输入内容"
v-model="acceptanceForm.operator">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="复核时间:" prop="approvalTime">
<el-date-picker
size="small"
class="ml-10"
disabled
style="width: 100%;"
v-model="acceptanceForm.approvalTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="复核意见:" prop="comment">
<el-input
type="textarea"
:rows="4"
disabled
placeholder="请输入内容"
maxlength="200"
show-word-limit
v-model="acceptanceForm.comment">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<div class="bottom-btns" v-if="$route.query.mode !== 'check'">
<el-button
@ -203,7 +248,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
import { calcTableHeight } from "@/mixins/calcTableHeight";
import SyMixMap from "@/views/components/SyMixMap.vue";
import { uploadFileData } from "@/api/system/upload";
import { getV2Yh, postV2Yh, gettV2Record } from "@/api/dike/patrolMaintenance";
import {getV2Yh, postV2Yh, gettV2Record, getV2ApprovalComment} from "@/api/dike/patrolMaintenance";
import { getDictMapData } from "@/api/system/dict/data";
import { mapGetters } from "vuex";
@ -253,6 +298,16 @@ export default {
time: [],
scope: '',
},
acceptanceForm: {
operator: '',
approvalTime: '',
comment: '',
},
acceptanceRules: {
operator: [{required: true}],
approvalTime: [{required: true}],
comment: [{required: true}],
},
rules: {
userName: [{required: true}],
projectName: [{required: true}],
@ -320,13 +375,19 @@ export default {
}
})
if (this.$route.query.id) {
const ApprovalComment = await getV2Yh(this.$route.query.id)
this.form.time[0] = ApprovalComment.data.startDate
this.form.time[1] = ApprovalComment.data.endDate
this.form.describe = ApprovalComment.data.content
const Yh = await getV2Yh(this.$route.query.id)
this.form.time[0] = Yh.data.startDate
this.form.time[1] = Yh.data.endDate
this.form.describe = Yh.data.content
this.form.time = [...this.form.time]
this.form.images = ApprovalComment.data.doc.images
this.fileData = ApprovalComment.data.doc.docs
this.form.images = Yh.data.doc.images
this.fileData = Yh.data.doc.docs
}
if (this.$route.query.status === '5') {
const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
this.acceptanceForm.operator = ApprovalComment.data[0].operator.name
this.acceptanceForm.approvalTime = ApprovalComment.data[0].approvalTime
this.acceptanceForm.comment = ApprovalComment.data[0].comment
}
},
getDictLabelName(type, dictListName) {

29
src/views/dike/runManage/patrolMaintenance/defectList/index.vue

@ -89,7 +89,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查状态</span>
<span class="search-label">养护状态</span>
<el-select
clearable
size="small"
@ -153,7 +153,8 @@
:data="tableData"
border
>
<el-table-column prop="id" align="center" label="单号" />
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="checkingName" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型">
<template slot-scope="scope">
@ -176,6 +177,30 @@
}}</span>
</template>
</el-table-column>
<el-table-column prop="status" align="center" label="巡查状态" width="100">
<template slot-scope="scope">
<span style="position: relative"
:style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
<div
v-if="scope.row.status === '1'"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
></div>
<div
v-if="scope.row.status === '2'"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
></div>
<div
v-if="scope.row.status === '4'"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
></div>
<div
v-if="['3', '5', '6'].includes(scope.row.status)"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
></div>
{{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
</span>
</template>
</el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="责任人" />
<el-table-column
prop="startDate"

5
src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue

@ -153,7 +153,8 @@
:data="tableData"
border
>
<el-table-column prop="id" align="center" label="单号" />
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="name" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型">
<template slot-scope="scope">
@ -319,7 +320,7 @@ export default {
handleCheckDetails(row, mode) {
this.$router.push({
path: "maintenanceDetails",
query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
query: { id: row.id, recordId: row.recordId, defectId: row.problemId,status: row.status, mode: mode },
});
},
getDictLabelName(type, dictListName) {

10
src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue

@ -179,15 +179,15 @@ export default {
</div>
</div>
<el-table :height="tableHeight" :data="tableData" border>
<!-- <el-table-column type="index" align="center" label="序号" width="100">
</el-table-column> -->
<el-table-column prop="id" align="center" label="单号" width="100">
<el-table-column type="index" align="center" label="序号" width="100">
</el-table-column>
<!-- <el-table-column prop="id" align="center" label="单号" width="100">
</el-table-column> -->
<el-table-column prop="name" align="center" label="巡查名称">
</el-table-column>
<el-table-column prop="dikeName" align="center" label="工程名称">
<el-table-column prop="dikeName" align="center" label="堤防名称">
</el-table-column>
<el-table-column prop="dikeCode" align="center" label="工程代码">
<el-table-column prop="dikeCode" align="center" label="堤防代码">
</el-table-column>
<el-table-column align="center" label="巡查类型">
<template slot-scope="scope">

3
src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue

@ -30,7 +30,7 @@
:disabled="$route.query.mode === 'check'"
v-model="form.time"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -107,7 +107,6 @@
<el-select
clearable
size="small"
class="w-202 ml-10"
:disabled="$route.query.mode === 'check'"
v-model="scope.row.itemId"
filterable

73
src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue

@ -130,6 +130,51 @@
</el-form-item>
</el-form>
</div>
<div v-if="this.$route.query.status === '5'">
<div class="form-row-title">验收意见</div>
<el-form ref="form" :model="acceptanceForm" :rules="acceptanceRules" label-width="120px" label-position="right">
<el-row :gutter="48">
<el-col :span="8">
<el-form-item label="复核人:" prop="operator">
<el-input
disabled
placeholder="请输入内容"
v-model="acceptanceForm.operator">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="复核时间:" prop="approvalTime">
<el-date-picker
size="small"
class="ml-10"
disabled
style="width: 100%;"
v-model="acceptanceForm.approvalTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="复核意见:" prop="comment">
<el-input
type="textarea"
:rows="4"
disabled
placeholder="请输入内容"
maxlength="200"
show-word-limit
v-model="acceptanceForm.comment">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="bottom-btns" v-if="$route.query.mode !== 'check'">
<el-button
type="primary"
@ -152,7 +197,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
import { calcTableHeight } from "@/mixins/calcTableHeight";
import SyMixMap from "@/views/components/SyMixMap.vue";
import { uploadFileData } from "@/api/system/upload";
import { getV2Yh, postV2Yh, gettV2Record } from "@/api/dike/pestAnimalControl2";
import { getV2Yh, postV2Yh, gettV2Record, getV2ApprovalComment } from "@/api/dike/pestAnimalControl2";
import { getDictMapData } from "@/api/system/dict/data";
import { mapGetters } from "vuex";
@ -172,6 +217,16 @@ export default {
nspectionLocation: '堤坡与戗台',
inspectionContent: '是否坚实平整',
}],
acceptanceForm: {
operator: '',
approvalTime: '',
comment: '',
},
acceptanceRules: {
operator: [{required: true}],
approvalTime: [{required: true}],
comment: [{required: true}],
},
form: {
images: [],
createName: '',
@ -257,12 +312,18 @@ export default {
}
})
if (this.$route.query.id) {
const ApprovalComment = await getV2Yh(this.$route.query.id)
this.form.time[0] = ApprovalComment.data.startDate
this.form.time[1] = ApprovalComment.data.endDate
this.form.describe = ApprovalComment.data.content
const yh = await getV2Yh(this.$route.query.id)
this.form.time[0] = yh.data.startDate
this.form.time[1] = yh.data.endDate
this.form.describe = yh.data.content
this.form.time = [...this.form.time]
this.form.images = ApprovalComment.data.doc.images
this.form.images = yh.data.doc.images
}
if (this.$route.query.status === '5') {
const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
this.acceptanceForm.operator = ApprovalComment.data[0].operator.name
this.acceptanceForm.approvalTime = ApprovalComment.data[0].approvalTime
this.acceptanceForm.comment = ApprovalComment.data[0].comment
}
},
getDictLabelName(type, dictListName) {

2
src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue

@ -321,7 +321,7 @@ export default {
handleCheckDetails(row, mode) {
this.$router.push({
path: "maintenanceDetails",
query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode },
});
},
getDictLabelName(type, dictListName) {

12
src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue

@ -180,7 +180,7 @@ export default {
getTableData() {
//
this.renderEcharts({
group: "C_1",
group: "C_DW_1",
echartsInstanceName: "proEchartInstance",
echartsDomName: "proEchart",
echartsOptions: {
@ -197,7 +197,7 @@ export default {
//
if (res.data?.yaxis?.length) {
let num = res.data.yaxis[0]?.series.find(
(v) => v.code === "DF_PROJECT_ADCD_SUM"
(v) => v.code === "DW_PROJECT_ADCD_SUM"
)?.sum;
this.projectSum = Number(num ?? null);
}
@ -205,7 +205,7 @@ export default {
});
//
this.renderEcharts({
group: "C_2",
group: "C_DW_2",
echartsInstanceName: "patrolEchartInstance",
echartsDomName: "patrolEchart",
echartsOptions: {
@ -229,7 +229,7 @@ export default {
});
//
this.renderEcharts({
group: "C_3",
group: "C_DW_3",
echartsInstanceName: "compareEchartInstance",
echartsDomName: "compareEchart",
echartsOptions: {
@ -244,9 +244,9 @@ export default {
//
if (res.data?.yaxis?.length) {
let newArr = res.data.yaxis.flatMap((v) => v.series);
let num1 = newArr.find((v) => v.code === "DF_QX_ADCD_SUM")?.sum;
let num1 = newArr.find((v) => v.code === "DW_QX_ADCD_SUM")?.sum;
this.flawSum = Number(num1 ?? null);
let num2 = newArr.find((v) => v.code === "DF_YH_ADCD_SUM")?.sum;
let num2 = newArr.find((v) => v.code === "DW_YH_ADCD_SUM")?.sum;
this.yhSum = Number(num2 ?? null);
}
}

12
src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue

@ -270,7 +270,7 @@ export default {
//
getTableData() {
//
this.requestFunc({ group: "C_14" }).then((res) => {
this.requestFunc({ group: "C_DW_14" }).then((res) => {
if (res.data) {
//
if (res.data?.yaxis?.length) {
@ -354,7 +354,7 @@ export default {
}
});
//
this.requestFunc({ group: "C_15" }).then((res) => {
this.requestFunc({ group: "C_DW_15" }).then((res) => {
if (res.data) {
if (res.data?.yaxis?.length) {
this.flawSum = res.data.yaxis
@ -435,7 +435,7 @@ export default {
}
});
//
this.requestFunc({ group: "C_16" }).then((res) => {
this.requestFunc({ group: "C_DW_16" }).then((res) => {
if (res.data) {
this.$nextTick(() => {
//
@ -546,13 +546,13 @@ export default {
}
});
//
this.requestFunc({ group: "C_17" }).then((res) => {
this.requestFunc({ group: "C_DW_17" }).then((res) => {
if (res.data) {
if (res.data.yaxis?.length) {
this.yhSum = Number(
res.data.yaxis
.flatMap((v) => v.series)
?.find((v) => v.code === "DF_BD_YH_SUM")?.sum ?? null
?.find((v) => v.code === "DW_BD_YH_SUM")?.sum ?? null
);
}
this.$nextTick(() => {
@ -628,7 +628,7 @@ export default {
}
});
//
this.requestFunc({ group: "C_18" }).then((res) => {
this.requestFunc({ group: "C_DW_18" }).then((res) => {
if (res.data) {
if (res.data?.yaxis?.length) {
let newArr = res.data.yaxis.flatMap((v) => v.series);

2
src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue

@ -216,7 +216,7 @@ export default {
type="text"
size="small"
@click="handleCopyMethod(scope.row)"
v-hasPermi="['df:run:sup:meth:edit']"
v-hasPermi="['df:run:sup:meth:copy']"
>复制</el-button
>
<el-button

8
src/views/dike/runManage/supervisionInspetion/projectManage/index.vue

@ -185,7 +185,11 @@ export default {
</el-table-column>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['df:run:sup:proj:view']"
>查看</el-button
>
<el-button
@ -193,6 +197,7 @@ export default {
size="small"
v-if="scope.row.state != '1'"
@click="handleEdit(scope.row)"
v-hasPermi="['df:run:sup:proj:patrol']"
>巡查</el-button
>
<el-button
@ -200,6 +205,7 @@ export default {
type="text"
size="small"
@click="handleCheckReport(scope.row)"
v-hasPermi="['df:run:sup:proj:report']"
>报告</el-button
>
</template>

10
src/views/dike/runManage/supervisionInspetion/questionManage/index.vue

@ -345,7 +345,11 @@ export default {
</el-table-column>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['df:run:sup:question:view']"
>查看</el-button
>
<el-button
@ -353,6 +357,7 @@ export default {
size="small"
v-if="scope.row.status == '0'"
@click="handleSendDown(scope.row)"
v-hasPermi="['df:run:sup:question:issue']"
>下发</el-button
>
<el-button
@ -360,6 +365,7 @@ export default {
size="small"
@click="handleDeal(scope.row)"
v-else-if="scope.row.status == '1'"
v-hasPermi="['df:run:sup:question:deal']"
>处理</el-button
>
<el-button
@ -367,6 +373,7 @@ export default {
size="small"
v-else-if="scope.row.status == '2'"
@click="handleConfirm(scope.row)"
v-hasPermi="['df:run:sup:question:confirm']"
>确认</el-button
>
<el-button
@ -374,6 +381,7 @@ export default {
:disabled="true"
size="small"
v-else-if="scope.row.status == '3'"
v-hasPermi="['df:run:sup:question:complete']"
>完成</el-button
>
</template>

12
src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue

@ -220,7 +220,7 @@ export default {
class="search-btn mb-10"
style="margin-right: 16px"
type="success"
v-hasPermi="['sz:run:jc:group:add']"
v-hasPermi="['sz:run:dangerProj:group:add']"
@click="handleAddNew()"
>创建</el-button
>
@ -245,18 +245,22 @@ export default {
<el-table-column prop="deptName" align="center" label="创建单位" />
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['sz:run:dangerProj:group:view']"
>查看</el-button
>
<el-button
v-hasPermi="['sz:run:jc:group:edit']"
v-hasPermi="['sz:run:dangerProj:group:edit']"
type="text"
size="small"
@click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button
v-hasPermi="['sz:run:jc:group:delete']"
v-hasPermi="['sz:run:dangerProj:group:delete']"
type="text"
size="small"
@click="handleDel(scope.row)"

8
src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@ -4,7 +4,12 @@
<div class="items-list-page slider-right-body">
<div class="pl-20 pr-20 pt-20 flex justify-between">
<el-button type="primary" @click="handleAddNew">新增项目</el-button>
<el-button
type="primary"
@click="handleAddNew"
v-hasPermi="['sz:run:dangerProj:items:add']"
>新增项目</el-button
>
</div>
<div class="items-list-box">
<div
@ -32,6 +37,7 @@
<i
class="el-icon-error font-14 del-btn"
@click.stop="handleDel(item)"
v-hasPermi="['sz:run:dangerProj:items:delete']"
></i>
</div>
<div

8
src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue

@ -277,11 +277,13 @@ export default {
>
<div
class="question-row w-full"
v-for="item2 in item.children"
v-for="(item2, index2) in item.children"
:key="item2.id"
>
<div class="flex">
<div class="question-col flex-shrink-0">问题</div>
<div class="question-col flex-shrink-0">
检查项{{ index2 + 1 }}
</div>
<div class="question-col flex-1">
{{ item2.content }}
</div>
@ -452,6 +454,8 @@ export default {
.question-select {
padding: 10px;
border-bottom: 1px solid #f0f0f0;
display: flex;
justify-content: center;
}
}
}

7
src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue

@ -360,7 +360,11 @@ export default {
</el-table-column>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['sz:run:dangerProj:proj:view']"
>查看</el-button
>
<el-button
@ -368,6 +372,7 @@ export default {
v-if="scope.row.state != '1'"
size="small"
@click="handleEdit(scope.row)"
v-hasPermi="['sz:run:dangerProj:proj:check']"
>核查</el-button
>
<el-button

2
src/views/sluice/runManage/dangerWeakProject/inspectReport/index.vue

@ -308,7 +308,7 @@ export default {
type="text"
size="small"
@click="handleCheckReport(scope.row)"
v-hasPermi="['sz:run:jc:report:view']"
v-hasPermi="['df:run:dangerProj:report:view']"
>查看报告</el-button
>
</template>

2
src/views/sluice/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue

@ -146,7 +146,7 @@ export default {
border-bottom: 1px solid #e5e5e5;
}
.canvas {
width: 500px;
width: 100%;
height: 200px;
padding: 10px;
}

7
src/views/sluice/runManage/dangerWeakProject/inspectStatistics/index.vue

@ -283,7 +283,7 @@ export default {
ref="pieRef2"
title="任务数统计"
echartsTitle="任务总数"
class="question-item ml-20"
class="question-item"
:itemData="questionLevelList.slice(4, 6)"
></Pie>
<Pie
@ -333,13 +333,8 @@ export default {
}
}
.question-box {
display: flex;
flex-wrap: wrap;
padding: 24px;
.question-item {
flex-shrink: 0;
width: 48%;
margin-right: 10px;
margin-bottom: 12px;
}
}

15
src/views/sluice/runManage/dangerWeakProject/inspectTasks/index.vue

@ -298,7 +298,7 @@ export default {
class="search-btn"
style="margin-left: auto"
type="success"
v-hasPermi="['sz:run:jc:task:add']"
v-hasPermi="['sz:run:dangerProj:task:add']"
@click="handleGoDetails()"
>添加</el-button
>
@ -337,12 +337,21 @@ export default {
type="text"
size="small"
@click="handlePreview(scope.row)"
v-hasPermi="['sz:run:dangerProj:task:view']"
>查看</el-button
>
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button
type="text"
size="small"
@click="handleEdit(scope.row)"
v-hasPermi="['sz:run:dangerProj:task:edit']"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button
type="text"
size="small"
@click="handleDel(scope.row)"
v-hasPermi="['sz:run:dangerProj:task:delete']"
>删除</el-button
>
</template>

3
src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue

@ -134,7 +134,8 @@
:data="tableData"
border
>
<el-table-column prop="id" align="center" label="单号"/>
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="checkingName" align="center" label="巡查名称"/>
<el-table-column prop="type" align="center" label="巡查类型">
<template slot-scope="scope">

3
src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue

@ -149,7 +149,8 @@
<div class="line" ref="lineRef"></div>
</div>
<el-table :height="tableHeight" :data="tableData" border>
<el-table-column prop="id" align="center" label="单号" />
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="detail.name" align="center" label="巡查名称" />
<el-table-column align="center" label="巡查类型">
<template slot-scope="scope">

3
src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue

@ -30,7 +30,7 @@
:disabled="$route.query.mode === 'check'"
v-model="form.time"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -107,7 +107,6 @@
<el-select
clearable
size="small"
class="w-202 ml-10"
:disabled="$route.query.mode === 'check'"
v-model="scope.row.itemId"
filterable

75
src/views/sluice/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue

@ -180,6 +180,51 @@
</template>
</el-table-column>
</el-table>
<div v-if="this.$route.query.status === '5'">
<div class="form-row-title">验收意见</div>
<el-form ref="form" :model="acceptanceForm" :rules="acceptanceRules" label-width="120px" label-position="right">
<el-row :gutter="48">
<el-col :span="8">
<el-form-item label="复核人:" prop="operator">
<el-input
disabled
placeholder="请输入内容"
v-model="acceptanceForm.operator">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="复核时间:" prop="approvalTime">
<el-date-picker
size="small"
class="ml-10"
disabled
style="width: 100%;"
v-model="acceptanceForm.approvalTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="复核意见:" prop="comment">
<el-input
type="textarea"
:rows="4"
disabled
placeholder="请输入内容"
maxlength="200"
show-word-limit
v-model="acceptanceForm.comment">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<div class="bottom-btns" v-if="$route.query.mode !== 'check'">
<el-button
@ -203,7 +248,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
import { calcTableHeight } from "@/mixins/calcTableHeight";
import SyMixMap from "@/views/components/SyMixMap.vue";
import { uploadFileData } from "@/api/system/upload";
import { getV2Yh, postV2Yh, gettV2Record } from "@/api/sluice/patrolMaintenance";
import { getV2Yh, postV2Yh, gettV2Record, getV2ApprovalComment } from "@/api/sluice/patrolMaintenance";
import { getDictMapData } from "@/api/system/dict/data";
import { mapGetters } from "vuex";
@ -233,6 +278,16 @@ export default {
nspectionLocation: '堤坡与戗台',
inspectionContent: '是否坚实平整',
}],
acceptanceForm: {
operator: '',
approvalTime: '',
comment: '',
},
acceptanceRules: {
operator: [{required: true}],
approvalTime: [{required: true}],
comment: [{required: true}],
},
form: {
images: [],
createName: '',
@ -320,13 +375,19 @@ export default {
}
})
if (this.$route.query.id) {
const ApprovalComment = await getV2Yh(this.$route.query.id)
this.form.time[0] = ApprovalComment.data.startDate
this.form.time[1] = ApprovalComment.data.endDate
this.form.describe = ApprovalComment.data.content
const yh = await getV2Yh(this.$route.query.id)
this.form.time[0] = yh.data.startDate
this.form.time[1] = yh.data.endDate
this.form.describe = yh.data.content
this.form.time = [...this.form.time]
this.form.images = ApprovalComment.data.doc.images
this.fileData = ApprovalComment.data.doc.docs
this.form.images = yh.data.doc.images
this.fileData = yh.data.doc.docs
}
if (this.$route.query.status === '5') {
const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
this.acceptanceForm.operator = ApprovalComment.data[0].operator.name
this.acceptanceForm.approvalTime = ApprovalComment.data[0].approvalTime
this.acceptanceForm.comment = ApprovalComment.data[0].comment
}
},
getDictLabelName(type, dictListName) {

30
src/views/sluice/runManage/patrolMaintenance/defectList/index.vue

@ -89,7 +89,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查状态</span>
<span class="search-label">养护状态</span>
<el-select
clearable
size="small"
@ -153,7 +153,8 @@
:data="tableData"
border
>
<el-table-column prop="id" align="center" label="单号" />
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="checkingName" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型">
<template slot-scope="scope">
@ -176,6 +177,31 @@
}}</span>
</template>
</el-table-column>
<el-table-column prop="status" align="center" label="巡查状态" width="100">
<template slot-scope="scope">
<span style="position: relative"
:style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
<div
v-if="scope.row.status === '1'"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
></div>
<div
v-if="scope.row.status === '2'"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
></div>
<div
v-if="scope.row.status === '4'"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
></div>
<div
v-if="['3', '5', '6'].includes(scope.row.status)"
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
></div>
{{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
</span>
</template>
</el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="责任人" />
<el-table-column
prop="startDate"

5
src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue

@ -153,7 +153,8 @@
:data="tableData"
border
>
<el-table-column prop="id" align="center" label="单号" />
<!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/>
<el-table-column prop="name" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型">
<template slot-scope="scope">
@ -319,7 +320,7 @@ export default {
handleCheckDetails(row, mode) {
this.$router.push({
path: "maintenanceDetails",
query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode },
});
},
getDictLabelName(type, dictListName) {

10
src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue

@ -179,15 +179,15 @@ export default {
</div>
</div>
<el-table :height="tableHeight" :data="tableData" border>
<!-- <el-table-column type="index" align="center" label="序号" width="100">
</el-table-column> -->
<el-table-column prop="id" align="center" label="单号" width="100">
<el-table-column type="index" align="center" label="序号" width="100">
</el-table-column>
<!-- <el-table-column prop="id" align="center" label="单号" width="100">
</el-table-column> -->
<el-table-column prop="name" align="center" label="巡查名称">
</el-table-column>
<el-table-column prop="wagaName" align="center" label="工程名称">
<el-table-column prop="wagaName" align="center" label="水闸名称">
</el-table-column>
<el-table-column prop="wagaCode" align="center" label="工程代码">
<el-table-column prop="wagaCode" align="center" label="水闸代码">
</el-table-column>
<el-table-column align="center" label="巡查类型">
<template slot-scope="scope">

3
src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue

@ -150,6 +150,7 @@ export default {
style="margin-right: 16px"
type="success"
@click="handleAddMethod()"
v-hasPermi="['sz:run:sup:meth:add']"
>添加</el-button
>
</div>
@ -214,7 +215,7 @@ export default {
type="text"
size="small"
@click="handleCopyMethod(scope.row)"
v-hasPermi="['sz:run:sup:meth:edit']"
v-hasPermi="['sz:run:sup:meth:copy']"
>复制</el-button
>
<el-button

8
src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue

@ -194,7 +194,11 @@ export default {
</el-table-column>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['sz:run:sup:proj:view']"
>查看</el-button
>
<el-button
@ -202,6 +206,7 @@ export default {
size="small"
v-if="scope.row.state != '1'"
@click="handleEdit(scope.row)"
v-hasPermi="['sz:run:sup:proj:patrol']"
>巡查</el-button
>
<el-button
@ -209,6 +214,7 @@ export default {
type="text"
size="small"
@click="handleCheckReport(scope.row)"
v-hasPermi="['sz:run:sup:proj:report']"
>报告</el-button
>
</template>

10
src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue

@ -374,7 +374,11 @@ export default {
</el-table-column>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleCheck(scope.row)"
<el-button
type="text"
size="small"
@click="handleCheck(scope.row)"
v-hasPermi="['sz:run:sup:question:view']"
>查看</el-button
>
<el-button
@ -382,6 +386,7 @@ export default {
size="small"
v-if="scope.row.status == '0'"
@click="handleSendDown(scope.row)"
v-hasPermi="['sz:run:sup:question:issue']"
>下发</el-button
>
<el-button
@ -389,6 +394,7 @@ export default {
size="small"
@click="handleDeal(scope.row)"
v-else-if="scope.row.status == '1'"
v-hasPermi="['sz:run:sup:question:deal']"
>处理</el-button
>
<el-button
@ -396,6 +402,7 @@ export default {
size="small"
v-else-if="scope.row.status == '2'"
@click="handleConfirm(scope.row)"
v-hasPermi="['sz:run:sup:question:confirm']"
>确认</el-button
>
<el-button
@ -403,6 +410,7 @@ export default {
:disabled="true"
size="small"
v-else-if="scope.row.status == '3'"
v-hasPermi="['sz:run:sup:question:complete']"
>完成</el-button
>
</template>

4
vue.config.js

@ -80,8 +80,8 @@ module.exports = {
changeOrigin: true,
},
[process.env.VUE_APP_BASE_API]: {
target: "http://shuili.product.dev.com:30115/",
// target: "http://172.16.34.80:18082/",
// target: "http://shuili.product.dev.com:30115/",
target: "http://172.16.34.80:18082/",
// target: 'http://172.16.32.62:18888/',
// target: "http://172.16.34.27:18082",
changeOrigin: true,

Loading…
Cancel
Save