Skip to content

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

接口调整

上级 af69fd2c
隐藏空白字符变更
内嵌 并排
正在显示 包含 613 行增加 和 186 行删除
src/api/backstage/dataReport.js
浏览文件 @ a270c462
import request from '@/utils/request' import request from '@/utils/request'
// 获取项目层级列表 // 获取项目层级列表
export function getProjectList() { export function getProjectList(projectId) {
return request({
url: '/backstage/dataReport/getProjectList?projectId='+projectId,
method: 'get'
})
}
// 获取项目层级列表
export function getProjectListTmp() {
return request({ return request({
url: '/backstage/dataReport/getProjectList', url: '/backstage/dataReport/getProjectList',
method: 'get', method: 'get'
}) })
} }
// 导出所有项目数据 // 导出所有项目数据
export function exportAllProject(value) { export function exportAllProject(value) {
return request({ return request({
...@@ -17,3 +23,10 @@ export function exportAllProject(value) { ...@@ -17,3 +23,10 @@ export function exportAllProject(value) {
data:value data:value
}) })
} }
//获取全部项目
export function getAllProjectList() {
return request({
url: '/backstage/dataReport/getAllProjectList',
method: 'get'
})
}
src/api/backstage/highlights.js
浏览文件 @ a270c462
...@@ -16,3 +16,11 @@ export function getHighlightsList(id) { ...@@ -16,3 +16,11 @@ export function getHighlightsList(id) {
method: 'get' method: 'get'
}) })
} }
export function setIsExampleByJobId(query) {
return request({
url: '/targetItem/setIsExampleByJobId?jobId='+query,
method: 'post'
})
}
src/api/backstage/interval.js
浏览文件 @ a270c462
...@@ -16,3 +16,55 @@ export function updateIntervalByPointType(data) { ...@@ -16,3 +16,55 @@ export function updateIntervalByPointType(data) {
data: data data: data
}) })
} }
// 查询地图区间设置列表
export function listInterval(query) {
return request({
url: '/backstage/interval/list',
method: 'get',
params: query
})
}
// 查询地图区间设置详细
export function getInterval(id) {
return request({
url: '/backstage/interval/' + id,
method: 'get'
})
}
// 新增地图区间设置
export function addInterval(data) {
return request({
url: '/backstage/interval',
method: 'post',
data: data
})
}
// 修改地图区间设置
export function updateInterval(data) {
return request({
url: '/backstage/interval',
method: 'put',
data: data
})
}
// 删除地图区间设置
export function delInterval(id) {
return request({
url: '/backstage/interval/' + id,
method: 'delete'
})
}
// 导出地图区间设置
export function exportInterval(query) {
return request({
url: '/backstage/interval/export',
method: 'get',
params: query
})
}
src/api/backstage/problems.js
浏览文件 @ a270c462
...@@ -16,3 +16,10 @@ export function getProblemsList(id) { ...@@ -16,3 +16,10 @@ export function getProblemsList(id) {
method: 'get' method: 'get'
}) })
} }
export function setIsExampleByJobId(query) {
return request({
url: '/targetItem/setIsExampleByJobId?jobId='+query,
method: 'post'
})
}
\ No newline at end of file
src/main.js
浏览文件 @ a270c462
...@@ -99,7 +99,7 @@ Vue.use(Element, { ...@@ -99,7 +99,7 @@ Vue.use(Element, {
}) })
Vue.config.productionTip = false Vue.config.productionTip = false
Element.Dialog.props.closeOnClickModal.default = false;
new Vue({ new Vue({
el: '#app', el: '#app',
router, router,
......
src/views/backstage/dataReport/index.vue
浏览文件 @ a270c462
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<script> <script>
import {exportAllProject,getProjectList } from "@/api/backstage/dataReport"; import {exportAllProject,getProjectListTmp } from "@/api/backstage/dataReport";
export default { export default {
name: "dataReport", name: "dataReport",
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
}, },
created() { created() {
getProjectList().then(res=>{ getProjectListTmp().then(res=>{
this.levelOptions = res.data; this.levelOptions = res.data;
}) })
}, },
......
src/views/backstage/highlights/index.vue
浏览文件 @ a270c462
...@@ -50,13 +50,20 @@ ...@@ -50,13 +50,20 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交时间" align="center" prop="submitTime" width="180"> <el-table-column label="提交时间" align="center" prop="submitTime" width="180">
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
v-if="scope.row.isTypical == 0"
size="mini"
type="text"
icon="el-icon-edit"
@click="setExample(scope.row)"
>设为典型</el-button>
<el-button <el-button
v-if="scope.row.numbers>0" v-if="scope.row.numbers>0"
...@@ -107,7 +114,7 @@ ...@@ -107,7 +114,7 @@
</template> </template>
<script> <script>
import { listHighlightsList, getHighlightsList } from "@/api/backstage/highlights"; import { listHighlightsList, getHighlightsList,setIsExampleByJobId } from "@/api/backstage/highlights";
export default { export default {
name: "Highlights", name: "Highlights",
...@@ -202,6 +209,19 @@ export default { ...@@ -202,6 +209,19 @@ export default {
// this.loading = false; // this.loading = false;
// }); // });
}, },
/** 设置为典型 */
setExample(row){
this.$confirm('是否确认设置项目编号为"' + row.jobId + '"为典型?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return setIsExampleByJobId(row.jobId)
}).then(() => {
this.getList();
this.msgSuccess("设置成功");
})
}
} }
}; };
</script> </script>
src/views/backstage/interval/index.vue
浏览文件 @ a270c462
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 添加或修改地图区间设置对话框 --> <el-form
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> :model="queryParams"
ref="queryForm"
</el-dialog> :inline="true"
v-show="showSearch"
label-width="68px"
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> >
<el-form-item label="统计点类型" prop="statisticsPointType">
<el-select v-model="form.statisticsPointType" placeholder="请选择统计点类型" @change="getIntervalInfo">
<el-option label="省级" value="1" />
<el-option label="市级" value="2" />
<el-option label="县级" value="3" />
<el-option label="乡级" value="4" />
<el-option label="村级" value="5" />
<el-option label="自然村" value="6" />
</el-select>
</el-form-item>
<el-form-item label="第一个区间值" prop="firstNo">
<el-input-number min="0" v-model="form.firstNo" placeholder="请输入第一个区间值，XX以上的值只需填第一个区间值" />
<!-- <p style="color: red"> 注：XX以上的值只需填第一个区间值</p>-->
</el-form-item>
<el-form-item label="第二个区间值" prop="lastNo">
<el-input-number min="0" v-model="form.lastNo" placeholder="请输入第二个区间值" />
</el-form-item>
<el-form-item label="类型" prop="type"> <el-form-item label="类型" prop="type">
<el-select v-model="form.type" placeholder="请选择类型"> <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
<el-option label="区间值" value="1" /> <el-option label="区间值" value="1"/>
<el-option label="XX以上" value="0" /> <el-option label="XX以上" value="0"/>
<el-option label="XX以下" value="2"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="统计点类型" prop="statisticsPointType">
<el-select
v-model="queryParams.statisticsPointType"
placeholder="请选择统计点类型"
clearable
size="small"
>
<el-option label="省级" value="1"/>
<el-option label="市级" value="2"/>
<el-option label="县级" value="3"/>
<el-option label="乡级" value="4"/>
<el-option label="村级" value="5"/>
<el-option label="自然村" value="6"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['backstage:interval:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['backstage:interval:edit']"
>修改</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['backstage:interval:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['backstage:interval:export']"
>导出</el-button>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="intervalList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="自增id" align="center" prop="id"/>
<el-table-column label="第一个区间值，XX以上以下的值也填此处" align="center" prop="firstNo"/>
<el-table-column label="第二个区间值" align="center" prop="lastNo"/>
<el-table-column label="类型" align="center" prop="type" :formatter="typeFormat"/>
<el-table-column
label="统计点类型"
align="center"
prop="statisticsPointType"
:formatter="statisticsPointTypeFormat"
/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['backstage:interval:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['backstage:interval:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改地图区间设置对话框 -->
<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-item label="第一个区间值，XX以上的值也填此处" prop="firstNo">
<el-input-number min="0" v-model="form.firstNo" placeholder="请输入第一个区间值，XX以上的值也填此处"/>
</el-form-item>
<el-form-item label="第二个区间值" prop="lastNo">
<el-input-number min="0" v-model="form.lastNo" placeholder="请输入第二个区间值"/>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" placeholder="请选择类型">
<el-option label="区间值" value="1"/>
<el-option label="XX以上" value="0"/>
<el-option label="XX以下" value="2"/>
</el-select>
</el-form-item>
<el-form-item label="统计点类型" prop="statisticsPointType">
<el-select v-model="form.statisticsPointType" placeholder="请选择统计点类型">
<el-option label="省级" value="1"/>
<el-option label="市级" value="2"/>
<el-option label="县级" value="3"/>
<el-option label="乡级" value="4"/>
<el-option label="村级" value="5"/>
<el-option label="自然村" value="6"/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getIntervalInfoByPointType, updateIntervalByPointType } from "@/api/backstage/interval"; import {
listInterval,
getInterval,
delInterval,
addInterval,
updateInterval,
exportInterval
} from "@/api/backstage/interval";
import { rename } from "fs";
export default { export default {
name: "Interval", name: "Interval",
...@@ -56,69 +173,48 @@ export default { ...@@ -56,69 +173,48 @@ export default {
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 地图区间设置表格数据 // 地图区间设置表格数据
intervalList: [], intervalList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 表单参数 // 查询参数
form: { queryParams: {
id: null, pageNum: 1,
firstNo: null, pageSize: 10,
lastNo: null, firstNo: null,
type: null, lastNo: null,
statisticsPointType: null, type: null,
createTime: null, statisticsPointType: null
updateTime: null
}, },
// 表单参数
form: {},
// 表单校验 // 表单校验
rules: { rules: {}
statisticsPointType:[
{
required: true,
message: "统计点类型不能为空",
trigger: "blur"
},
],
firstNo:[
{
required: true,
message: "第一个区间值不能为空",
trigger: "blur"
},
],
type:[
{
required: true,
message: "类型不能为空",
trigger: "blur"
},
]
}
}; };
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
getIntervalInfo() { /** 查询地图区间设置列表 */
getIntervalInfoByPointType(this.form.statisticsPointType).then(response => { getList() {
this.form = response.data; this.loading = true;
}); listInterval(this.queryParams).then(response => {
}, this.intervalList = response.rows;
this.total = response.total;
this.loading = false;
});
// /** 查询地图区间设置列表 */ },
// getList() {
// this.loading = true;
// listInterval(this.queryParams).then(response => {
// this.intervalList = response.rows;
// this.total = response.total;
// this.loading = false;
// });
// },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -137,52 +233,184 @@ export default { ...@@ -137,52 +233,184 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加地图区间设置";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getInterval(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改地图区间设置";
});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.repeatSubmit=true this.repeatSubmit = true;
setTimeout(()=>{ setTimeout(() => {
this.repeatSubmit = false //点击一次时隔两秒后才能再次点击 this.repeatSubmit = false; //点击一次时隔两秒后才能再次点击
},2000) }, 2000);
var lastNo = Number(this.form.lastNo);
var lastNo=Number(this.form.lastNo) var firstNo = Number(this.form.firstNo);
var firstNo=Number(this.form.firstNo)
//区间值 //区间值
if(this.form.type == 1){ if (this.form.type == 1) {
if (lastNo==null) { if (lastNo == null) {
console.log( "1111") console.log("1111");
this.msgError("第二区间值为空！请输入第二区间值") this.msgError("第二区间值为空！请输入第二区间值");
}else if(lastNo<=firstNo){ } else if (lastNo <= firstNo) {
console.log( "2222") console.log("2222");
this.msgError("第二区间值必须大于第一区间值") this.msgError("第二区间值必须大于第一区间值");
} } else {
else { console.log("3333");
console.log( "3333") this.$refs["form"].validate(valid => {
this.$refs["form"].validate(valid => { if (valid) {
if (valid) { if (this.form.id != null) {
updateIntervalByPointType(this.form).then(response => { updateInterval(this.form).then(response => {
this.msgSuccess("修改成功"); this.open = false;
}); this.msgSuccess("修改成功");
this.getList();
} });
}); } else {
} addInterval(this.form).then(response => {
//xx以上 this.msgSuccess("新增成功");
}else if(this.form.type == 0){ this.open = false;
if(lastNo>0){ this.getList();
console.log( "44444") });
this.msgError("第二区间值x需为空！") }
}else { }
console.log( "5555") });
this.$refs["form"].validate(valid => {
if (valid) {
updateIntervalByPointType(this.form).then(response => {
this.msgSuccess("修改成功");
});
}
});
}
} }
//xx以上
} else if (this.form.type == 0 || this.form.type == 2) {
if (lastNo > 0) {
console.log("44444");
this.msgError("第二区间值x需为空！");
} else {
console.log("5555");
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateInterval(this.form).then(response => {
this.open = false;
this.msgSuccess("修改成功");
this.getList();
});
} else {
addInterval(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
}
}
// this.$refs["form"].validate(valid => {
// if (valid) {
// if (this.form.id != null) {
// updateInterval(this.form).then(response => {
// this.msgSuccess("修改成功");
// this.open = false;
// this.getList();
// });
// } else {
// addInterval(this.form).then(response => {
// this.msgSuccess("新增成功");
// this.open = false;
// this.getList();
// });
// }
// }
// });
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除地图区间设置编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}
)
.then(function() {
return delInterval(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有地图区间设置数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(function() {
return exportInterval(queryParams);
})
.then(response => {
this.download(response.msg);
});
},
statisticsPointTypeFormat(row, column) {
if (row.statisticsPointType == "1") {
return "省级";
}
if (row.statisticsPointType == "2") {
return "市级";
}
if (row.statisticsPointType == "3") {
return "县级";
}
if (row.statisticsPointType == "4") {
return "乡级";
}
if (row.statisticsPointType == "5") {
return "村级";
}
if (row.statisticsPointType == "6") {
return "自然村";
}
}, },
typeFormat(row, column) {
if (row.type == "0") {
return "XX以上";
}
if (row.type == "1") {
return "区间值";
}
if (row.type == "2") {
return "XX以下";
}
}
} }
}; };
</script> </script>
\ No newline at end of file
src/views/backstage/item/index.vue
浏览文件 @ a270c462
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
:key="cascaderKey" :key="cascaderKey"
v-model="form.levelValue" v-model="form.levelValue"
:options="levelOptions" :options="levelOptions"
:props="{ expandTrigger: 'hover' }" :props="{ expandTrigger: 'hover',checkStrictly: true }"
@change="handleChange" @change="handleChange"
clearable></el-cascader> clearable></el-cascader>
</div> </div>
......
src/views/backstage/job/detail.vue
浏览文件 @ a270c462
...@@ -162,6 +162,41 @@ ...@@ -162,6 +162,41 @@
</div> </div>
<el-divider v-if="firstList.length > 0"></el-divider>
<H3 v-if="firstList.length > 0" style="font-size: 30px">初考内容</H3>
<div v-if="firstList.length > 0" style="margin-top: 20px">
<span style="color: red">注：备注黑色为普通；有问题的为红色；有亮点的为蓝色</span>
</div>
<div style="margin-top: 20px;margin-left: 60px">
<div v-viewer v-for="image in firstList" v-if="image.mediaType == '1'"
style="display: inline-block; width: 20%; margin-left: 10px;vertical-align: middle;text-align: center;">
<img
:src="image.url"
style="width: 100px;height: 100px; cursor:pointer"/>
<div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
<div style="margin-top: 20px" v-else>
<div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
</div>
</div>
<div v-for="image in firstList" v-if="image.mediaType == '2'"
style="display: inline-block; width: 20%; margin-left: 10px;vertical-align: middle;text-align: center;">
<div>
<video style="width: 100%; height: 200px;" autoplay controls :src="image.url"></video>
<div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
<div style="margin-top: 20px" v-else>
<div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
</div>
</div>
</div>
</div>
<el-divider v-if="rectifyList.length > 0"></el-divider> <el-divider v-if="rectifyList.length > 0"></el-divider>
<H3 v-if="rectifyList.length > 0" style="font-size: 30px">整改内容</H3> <H3 v-if="rectifyList.length > 0" style="font-size: 30px">整改内容</H3>
...@@ -197,7 +232,8 @@ ...@@ -197,7 +232,8 @@
<el-divider v-if="checkList.length > 0"></el-divider> <el-divider v-if="checkList.length > 0"></el-divider>
<H3 v-if="checkList.length > 0" style="font-size: 30px">调查员复查内容</H3> <H3 v-if="checkList.length > 0" style="font-size: 30px">复查信息:{{checkName}}</H3>
<p>{{checkTime}}</p>
<div v-if="checkList.length > 0" style="margin-top: 20px"> <div v-if="checkList.length > 0" style="margin-top: 20px">
<span style="color: red">注：备注黑色为普通；有问题的为红色；有亮点的为蓝色</span> <span style="color: red">注：备注黑色为普通；有问题的为红色；有亮点的为蓝色</span>
...@@ -280,8 +316,11 @@ ...@@ -280,8 +316,11 @@
form: {}, form: {},
targetList: [],//考核内容 targetList: [],//考核内容
resetTargetList:[],//调查员重新调查内容 resetTargetList:[],//调查员重新调查内容
firstList:[],//初考内容
checkList:[],//复查内容 checkList:[],//复查内容
rectifyList:[],//整改内容 rectifyList:[],//整改内容
checkName:"",
checkTime:"",
addScoreCount: 0, addScoreCount: 0,
reduceScoreCount: 0, reduceScoreCount: 0,
gps: '', gps: '',
...@@ -325,9 +364,12 @@ ...@@ -325,9 +364,12 @@
this.resetTargetList = res.data.resetTJobTargets; this.resetTargetList = res.data.resetTJobTargets;
this.rectifyList = res.data.rectifyList; this.rectifyList = res.data.rectifyList;
this.checkList = res.data.checkList; this.checkList = res.data.checkList;
this.firstList = res.data.firstList;
this.addScoreCount = res.data.addScoreCount; this.addScoreCount = res.data.addScoreCount;
this.reduceScoreCount = res.data.reduceScoreCount; this.reduceScoreCount = res.data.reduceScoreCount;
this.gps = res.data.gps; this.gps = res.data.gps;
this.checkName = res.data.checkName;
this.checkTime = res.data.checkTime;
}); });
//获取原因库 //获取原因库
......
src/views/backstage/job/index.vue
浏览文件 @ a270c462
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jobList" @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="任务编号" align="center" prop="id" />
<el-table-column label="区域名称" align="center" prop="totalAreaName" /> <el-table-column label="区域名称" align="center" prop="totalAreaName" />
<el-table-column label="项目名称" align="center" prop="projectName" /> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="任务类型" align="center" prop="jobType" > <el-table-column label="任务类型" align="center" prop="jobType" >
...@@ -227,7 +228,7 @@ ...@@ -227,7 +228,7 @@
>选择整改指标</el-button> >选择整改指标</el-button>
<el-button <el-button
v-if="scope.row.jobType == '1' && scope.row.checkUserName == null" v-if="scope.row.jobType == '1' && scope.row.checkUserName == null && scope.row.rectifyStatus == '3' && scope.row.approveStatus == '4'"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
...@@ -303,13 +304,22 @@ ...@@ -303,13 +304,22 @@
<div> <div>
<!-- <span>选择项目主题</span>--> <!-- <span>选择项目主题</span>-->
<span>项目: </span>
<span> <span>
<el-cascader <el-select style="width: 80%" v-model="projectIdSelect" placeholder="请选择项目" clearable @change="selectProject()" >
style="width: 100%" <el-option v-for="item in projectListName" :label="item.name" :value="item.id" />
</el-select>
</span>
</div>
<br><br>
<div>
<span>
主题: <el-cascader
style="width: 80%"
key="id" key="id"
v-model="exportLevelValue" v-model="exportLevelValue"
:options="exportLevelOptions" :options="exportLevelOptions"
:props="{ expandTrigger: 'hover' }" :props="{ expandTrigger: 'hover',checkStrictly: true}"
clearable></el-cascader> clearable></el-cascader>
</span> </span>
...@@ -326,7 +336,7 @@ ...@@ -326,7 +336,7 @@
<script> <script>
import { selectCheckTarget,getCheckTarget,selectRectifyTarget,getRectifyTarget, distributeRectificationJob, rollbackJob, auditJob, getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job"; import { selectCheckTarget,getCheckTarget,selectRectifyTarget,getRectifyTarget, distributeRectificationJob, rollbackJob, auditJob, getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job";
import {exportAllProject,getProjectList } from "@/api/backstage/dataReport"; import {exportAllProject,getProjectList,getAllProjectList } from "@/api/backstage/dataReport";
export default { export default {
name: "Job", name: "Job",
...@@ -334,6 +344,8 @@ export default { ...@@ -334,6 +344,8 @@ export default {
return { return {
exportLevelValue:[], exportLevelValue:[],
exportLevelOptions:[], exportLevelOptions:[],
projectIdSelect:null,
projectListName:[],
exportOpen:false, exportOpen:false,
rectifyTargetValueOptions:[], rectifyTargetValueOptions:[],
checkTargetValueOptions:[], checkTargetValueOptions:[],
...@@ -564,13 +576,11 @@ export default { ...@@ -564,13 +576,11 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.exportLevelValue = null; this.exportLevelValue = null;
getProjectList().then(res=>{ getAllProjectList().then(res=>{
this.exportLevelOptions = res.data; this.projectListName = res.data;
this.title='选择项目主题';
this.exportOpen = true;
}) })
this.title='选择项目主题';
this.exportOpen = true;
}, },
//提交导出 //提交导出
exportSubmit(){ exportSubmit(){
...@@ -584,7 +594,13 @@ export default { ...@@ -584,7 +594,13 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() =>{ }).then(() =>{
return exportAllProject(this.exportLevelValue);
var data = {
"ids":this.exportLevelValue,
"projectId":this.projectIdSelect
};
return exportAllProject(data);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
this.exportOpen = false; this.exportOpen = false;
...@@ -713,6 +729,12 @@ export default { ...@@ -713,6 +729,12 @@ export default {
this.form.checkTargetValue = JSON.parse(this.form.checkTargetValue); this.form.checkTargetValue = JSON.parse(this.form.checkTargetValue);
} }
}); });
},
selectProject(){
console.log(this.projectIdSelect)
getProjectList(this.projectIdSelect).then(res=>{
this.exportLevelOptions = res.data;
})
} }
} }
}; };
......
src/views/backstage/point/index.vue
浏览文件 @ a270c462
...@@ -118,15 +118,17 @@ ...@@ -118,15 +118,17 @@
style="width: 100%" style="width: 100%"
row-key="id" row-key="id"
:indent="50" :indent="50"
border border
lazy >
<!-- lazy
:load="load" :load="load"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> :tree-props="{children: 'children', hasChildren: 'hasChildren'}" -->
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column type="index" :index="table_index" label="序号" align="center" prop="id"/>--> <!-- <el-table-column type="index" :index="table_index" label="序号" align="center" prop="id"/>-->
<el-table-column min-width="300px" label="名称" align="center" prop="name" /> <el-table-column min-width="300px" label="名称" align="center" prop="totalLevelName" />
<el-table-column label="账号" align="center" prop="account" /> <el-table-column label="账号" align="center" prop="account" />
<!-- <el-table-column label="密码" align="center" prop="password" />--> <el-table-column label="密码" align="center" prop="realPassword" />
<el-table-column min-width="100px" label="坐标" align="center" prop="longitude" > <el-table-column min-width="100px" label="坐标" align="center" prop="longitude" >
<template scope="scope"> <template scope="scope">
...@@ -213,6 +215,14 @@ ...@@ -213,6 +215,14 @@
<el-input show-password type="password" placeholder="请再次输入密码" v-model="form.comfirmPassword" autocomplete="off"></el-input> <el-input show-password type="password" placeholder="请再次输入密码" v-model="form.comfirmPassword" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-form-item>
<!-- <el-form-item label="密码" prop="password">--> <!-- <el-form-item label="密码" prop="password">-->
<!-- <el-input placeholder="请输入密码" type="password" v-model="form.password" show-password></el-input>--> <!-- <el-input placeholder="请输入密码" type="password" v-model="form.password" show-password></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
...@@ -416,6 +426,8 @@ export default { ...@@ -416,6 +426,8 @@ export default {
type: null, type: null,
comfirmPassword: null, comfirmPassword: null,
levelValue: null, levelValue: null,
longitude:null,
latitude:null,
}, },
// 表单校验 // 表单校验
rules: { rules: {
......
src/views/backstage/policy/index.vue
浏览文件 @ a270c462
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
/> />
<!-- 添加或修改政策公告对话框 --> <!-- 添加或修改政策公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<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="300"/>
</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"-->
......
src/views/backstage/problems/index.vue
浏览文件 @ a270c462
...@@ -50,14 +50,20 @@ ...@@ -50,14 +50,20 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交时间" align="center" prop="submitTime" width="180"> <el-table-column label="提交时间" align="center" prop="submitTime" width="180">
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
v-if="scope.row.isTypical == 0"
size="mini"
type="text"
icon="el-icon-edit"
@click="setExample(scope.row)"
>设为典型</el-button>
<el-button <el-button
v-if="scope.row.numbers>0" v-if="scope.row.numbers>0"
size="mini" size="mini"
...@@ -107,7 +113,7 @@ ...@@ -107,7 +113,7 @@
</template> </template>
<script> <script>
import { listProblemsList, getProblemsList } from "@/api/backstage/problems"; import { listProblemsList, getProblemsList,setIsExampleByJobId } from "@/api/backstage/problems";
export default { export default {
name: "Problems", name: "Problems",
...@@ -202,6 +208,19 @@ export default { ...@@ -202,6 +208,19 @@ export default {
// this.loading = false; // this.loading = false;
// }); // });
}, },
/** 设置为典型 */
setExample(row){
this.$confirm('是否确认设置项目编号为"' + row.jobId + '"为典型?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return setIsExampleByJobId(row.jobId)
}).then(() => {
this.getList();
this.msgSuccess("设置成功");
})
}
} }
}; };
</script> </script>
src/views/backstage/project/index.vue
浏览文件 @ a270c462
...@@ -75,6 +75,8 @@ ...@@ -75,6 +75,8 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="关联统计点" prop="pointList" align="center" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="考核主题数量" align="center" prop="targetCount" > <el-table-column label="考核主题数量" align="center" prop="targetCount" >
<template scope="scope"> <template scope="scope">
...@@ -191,7 +193,7 @@ ...@@ -191,7 +193,7 @@
placeholder="请选择统计点" placeholder="请选择统计点"
v-model="form.areaSelectValue" v-model="form.areaSelectValue"
:options="statisticsPoints" :options="statisticsPoints"
:props="{multiple: true, expandTrigger: 'hover'}" :props="{multiple: true, expandTrigger: 'hover',checkStrictly: true}"
filterable filterable
clearable></el-cascader> clearable></el-cascader>
</div> </div>
...@@ -292,9 +294,6 @@ export default { ...@@ -292,9 +294,6 @@ export default {
], ],
themeSelectValue: [ themeSelectValue: [
{ required: true, message: "主题不能为空，请选择主题", trigger: "blur" } { required: true, message: "主题不能为空，请选择主题", trigger: "blur" }
],
projectType:[
{ required: true, message: "项目级别不能为空，请选择级别", trigger: "blur" }
] ]
} }
}; };
...@@ -380,7 +379,9 @@ export default { ...@@ -380,7 +379,9 @@ export default {
if(this.form.themeSelectValue){ if(this.form.themeSelectValue){
this.form.themeSelectValue = JSON.parse(this.form.themeSelectValue); this.form.themeSelectValue = JSON.parse(this.form.themeSelectValue);
} }
this.getDicts("project_type").then(response => {
this.projectTypeSelectValueOptions = response.data;
});
this.getThemeList(); this.getThemeList();
this.open = true; this.open = true;
......
src/views/backstage/target/index.vue
浏览文件 @ a270c462
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
<el-form-item label="总分值"> <el-form-item label="总分值">
<span>{{ props.row.highScore }}</span> <span>{{ props.row.highScore }}</span>
</el-form-item> </el-form-item>
<el-form-item label="所属村类型"> <!-- <el-form-item label="所属村类型">
<span v-if="props.row.villageType == '0'">行政村</span> <span v-if="props.row.villageType == '0'">行政村</span>
<span v-else>自然村</span> <span v-else>自然村</span>
</el-form-item> </el-form-item> -->
<el-form-item label="所属指标分类"> <el-form-item label="所属指标分类">
<span>{{ props.row.allTargetLevelName }}</span> <span>{{ props.row.allTargetLevelName }}</span>
</el-form-item> </el-form-item>
...@@ -125,12 +125,12 @@ ...@@ -125,12 +125,12 @@
<el-table-column label="每点加/减分值" align="center" prop="plusReduceItemEvery" /> <el-table-column label="每点加/减分值" align="center" prop="plusReduceItemEvery" />
<el-table-column show-overflow-tooltip label="加/减分项" align="center" prop="plusReduceItem" /> <el-table-column show-overflow-tooltip label="加/减分项" align="center" prop="plusReduceItem" />
<el-table-column label="总分值" align="center" prop="highScore" /> <el-table-column label="总分值" align="center" prop="highScore" />
<el-table-column label="所属村类型" align="center" prop="villageType" > <!-- <el-table-column label="所属村类型" align="center" prop="villageType" >
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.villageType == '0'">行政村</span> <span v-if="scope.row.villageType == '0'">行政村</span>
<span v-else>自然村</span> <span v-else>自然村</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="所属指标分类" align="center" prop="allTargetLevelName" /> <el-table-column label="所属指标分类" align="center" prop="allTargetLevelName" />
<el-table-column label="创建时间" align="center" prop="createTime"/> <el-table-column label="创建时间" align="center" prop="createTime"/>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.type" :label="form.type == '1' ? '每点加分值' : '每点减分值'" prop="plusReduceItemEvery"> <el-form-item v-if="form.type" :label="form.type == '1' ? '每点加分值' : '每点减分值'" prop="plusReduceItemEvery">
<el-input-number :min="0" v-model="form.plusReduceItemEvery" placeholder="请输入分值" /> <el-input-number :min="0" :step="0.5" v-model="form.plusReduceItemEvery" placeholder="请输入分值" />
</el-form-item> </el-form-item>
<el-form-item v-if="form.type" :label="form.type == '1' ? '加分项' : '减分项'" prop="plusReduceItem"> <el-form-item v-if="form.type" :label="form.type == '1' ? '加分项' : '减分项'" prop="plusReduceItem">
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
</el-form-item> </el-form-item>
<el-form-item label="考核总分值" prop="highScore"> <el-form-item label="考核总分值" prop="highScore">
<el-input-number :min="form.plusReduceItemEvery" v-model="form.highScore" placeholder="请输入考核总分值" /> <el-input-number :min="form.plusReduceItemEvery" :step="0.5" v-model="form.highScore" placeholder="请输入考核总分值" />
</el-form-item> </el-form-item>
<el-form-item label="所属指标分类" prop="levelValue"> <el-form-item label="所属指标分类" prop="levelValue">
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="所属村类型" prop="villageType"> <!-- <el-form-item label="所属村类型" prop="villageType">
<el-select style="width: 100%" v-model="form.villageType" placeholder="请选择"> <el-select style="width: 100%" v-model="form.villageType" placeholder="请选择">
<el-option <el-option
v-for="item in villageTypeOptions" v-for="item in villageTypeOptions"
...@@ -221,11 +221,11 @@ ...@@ -221,11 +221,11 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="典型示例图" prop="exhibitionImages"> <el-form-item label="典型示例图" prop="exhibitionImages">
<div> <div>
<span>（仅可上传3张图）（建议尺寸：686*340）</span> <span>（建议尺寸：686*340）</span>
</div> </div>
<div> <div>
<el-upload <el-upload
...@@ -233,7 +233,6 @@ ...@@ -233,7 +233,6 @@
list-type="picture-card" list-type="picture-card"
show-file-list show-file-list
:file-list="images" :file-list="images"
:limit="3"
:headers="upload.headers" :headers="upload.headers"
accept=".jpg, .png, .jpeg" accept=".jpg, .png, .jpeg"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
...@@ -353,9 +352,9 @@ export default { ...@@ -353,9 +352,9 @@ export default {
highScore: [ highScore: [
{ required: true, message: "考核总分值不能为空，请输入考核总分值", trigger: "blur" } { required: true, message: "考核总分值不能为空，请输入考核总分值", trigger: "blur" }
], ],
villageType: [ // villageType: [
{ required: true, message: "所属村类型不能为空，请选择所属村类型", trigger: "blur" } // { required: true, message: "所属村类型不能为空，请选择所属村类型", trigger: "blur" }
], // ],
levelValue: [ levelValue: [
{ required: true, message: "所属指标分类不能为空，请选择所属指标分类", trigger: "blur" } { required: true, message: "所属指标分类不能为空，请选择所属指标分类", trigger: "blur" }
], ],
...@@ -482,7 +481,6 @@ export default { ...@@ -482,7 +481,6 @@ export default {
},2000) },2000)
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
//处理上传的图片 //处理上传的图片
if(this.fileList.length > 0){ if(this.fileList.length > 0){
let urls = ''; let urls = '';
...@@ -501,6 +499,9 @@ export default { ...@@ -501,6 +499,9 @@ export default {
} }
}) })
this.form.targetPicUrl = urls; this.form.targetPicUrl = urls;
}else{
this.form.targetPicUrl = "";
} }
//处理指标层级 //处理指标层级
...@@ -570,7 +571,8 @@ export default { ...@@ -570,7 +571,8 @@ export default {
//删除上传文件 //删除上传文件
handleRemove(file, fileList) { handleRemove(file, fileList) {
// console.log(file, fileList); // console.log(file, fileList);
this.fileList = fileList; console.log(fileList)
this.fileList = fileList;
}, },
//点击文件列表中已上传的文件时的钩子 //点击文件列表中已上传的文件时的钩子
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
......
src/views/backstage/theme/index.vue
浏览文件 @ a270c462
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
key="id" key="id"
v-model="form.adminVillageLevelValue" v-model="form.adminVillageLevelValue"
:options="administrativeVillages" :options="administrativeVillages"
:props="{multiple: true, expandTrigger: 'hover'}" :props="{multiple: true, expandTrigger: 'hover',checkStrictly: true}"
@change="handleChange" @change="handleChange"
filterable filterable
clearable></el-cascader> clearable></el-cascader>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
key="id" key="id"
v-model="form.naturalVillageLevelValue" v-model="form.naturalVillageLevelValue"
:options="naturalVillages" :options="naturalVillages"
:props="{multiple: true, expandTrigger: 'hover'}" :props="{multiple: true, expandTrigger: 'hover',checkStrictly: true}"
@change="handleChange" @change="handleChange"
filterable filterable
clearable></el-cascader> clearable></el-cascader>
......
vue.config.js
浏览文件 @ a270c462
...@@ -37,8 +37,9 @@ module.exports = { ...@@ -37,8 +37,9 @@ 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', // target: `http://152.136.125.222:8095/investigation`, //正式
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论