Skip to content

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

接口调整

上级 af69fd2c
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 613 行增加 和 186 行删除
src/api/backstage/dataReport.js
浏览文件 @ a270c462
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({
url: '/backstage/dataReport/getProjectList',
method: 'get',
method: 'get'
})
}
// 导出所有项目数据
export function exportAllProject(value) {
return request({
......@@ -17,3 +23,10 @@ export function exportAllProject(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) {
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) {
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) {
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, {
})
Vue.config.productionTip = false
Element.Dialog.props.closeOnClickModal.default = false;
new Vue({
el: '#app',
router,
......
src/views/backstage/dataReport/index.vue
浏览文件 @ a270c462
......@@ -40,7 +40,7 @@
<script>
import {exportAllProject,getProjectList } from "@/api/backstage/dataReport";
import {exportAllProject,getProjectListTmp } from "@/api/backstage/dataReport";
export default {
name: "dataReport",
......@@ -53,7 +53,7 @@
}
},
created() {
getProjectList().then(res=>{
getProjectListTmp().then(res=>{
this.levelOptions = res.data;
})
},
......
src/views/backstage/highlights/index.vue
浏览文件 @ a270c462
......@@ -50,13 +50,20 @@
</template>
</el-table-column>
<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>
</template>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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
v-if="scope.row.numbers>0"
......@@ -107,7 +114,7 @@
</template>
<script>
import { listHighlightsList, getHighlightsList } from "@/api/backstage/highlights";
import { listHighlightsList, getHighlightsList,setIsExampleByJobId } from "@/api/backstage/highlights";
export default {
name: "Highlights",
......@@ -202,6 +209,19 @@ export default {
// 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>
src/views/backstage/item/index.vue
浏览文件 @ a270c462
......@@ -131,7 +131,7 @@
:key="cascaderKey"
v-model="form.levelValue"
:options="levelOptions"
:props="{ expandTrigger: 'hover' }"
:props="{ expandTrigger: 'hover',checkStrictly: true }"
@change="handleChange"
clearable></el-cascader>
</div>
......
src/views/backstage/job/detail.vue
浏览文件 @ a270c462
......@@ -162,6 +162,41 @@
</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>
<H3 v-if="rectifyList.length > 0" style="font-size: 30px">整改内容</H3>
......@@ -197,7 +232,8 @@
<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">
<span style="color: red">注：备注黑色为普通；有问题的为红色；有亮点的为蓝色</span>
......@@ -280,8 +316,11 @@
form: {},
targetList: [],//考核内容
resetTargetList:[],//调查员重新调查内容
firstList:[],//初考内容
checkList:[],//复查内容
rectifyList:[],//整改内容
checkName:"",
checkTime:"",
addScoreCount: 0,
reduceScoreCount: 0,
gps: '',
......@@ -325,9 +364,12 @@
this.resetTargetList = res.data.resetTJobTargets;
this.rectifyList = res.data.rectifyList;
this.checkList = res.data.checkList;
this.firstList = res.data.firstList;
this.addScoreCount = res.data.addScoreCount;
this.reduceScoreCount = res.data.reduceScoreCount;
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 @@
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
<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="projectName" />
<el-table-column label="任务类型" align="center" prop="jobType" >
......@@ -227,7 +228,7 @@
>选择整改指标</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"
type="text"
icon="el-icon-edit"
......@@ -303,13 +304,22 @@
<div>
<!-- <span>选择项目主题</span>-->
<span>项目: </span>
<span>
<el-cascader
style="width: 100%"
<el-select style="width: 80%" v-model="projectIdSelect" placeholder="请选择项目" clearable @change="selectProject()" >
<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"
v-model="exportLevelValue"
:options="exportLevelOptions"
:props="{ expandTrigger: 'hover' }"
:props="{ expandTrigger: 'hover',checkStrictly: true}"
clearable></el-cascader>
</span>
......@@ -326,7 +336,7 @@
<script>
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 {
name: "Job",
......@@ -334,6 +344,8 @@ export default {
return {
exportLevelValue:[],
exportLevelOptions:[],
projectIdSelect:null,
projectListName:[],
exportOpen:false,
rectifyTargetValueOptions:[],
checkTargetValueOptions:[],
......@@ -564,13 +576,11 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.exportLevelValue = null;
getProjectList().then(res=>{
this.exportLevelOptions = res.data;
getAllProjectList().then(res=>{
this.projectListName = res.data;
})
this.title='选择项目主题';
this.exportOpen = true;
})
},
//提交导出
exportSubmit(){
......@@ -584,7 +594,13 @@ export default {
cancelButtonText: "取消",
type: "warning"
}).then(() =>{
return exportAllProject(this.exportLevelValue);
var data = {
"ids":this.exportLevelValue,
"projectId":this.projectIdSelect
};
return exportAllProject(data);
}).then(response => {
this.download(response.msg);
this.exportOpen = false;
......@@ -713,6 +729,12 @@ export default {
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
......@@ -119,14 +119,16 @@
row-key="id"
:indent="50"
border
lazy
>
<!-- lazy
: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="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="password" />-->
<el-table-column label="密码" align="center" prop="realPassword" />
<el-table-column min-width="100px" label="坐标" align="center" prop="longitude" >
<template scope="scope">
......@@ -213,6 +215,14 @@
<el-input show-password type="password" placeholder="请再次输入密码" v-model="form.comfirmPassword" autocomplete="off"></el-input>
</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-input placeholder="请输入密码" type="password" v-model="form.password" show-password></el-input>-->
<!-- </el-form-item>-->
......@@ -416,6 +426,8 @@ export default {
type: null,
comfirmPassword: null,
levelValue: null,
longitude:null,
latitude:null,
},
// 表单校验
rules: {
......
src/views/backstage/policy/index.vue
浏览文件 @ a270c462
......@@ -117,13 +117,13 @@
/>
<!-- 添加或修改政策公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="1500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" type="textarea" placeholder="请输入内容"/>
</el-form-item>
<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 label="发布时间" prop="publishTime">-->
<!-- <el-date-picker clearable size="small" style="width: 200px"-->
......
src/views/backstage/problems/index.vue
浏览文件 @ a270c462
......@@ -50,14 +50,20 @@
</template>
</el-table-column>
<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>
</template>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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
v-if="scope.row.numbers>0"
size="mini"
......@@ -107,7 +113,7 @@
</template>
<script>
import { listProblemsList, getProblemsList } from "@/api/backstage/problems";
import { listProblemsList, getProblemsList,setIsExampleByJobId } from "@/api/backstage/problems";
export default {
name: "Problems",
......@@ -202,6 +208,19 @@ export default {
// 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>
src/views/backstage/project/index.vue
浏览文件 @ a270c462
......@@ -75,6 +75,8 @@
</el-switch>
</template>
</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="targetCount" >
<template scope="scope">
......@@ -191,7 +193,7 @@
placeholder="请选择统计点"
v-model="form.areaSelectValue"
:options="statisticsPoints"
:props="{multiple: true, expandTrigger: 'hover'}"
:props="{multiple: true, expandTrigger: 'hover',checkStrictly: true}"
filterable
clearable></el-cascader>
</div>
......@@ -292,9 +294,6 @@ export default {
],
themeSelectValue: [
{ required: true, message: "主题不能为空，请选择主题", trigger: "blur" }
],
projectType:[
{ required: true, message: "项目级别不能为空，请选择级别", trigger: "blur" }
]
}
};
......@@ -380,7 +379,9 @@ export default {
if(this.form.themeSelectValue){
this.form.themeSelectValue = JSON.parse(this.form.themeSelectValue);
}
this.getDicts("project_type").then(response => {
this.projectTypeSelectValueOptions = response.data;
});
this.getThemeList();
this.open = true;
......
src/views/backstage/target/index.vue
浏览文件 @ a270c462
......@@ -99,10 +99,10 @@
<el-form-item label="总分值">
<span>{{ props.row.highScore }}</span>
</el-form-item>
<el-form-item label="所属村类型">
<!-- <el-form-item label="所属村类型">
<span v-if="props.row.villageType == '0'">行政村</span>
<span v-else>自然村</span>
</el-form-item>
</el-form-item> -->
<el-form-item label="所属指标分类">
<span>{{ props.row.allTargetLevelName }}</span>
</el-form-item>
......@@ -125,12 +125,12 @@
<el-table-column label="每点加/减分值" align="center" prop="plusReduceItemEvery" />
<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="villageType" >
<!-- <el-table-column label="所属村类型" align="center" prop="villageType" >
<template scope="scope">
<span v-if="scope.row.villageType == '0'">行政村</span>
<span v-else>自然村</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="所属指标分类" align="center" prop="allTargetLevelName" />
<el-table-column label="创建时间" align="center" prop="createTime"/>
......@@ -187,7 +187,7 @@
</el-form-item>
<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 v-if="form.type" :label="form.type == '1' ? '加分项' : '减分项'" prop="plusReduceItem">
......@@ -195,7 +195,7 @@
</el-form-item>
<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 label="所属指标分类" prop="levelValue">
......@@ -212,7 +212,7 @@
</div>
</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-option
v-for="item in villageTypeOptions"
......@@ -221,11 +221,11 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="典型示例图" prop="exhibitionImages">
<div>
<span>（仅可上传3张图）（建议尺寸：686*340）</span>
<span>（建议尺寸：686*340）</span>
</div>
<div>
<el-upload
......@@ -233,7 +233,6 @@
list-type="picture-card"
show-file-list
:file-list="images"
:limit="3"
:headers="upload.headers"
accept=".jpg, .png, .jpeg"
:on-preview="handlePictureCardPreview"
......@@ -353,9 +352,9 @@ export default {
highScore: [
{ required: true, message: "考核总分值不能为空，请输入考核总分值", trigger: "blur" }
],
villageType: [
{ required: true, message: "所属村类型不能为空，请选择所属村类型", trigger: "blur" }
],
// villageType: [
// { required: true, message: "所属村类型不能为空，请选择所属村类型", trigger: "blur" }
// ],
levelValue: [
{ required: true, message: "所属指标分类不能为空，请选择所属指标分类", trigger: "blur" }
],
......@@ -482,7 +481,6 @@ export default {
},2000)
this.$refs["form"].validate(valid => {
if (valid) {
//处理上传的图片
if(this.fileList.length > 0){
let urls = '';
......@@ -501,6 +499,9 @@ export default {
}
})
this.form.targetPicUrl = urls;
}else{
this.form.targetPicUrl = "";
}
//处理指标层级
......@@ -570,6 +571,7 @@ export default {
//删除上传文件
handleRemove(file, fileList) {
// console.log(file, fileList);
console.log(fileList)
this.fileList = fileList;
},
//点击文件列表中已上传的文件时的钩子
......
src/views/backstage/theme/index.vue
浏览文件 @ a270c462
......@@ -111,7 +111,7 @@
key="id"
v-model="form.adminVillageLevelValue"
:options="administrativeVillages"
:props="{multiple: true, expandTrigger: 'hover'}"
:props="{multiple: true, expandTrigger: 'hover',checkStrictly: true}"
@change="handleChange"
filterable
clearable></el-cascader>
......@@ -126,7 +126,7 @@
key="id"
v-model="form.naturalVillageLevelValue"
:options="naturalVillages"
:props="{multiple: true, expandTrigger: 'hover'}"
:props="{multiple: true, expandTrigger: 'hover',checkStrictly: true}"
@change="handleChange"
filterable
clearable></el-cascader>
......
vue.config.js
浏览文件 @ a270c462
......@@ -38,7 +38,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// 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,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论