Skip to content

Z
zhongtai-ui
提交 af69fd2c authored 作者: 陈泽楷's avatar 陈泽楷
浏览文件
操作

接口调整

上级 f1e4e18a
显示空白字符变更
内嵌 并排
正在显示 包含 132 行增加 和 79 行删除
src/views/backstage/job/index.vue
浏览文件 @ af69fd2c
...@@ -152,13 +152,13 @@ ...@@ -152,13 +152,13 @@
<template scope="scope"> <template scope="scope">
<!-- <span v-if="scope.row.rectifyStatus == null">没有进行整改</span>--> <!-- <span v-if="scope.row.rectifyStatus == null">没有进行整改</span>-->
<span v-if="scope.row.rectifyStatus != null && (scope.row.rectifyStatus == '1' || scope.row.rectifyStatus == '2')">整改中</span> <span v-if="scope.row.rectifyStatus != null && (scope.row.rectifyStatus == '1' || scope.row.rectifyStatus == '2')">整改中</span>
<span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">整改中</span> <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已整改</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100px" label="整改审批状态" align="center" prop="rectifyStatus" > <el-table-column width="100px" label="整改审批状态" align="center" prop="rectifyStatus" >
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '2'">待审批</span> <span v-if="scope.row.approveStatus != null && (scope.row.approveStatus == '1' ||scope.row.approveStatus == '2'||scope.row.approveStatus == '3' )">待审批</span>
<span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已审批</span> <span v-if="scope.row.approveStatus != null && scope.row.approveStatus == '4'">已审批</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100px" label="是否已复查" align="center" > <el-table-column width="100px" label="是否已复查" align="center" >
...@@ -167,6 +167,9 @@ ...@@ -167,6 +167,9 @@
<span v-if="scope.row.checkUserName == null">否</span> <span v-if="scope.row.checkUserName == null">否</span>
<span v-else>是</span> <span v-else>是</span>
</div> </div>
<div v-else="scope.row.jobType == '2'">
<span v-if="scope.row.isCheck == '1'">是</span>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复查人员" align="center" prop="checkUserName" /> <el-table-column label="复查人员" align="center" prop="checkUserName" />
...@@ -430,6 +433,7 @@ export default { ...@@ -430,6 +433,7 @@ export default {
themeName: null, themeName: null,
jobAssessmentType: null, jobAssessmentType: null,
rectifyStatus: null, rectifyStatus: null,
approveStatus:null,
checkUserName: null, checkUserName: null,
isCheck: null, isCheck: null,
}, },
...@@ -482,8 +486,8 @@ export default { ...@@ -482,8 +486,8 @@ export default {
checkTime: null, checkTime: null,
createTime: null, createTime: null,
updateTime: null, updateTime: null,
status: "0", status: "1",
jobStatus: "0" jobStatus: "1"
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
src/views/backstage/policy/index.vue
浏览文件 @ af69fd2c
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form
<!-- <el-form-item label="发布时间" prop="publishTime">--> :model="queryParams"
<!-- <el-date-picker clearable size="small" style="width: 200px"--> ref="queryForm"
<!-- v-model="queryParams.publishTime"--> :inline="true"
<!-- type="date"--> v-show="showSearch"
<!-- value-format="yyyy-MM-dd"--> label-width="68px"
<!-- placeholder="选择发布时间">--> >
<!-- </el-date-picker>--> <!-- <el-form-item label="发布时间" prop="publishTime">-->
<!-- </el-form-item>--> <!-- <el-date-picker clearable size="small" style="width: 200px"-->
<!-- <el-form-item label="状态 1正常 0删除" prop="status">--> <!-- v-model="queryParams.publishTime"-->
<!-- <el-select v-model="queryParams.status" placeholder="请选择状态 1正常 0删除" clearable size="small">--> <!-- type="date"-->
<!-- <el-option label="请选择字典生成" value="" />--> <!-- value-format="yyyy-MM-dd"-->
<!-- </el-select>--> <!-- placeholder="选择发布时间">-->
<!-- </el-form-item>--> <!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态 1正常 0删除" prop="status">-->
<!-- <el-select v-model="queryParams.status" placeholder="请选择状态 1正常 0删除" clearable size="small">-->
<!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="公告标题" prop="title"> <el-form-item label="公告标题" prop="title">
<el-input <el-input
...@@ -60,23 +66,23 @@ ...@@ -60,23 +66,23 @@
v-hasPermi="['backstage:policy:remove']" v-hasPermi="['backstage:policy: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="['backstage:policy:export']"--> <!-- v-hasPermi="['backstage:policy: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>
<el-table v-loading="loading" :data="policyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="policyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="id" align="center" prop="id"/>
<el-table-column label="标题" align="center" prop="title" /> <el-table-column label="标题" align="center" prop="title"/>
<el-table-column label="内容" align="center" prop="content" /> <el-table-column label="内容" align="center" prop="content"/>
<el-table-column label="发布时间" align="center" prop="publishTime" width="180"> <el-table-column label="发布时间" align="center" prop="publishTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.publishTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.publishTime, '{y}-{m}-{d}') }}</span>
...@@ -114,24 +120,24 @@ ...@@ -114,24 +120,24 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="form.title" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.title" type="textarea" placeholder="请输入内容"/>
</el-form-item> </el-form-item>
<el-form-item label="内容"> <el-form-item label="内容">
<editor v-model="form.content" :min-height="192"/> <editor v-model="form.content" :min-height="192"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="发布时间" prop="publishTime">--> <!-- <el-form-item label="发布时间" prop="publishTime">-->
<!-- <el-date-picker clearable size="small" style="width: 200px"--> <!-- <el-date-picker clearable size="small" style="width: 200px"-->
<!-- v-model="form.publishTime"--> <!-- v-model="form.publishTime"-->
<!-- type="date"--> <!-- type="date"-->
<!-- value-format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择发布时间">--> <!-- placeholder="选择发布时间">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="状态 1正常 0删除">--> <!-- <el-form-item label="状态 1正常 0删除">-->
<!-- <el-radio-group v-model="form.status">--> <!-- <el-radio-group v-model="form.status">-->
<!-- <el-radio label="1">请选择字典生成</el-radio>--> <!-- <el-radio label="1">请选择字典生成</el-radio>-->
<!-- </el-radio-group>--> <!-- </el-radio-group>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button> <el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button>
...@@ -142,8 +148,15 @@ ...@@ -142,8 +148,15 @@
</template> </template>
<script> <script>
import { listPolicy, getPolicy, delPolicy, addPolicy, updatePolicy, exportPolicy } from "@/api/backstage/policy"; import {
import Editor from '@/components/Editor'; listPolicy,
getPolicy,
delPolicy,
addPolicy,
updatePolicy,
exportPolicy
} from "@/api/backstage/policy";
import Editor from "@/components/Editor";
export default { export default {
name: "Policy", name: "Policy",
...@@ -182,8 +195,7 @@ export default { ...@@ -182,8 +195,7 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {}
}
}; };
}, },
created() { created() {
...@@ -195,6 +207,9 @@ export default { ...@@ -195,6 +207,9 @@ export default {
this.loading = true; this.loading = true;
listPolicy(this.queryParams).then(response => { listPolicy(this.queryParams).then(response => {
this.policyList = response.rows; this.policyList = response.rows;
for(var i=0; i< this.policyList.length; i++){
this.policyList[i].content = this.getSimpleText(this.policyList[i].content)
}
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -229,9 +244,9 @@ export default { ...@@ -229,9 +244,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
...@@ -242,7 +257,7 @@ export default { ...@@ -242,7 +257,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids;
getPolicy(id).then(response => { getPolicy(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
...@@ -251,10 +266,10 @@ export default { ...@@ -251,10 +266,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.repeatSubmit=true this.repeatSubmit = true;
setTimeout(()=>{ setTimeout(() => {
this.repeatSubmit = false //点击一次时隔两秒后才能再次点击 this.repeatSubmit = false; //点击一次时隔两秒后才能再次点击
},2000) }, 2000);
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
...@@ -276,29 +291,42 @@ export default { ...@@ -276,29 +291,42 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm('是否确认删除政策公告编号为"' + ids + '"的数据项?', "警告", { this.$confirm(
'是否确认删除政策公告编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }
)
.then(function() {
return delPolicy(ids); return delPolicy(ids);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有政策公告数据项?', "警告", { this.$confirm("是否确认导出所有政策公告数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { })
.then(function() {
return exportPolicy(queryParams); return exportPolicy(queryParams);
}).then(response => {
this.download(response.msg);
}) })
.then(response => {
this.download(response.msg);
});
},
getSimpleText(html) {
var re1 = new RegExp("<.+?>", "g"); //匹配html标签的正则表达式，"g"是搜索匹配多个符合的内容
var msg = html.replace(re1, ""); //执行替换成空字符
return msg;
} }
} }
}; };
......
src/views/backstage/project/index.vue
浏览文件 @ af69fd2c
...@@ -143,6 +143,18 @@ ...@@ -143,6 +143,18 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选择级别" prop="projectType">
<el-select style="width: 100%" clearable filterable v-model="form.projectType" placeholder="请选择级别">
<el-option
v-for="dict in projectTypeSelectValueOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue">
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button> <el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button>
...@@ -236,6 +248,7 @@ export default { ...@@ -236,6 +248,7 @@ export default {
themeListOpen: false, themeListOpen: false,
themeList: [],//主题列表 themeList: [],//主题列表
themeSelectValueOptions: [], themeSelectValueOptions: [],
projectTypeSelectValueOptions:[],
// 不可重复提交 // 不可重复提交
repeatSubmit: false, repeatSubmit: false,
// 遮罩层 // 遮罩层
...@@ -280,6 +293,9 @@ export default { ...@@ -280,6 +293,9 @@ export default {
themeSelectValue: [ themeSelectValue: [
{ required: true, message: "主题不能为空，请选择主题", trigger: "blur" } { required: true, message: "主题不能为空，请选择主题", trigger: "blur" }
], ],
projectType:[
{ required: true, message: "项目级别不能为空，请选择级别", trigger: "blur" }
]
} }
}; };
}, },
...@@ -315,7 +331,8 @@ export default { ...@@ -315,7 +331,8 @@ export default {
updateTime: null, updateTime: null,
status: "1", status: "1",
themeSelectValue: null, themeSelectValue: null,
areaSelectValue: null areaSelectValue: null,
projectType:null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -345,6 +362,9 @@ export default { ...@@ -345,6 +362,9 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.getThemeList(); this.getThemeList();
this.getDicts("project_type").then(response => {
this.projectTypeSelectValueOptions = response.data;
});
this.reset(); this.reset();
this.open = true; this.open = true;
......
vue.config.js
浏览文件 @ af69fd2c
...@@ -37,7 +37,8 @@ module.exports = { ...@@ -37,7 +37,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://localhost:7788`, // target: `http://localhost:7788`,
target: 'https://faces.diaosaas.com/investigation',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论