Browse Source

5个预警模块,逻辑调整,优化

master
wuxu 1 month ago
parent
commit
39aac306bb
  1. 12
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue
  2. 4
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue
  3. 4
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
  4. 4
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue
  5. 4
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue
  6. 4
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue
  7. 20
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue
  8. 22
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue
  9. 4
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue
  10. 4
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue
  11. 6
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue
  12. 4
      jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
  13. 3
      sql/2025-03-13

12
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue

@ -30,16 +30,16 @@
<el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/> <el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/> <!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/> --> <el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/> -->
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="100"/> <!-- <el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="100"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="80"/> <el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="80"/>-->
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/> <el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<!-- <el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/> --> <!-- <el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/> -->
<el-table-column label="判断符号" align="center" prop="judgeSymbol" min-width="120"/> <!-- <el-table-column label="判断符号" align="center" prop="judgeSymbol" min-width="120"/>
<el-table-column label="阈值" align="center" prop="threshold" min-width="120"/> <el-table-column label="阈值" align="center" prop="threshold" min-width="120"/>
<el-table-column label="惩罚措施" align="center" prop="measures" min-width="120"/> <el-table-column label="惩罚措施" align="center" prop="measures" min-width="120"/>-->
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/> <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/> <el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -56,7 +56,7 @@
v-hasPermi="['build:fundPayRuls:remove']" v-hasPermi="['build:fundPayRuls:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>-->
</el-table> </el-table>
<pagination <pagination

4
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue

@ -53,7 +53,7 @@
v-hasPermi="['build:fundPayRuls:remove']" v-hasPermi="['build:fundPayRuls:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -61,7 +61,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['build:fundPayRuls:export']" v-hasPermi="['build:fundPayRuls:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

4
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue

@ -54,7 +54,7 @@
v-hasPermi="['build:buildProgressWarning:remove']" v-hasPermi="['build:buildProgressWarning:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -62,7 +62,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['build:buildProgressWarning:export']" v-hasPermi="['build:buildProgressWarning:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

4
jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue

@ -42,9 +42,9 @@
{{ projectInfo.proNo }} {{ projectInfo.proNo }}
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="120"/> <!-- <el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="120"/>
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/> <el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<el-table-column label="金额" align="center" prop="amount" min-width="120"/> <el-table-column label="金额" align="center" prop="amount" min-width="120"/>-->
<!--<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="100"/>--> <!--<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="100"/>-->
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/> <el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="170"/> <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="170"/>

4
jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue

@ -53,7 +53,7 @@
v-hasPermi="['build:costChangeWarning:remove']" v-hasPermi="['build:costChangeWarning:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -61,7 +61,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['build:costChangeWarning:export']" v-hasPermi="['build:costChangeWarning:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

4
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue

@ -53,14 +53,14 @@
v-hasPermi="['build:fundPayWarning:remove']" v-hasPermi="['build:fundPayWarning:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['build:fundPayWarning:export']" v-hasPermi="['build:fundPayWarning:export']"
>导出</el-button> >导出</el-button>-->
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

20
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue

@ -42,10 +42,10 @@
{{ formData.proNo }} {{ formData.proNo }}
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="支付时间范围" align="center" prop="payDateRange" min-width="120"/> <!-- <el-table-column label="支付时间范围" align="center" prop="payDateRange" min-width="120"/>
<el-table-column label="支付金额" align="center" prop="payAmount" width="100"/> <el-table-column label="支付金额" align="center" prop="payAmount" width="100"/>-->
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/> <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="说明情况" align="center" prop="describe" min-width="120"/> <el-table-column label="说明情况" align="center" prop="description" min-width="120"/>
<el-table-column label="原因" align="center" prop="reason" min-width="120"/> <el-table-column label="原因" align="center" prop="reason" min-width="120"/>
<el-table-column label="处置状态" align="center" prop="reason" min-width="120"> <el-table-column label="处置状态" align="center" prop="reason" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
@ -88,7 +88,7 @@
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="支付时间范围" prop="payDateRange"> <el-form-item label="支付时间范围" prop="payDateRange">
<el-date-picker <el-date-picker
v-model="timeRange" v-model="timeRange"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
@ -106,8 +106,8 @@
<el-form-item label="预警描述" prop="ruleMsg"> <el-form-item label="预警描述" prop="ruleMsg">
<el-input v-model="form.ruleMsg" :disabled="true" type="textarea" :rows="5" placeholder="请输入预警描述" /> <el-input v-model="form.ruleMsg" :disabled="true" type="textarea" :rows="5" placeholder="请输入预警描述" />
</el-form-item> </el-form-item>
<el-form-item label="说明情况" prop="describe"> <el-form-item label="说明情况" prop="description">
<el-input v-model="form.describe" type="textarea" :rows="5" placeholder="请输入说明情况" /> <el-input v-model="form.description" type="textarea" :rows="5" placeholder="请输入说明情况" />
</el-form-item> </el-form-item>
<el-form-item label="原因" prop="reason"> <el-form-item label="原因" prop="reason">
<el-input v-model="form.reason" type="textarea" :rows="5" placeholder="请输入原因" /> <el-input v-model="form.reason" type="textarea" :rows="5" placeholder="请输入原因" />
@ -176,7 +176,7 @@ export default {
payDateRange: null, payDateRange: null,
payAmount: null, payAmount: null,
ruleMsg: null, ruleMsg: null,
describe: null, description: null,
reason: null, reason: null,
status: '1', status: '1',
handle: null, handle: null,
@ -218,7 +218,7 @@ export default {
trigger: "blur", trigger: "blur",
} }
], ],
describe: [ description: [
{ {
required: true, required: true,
message: "请输入说明情况", message: "请输入说明情况",
@ -309,7 +309,7 @@ export default {
payDateRange: null, payDateRange: null,
payAmount: null, payAmount: null,
ruleMsg: null, ruleMsg: null,
describe: null, description: null,
reason: null, reason: null,
status: '1', status: '1',
handle: null, handle: null,
@ -335,7 +335,7 @@ export default {
payDateRange: null, payDateRange: null,
payAmount: null, payAmount: null,
ruleMsg: null, ruleMsg: null,
describe: null, description: null,
reason: null, reason: null,
status: "1", status: "1",
handle: null, handle: null,

22
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue

@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="原因" prop="reason"> <el-form-item label="预警描述" prop="ruleMsg">
<el-input <el-input
v-model="queryParams.data.reason" v-model="queryParams.data.ruleMsg"
placeholder="请输入原因" placeholder="请输入预警描述"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -53,7 +53,7 @@
v-hasPermi="['build:fundPayWarning:remove']" v-hasPermi="['build:fundPayWarning:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -61,7 +61,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['build:fundPayWarning:export']" v-hasPermi="['build:fundPayWarning:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -136,8 +136,8 @@
<el-form-item label="预警描述" prop="ruleMsg"> <el-form-item label="预警描述" prop="ruleMsg">
<el-input v-model="form.ruleMsg" type="textarea" :rows="5" placeholder="请输入预警描述" /> <el-input v-model="form.ruleMsg" type="textarea" :rows="5" placeholder="请输入预警描述" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="说明情况" prop="describe"> <!-- <el-form-item label="说明情况" prop="description">
<el-input v-model="form.describe" placeholder="请输入说明情况" /> <el-input v-model="form.description" placeholder="请输入说明情况" />
</el-form-item> </el-form-item>
<el-form-item label="原因" prop="reason"> <el-form-item label="原因" prop="reason">
<el-input v-model="form.reason" placeholder="请输入原因" /> <el-input v-model="form.reason" placeholder="请输入原因" />
@ -216,7 +216,7 @@ export default {
payDateRange: null, payDateRange: null,
payAmount: null, payAmount: null,
ruleMsg: null, ruleMsg: null,
describe: null, description: null,
reason: null, reason: null,
status: null, status: null,
handle: null, handle: null,
@ -258,7 +258,7 @@ export default {
trigger: "blur", trigger: "blur",
} }
], ],
// describe: [ // description: [
// { // {
// required: true, // required: true,
// message: "", // message: "",
@ -353,7 +353,7 @@ export default {
payDateRange: null, payDateRange: null,
payAmount: null, payAmount: null,
ruleMsg: null, ruleMsg: null,
describe: null, description: null,
reason: null, reason: null,
status: null, status: null,
handle: null, handle: null,
@ -379,7 +379,7 @@ export default {
payDateRange: null, payDateRange: null,
payAmount: null, payAmount: null,
ruleMsg: null, ruleMsg: null,
describe: null, description: null,
reason: null, reason: null,
status: "0", status: "0",
handle: null, handle: null,

4
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue

@ -54,7 +54,7 @@
v-hasPermi="['build:investCompleteConfig:remove']" v-hasPermi="['build:investCompleteConfig:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -62,7 +62,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['build:investCompleteConfig:export']" v-hasPermi="['build:investCompleteConfig:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

4
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue

@ -265,7 +265,7 @@ export default {
createTime: null, createTime: null,
updateUid: null, updateUid: null,
updateTime: null, updateTime: null,
status: '1' status: null
}, },
// //
params: { params: {
@ -341,7 +341,7 @@ export default {
}, },
created() { created() {
this.queryParams.data.proNo = this.$route.query.proNo this.queryParams.data.proNo = this.$route.query.proNo
this.queryParams.data.status = '1' this.queryParams.data.status = ''
this.getDictList() this.getDictList()
this.getList() this.getList()
}, },

6
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue

@ -53,14 +53,14 @@
v-hasPermi="['build:investCompleteWarning:remove']" v-hasPermi="['build:investCompleteWarning:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['build:investCompleteWarning:export']" v-hasPermi="['build:investCompleteWarning:export']"
>导出</el-button> >导出</el-button>-->
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -117,7 +117,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="预警事项" prop="warnMatters"> <el-form-item label="预警事项" prop="warnMatters">
<el-select v-model="form.warnMatters" placeholder="请选择预警事项" style="width: 100%"> <el-select v-model="form.warnMatters" placeholder="请选择预警事项" style="width: 100%">
<el-option <el-option
v-for="dict in warningThingOptions" v-for="dict in warningThingOptions"

4
jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue

@ -61,14 +61,14 @@
v-hasPermi="['build:warningRule:remove']" v-hasPermi="['build:warningRule:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['build:warningRule:export']" v-hasPermi="['build:warningRule:export']"
>导出</el-button> >导出</el-button>-->
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

3
sql/2025-03-13

@ -0,0 +1,3 @@
ALTER TABLE `bs_sgc_jsjd_bui_cost_change_rule`
ADD COLUMN `current_amount` varchar(20) NULL COMMENT '当前金额' AFTER `status`;
Loading…
Cancel
Save