Skip to content

Administrator / project_progress

Go to a project
Commit bf380876 by liangzhen
Options

首页新增赛选条件

1 parent 85285f7f
Inline Side-by-side
Showing with 153 additions and 64 deletions
src/api/index.js
...@@ -454,5 +454,8 @@ export function HistoryVersion(params){ ...@@ -454,5 +454,8 @@ export function HistoryVersion(params){
export function postExist(params){ export function postExist(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/postExist`, params) return post(`${ARCH_EVALUATION}/pmProInitiation/postExist`, params)
} }
//新增问题
export function xzwtpostEvalQuesInfo(params) {
return post(`${ARCH_EVALUATION}/postEvalQuesInfo/xzwt`, params)
}
src/views/assessChecks/auxiliaryInspection.vue
...@@ -238,7 +238,8 @@ ...@@ -238,7 +238,8 @@
<el-table-column <el-table-column
label="问题检查项" label="问题检查项"
prop="quesCheckItem" prop="quesCheckItem"
width="200" width="auto"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -248,7 +249,7 @@ ...@@ -248,7 +249,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="评估问题" prop="evalQues" width="auto"> <el-table-column label="评估问题" prop="evalQues" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="问题响应" width="100"> <el-table-column label="问题响应" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -272,15 +273,15 @@ ...@@ -272,15 +273,15 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" width="200"> <el-table-column label="解释批注" prop="feedback" width="auto" show-overflow-tooltip>
<template <!-- <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'" v-if="scope.row.confirmStatus == '1'"
> >
<el-input v-model="scope.row.feedback" disabled></el-input> <el-input v-model="scope.row.feedback" disabled></el-input>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="整改材料下载" width="200"> <el-table-column label="整改材料下载" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link <router-link
:to="{ :to="{
......
src/views/assessChecks/checkCompliance.vue
...@@ -514,18 +514,11 @@ docxOptions: { ...@@ -514,18 +514,11 @@ docxOptions: {
}, },
change(id) { change(id) {
console.log(
JSON.stringify(this.questionList) ==
JSON.stringify(this.oldQuestionList),
"完全相同么"
);
if ( if (
JSON.stringify(this.questionList) == JSON.stringify(this.questionList) ==
JSON.stringify(this.oldQuestionList) JSON.stringify(this.oldQuestionList)
) { ) {
this.active = id * 1; this.active = id * 1;
// this.tabListKY = MaterialsListKY(id * 1 + 1);
this.init(this.clqparams); this.init(this.clqparams);
return; return;
} }
...@@ -536,10 +529,8 @@ docxOptions: { ...@@ -536,10 +529,8 @@ docxOptions: {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.save(); this.save('3',id);
this.active = id * 1;
// this.tabListKY = MaterialsListKY(id * 1 + 1);
this.init(this.clqparams);
}) })
.catch((action) => { .catch((action) => {
console.log(action, "actionaction"); console.log(action, "actionaction");
...@@ -608,7 +599,7 @@ docxOptions: { ...@@ -608,7 +599,7 @@ docxOptions: {
path: "/mainLayout/auxiliaryInspection", path: "/mainLayout/auxiliaryInspection",
}); });
}, },
async save(type) { async save(type,id) {
this.questionList.forEach((item) => { this.questionList.forEach((item) => {
let evals = ""; let evals = "";
item.evalList.forEach((childItem) => { item.evalList.forEach((childItem) => {
...@@ -632,9 +623,7 @@ docxOptions: { ...@@ -632,9 +623,7 @@ docxOptions: {
} }
}); });
console.log(this.questionList, "questionList");
let params = { let params = {
list: this.questionList, list: this.questionList,
...this.clqparams, ...this.clqparams,
...@@ -653,6 +642,9 @@ docxOptions: { ...@@ -653,6 +642,9 @@ docxOptions: {
projectName:this.projectName projectName:this.projectName
}, },
}); });
}else{
this.active = id * 1;
this.init(this.clqparams);
} }
} else { } else {
......
src/views/assessChecks/mianHome.vue
<template> <template>
<div class="main"> <div class="main">
<div class="mainhome"> <div class="mainhome">
<div class="querytj">
年份:
<el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable class="inputnf">
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + ''"
:value="item"
/>
</el-select>
评估形式:
<el-checkbox-group v-model="ruleForm.type" class="inputnf">
<el-checkbox label="0">自查</el-checkbox>
<el-checkbox label="1">互查</el-checkbox>
</el-checkbox-group>
</div>
<div class="pc child"> <div class="pc child">
<div class="left"> <div class="left">
<div class="pcBcg"></div> <div class="pcBcg"></div>
...@@ -8,9 +24,15 @@ ...@@ -8,9 +24,15 @@
<div class="right"> <div class="right">
<h3>后评估批次</h3> <h3>后评估批次</h3>
<ul> <ul>
<li>批次总数量: <span>{{ info.pcCount }}</span> 个 </li> <li>
<li>已发起:<span>{{ info.pcFqCount }}</span> 个</li> 批次总数量: <span>{{ info.pcCount }}</span> 个
<li>已完成:<span>{{ info.pcWcCount }}</span> 个</li> </li>
<li>
已发起:<span>{{ info.pcFqCount }}</span> 个
</li>
<li>
已完成:<span>{{ info.pcWcCount }}</span> 个
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -21,12 +43,22 @@ ...@@ -21,12 +43,22 @@
<div class="right"> <div class="right">
<h3>后评估项目</h3> <h3>后评估项目</h3>
<ul> <ul>
<li>项目总数量: <span>{{ info.proCount }}</span> 个 </li> <li>
项目总数量: <span>{{ info.proCount }}</span> 个
</li>
<!-- <li>未上传材料:<span>{{ info.proNscCount }}</span> 个</li> --> <!-- <li>未上传材料:<span>{{ info.proNscCount }}</span> 个</li> -->
<li>待评估:<span>{{ info.proDpgCount }}</span> 个</li> <li>
<li>需整改:<span>{{ info.proXzgCount }}</span> 个</li> 待评估:<span>{{ info.proDpgCount }}</span> 个
<li>己整改:<span>{{ info.proYzgCount }}</span> 个</li> </li>
<li>己归档:<span>{{ info.proYgdCount}}</span> 个</li> <li>
需整改:<span>{{ info.proXzgCount }}</span> 个
</li>
<li>
己整改:<span>{{ info.proYzgCount }}</span> 个
</li>
<li>
己归档:<span>{{ info.proYgdCount }}</span> 个
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -35,12 +67,20 @@ ...@@ -35,12 +67,20 @@
<div class="wtBcg"></div> <div class="wtBcg"></div>
</div> </div>
<div class="right"> <div class="right">
<h3>后评估问题</h3> <h3>后评估问题</h3>
<ul> <ul>
<li>问题总数量: <span>{{ info.quesCount, }}</span> 个 </li> <li>
<li>未整改数量:<span>{{ info.quesWzgCount }}</span> 个</li> 问题总数量: <span>{{ info.quesCount, }}</span> 个
<li>整改不合格:<span>{{ info.quesZgbhgCount }}</span> 个</li> </li>
<li>整改完成:<span>{{ info.quesZgwcCount}}</span> 个</li> <li>
未整改数量:<span>{{ info.quesWzgCount }}</span> 个
</li>
<li>
整改不合格:<span>{{ info.quesZgbhgCount }}</span> 个
</li>
<li>
整改完成:<span>{{ info.quesZgwcCount }}</span> 个
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -49,25 +89,53 @@ ...@@ -49,25 +89,53 @@
</template> </template>
<script> <script>
import { import { projectInfoSy } from "@/api/index";
projectInfoSy import { generateYearOptions } from "@/utils/cache";
} from "@/api/index";
export default { export default {
data(){ data() {
return{ return {
info:{} yearsList: generateYearOptions(),
} info: {},
ruleForm: {
type: ['0', '1'],
batchYear:"2024",
module:'1,2'
},
};
},
watch: {
"ruleForm.type"(n,o) {
console.log("变了",n,o);
if(n.length>1){
this.ruleForm.module="1,2"
}else{
this.ruleForm.module=n.join(',')
}
// if(n.length>)
this.init();
},
"ruleForm.batchYear"(newVal, oldVal) {
console.log("变了1",newVal);
this.init();
}, },
},
mounted() { mounted() {
this.init(); this.init();
}, },
methods:{ methods: {
async init(){ async init() {
let res = await projectInfoSy({}); let params={
this.info=res.data
} }
} Object.assign(params, this.ruleForm);
let res = await projectInfoSy(params);
this.info = res.data;
},
},
}; };
</script> </script>
...@@ -90,6 +158,15 @@ export default { ...@@ -90,6 +158,15 @@ export default {
/* background: red; */ /* background: red; */
background-image: url("../../assets/mainbcg.png"); background-image: url("../../assets/mainbcg.png");
background-size: cover; background-size: cover;
.querytj {
position: absolute;
right: 0;
top: 15px;
font-weight: 500;
font-size: 15px;
// width: 600px;
// border: 1px solid red;
}
.child { .child {
display: flex; display: flex;
.left { .left {
...@@ -109,7 +186,7 @@ export default { ...@@ -109,7 +186,7 @@ export default {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
color: rgb(0, 104, 98); color: rgb(0, 104, 98);
span{ span {
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
color: rgb(0, 104, 98); color: rgb(0, 104, 98);
...@@ -159,7 +236,7 @@ export default { ...@@ -159,7 +236,7 @@ export default {
.xm { .xm {
position: absolute; position: absolute;
width: 400px; width: 400px;
height:200px; height: 200px;
background-image: linear-gradient( background-image: linear-gradient(
to right, to right,
rgb(220, 250, 250), rgb(220, 250, 250),
...@@ -188,4 +265,16 @@ export default { ...@@ -188,4 +265,16 @@ export default {
h2 { h2 {
margin-top: 60px; margin-top: 60px;
} }
.inputnf {
display: inline-block;
width: 200px;
margin-right: 20px;
}
/deep/ .el-input--suffix .el-input__inner {
background: transparent !important;
border: 1px solid #0a7872;
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
background: blue;
}
</style> </style>
\ No newline at end of file
src/views/assessZC/auxiliaryInspection.vue
...@@ -229,16 +229,17 @@ ...@@ -229,16 +229,17 @@
<el-table-column <el-table-column
label="项目环节" label="项目环节"
prop="projectStagetext" prop="projectStagetext"
width="120" width="100"
> >
</el-table-column> </el-table-column>
<el-table-column label="序号" width="70" type="index"> <el-table-column label="序号" width="40" type="index">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="问题检查项" label="问题检查项"
prop="quesCheckItem" prop="quesCheckItem"
width="200" width="auto"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -248,7 +249,7 @@ ...@@ -248,7 +249,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="评估问题" prop="evalQues" width="auto"> <el-table-column label="评估问题" prop="evalQues" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="问题响应" width="100"> <el-table-column label="问题响应" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -272,15 +273,15 @@ ...@@ -272,15 +273,15 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" width="200"> <el-table-column label="解释批注" prop="feedback" width="auto" show-overflow-tooltip>
<template <!-- <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'" v-if="scope.row.confirmStatus == '1'"
> >
<el-input v-model="scope.row.feedback" disabled></el-input> <el-input v-model="scope.row.feedback" disabled></el-input>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="整改材料下载" width="200"> <el-table-column label="整改材料下载" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link <router-link
:to="{ :to="{
......
src/views/assessZC/checkCompliance.vue
...@@ -536,10 +536,9 @@ docxOptions: { ...@@ -536,10 +536,9 @@ docxOptions: {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.save(); this.save('3',id);
this.active = id * 1; // this.active = id * 1;
// this.tabListKY = MaterialsListKY(id * 1 + 1); // this.init(this.clqparams);
this.init(this.clqparams);
}) })
.catch((action) => { .catch((action) => {
console.log(action, "actionaction"); console.log(action, "actionaction");
...@@ -653,6 +652,9 @@ docxOptions: { ...@@ -653,6 +652,9 @@ docxOptions: {
projectName:this.projectName projectName:this.projectName
}, },
}); });
}else{
this.active = id * 1;
this.init(this.clqparams);
} }
} else { } else {
......
src/views/layout/index.vue
<template> <template>
<div class="mian"> <div class="mian">
<!-- <div class="head-container"> <div class="head-container">
<div class="logo" style="z-index: 10"> <div class="logo" style="z-index: 10">
<div class="logo-inner"> <div class="logo-inner">
<img src="../../assets/logo.png" alt="" /> <img src="../../assets/logo.png" alt="" />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> --> </div>
<router-view></router-view> <router-view></router-view>
<!-- <MainLayout class="continer"> <!-- <MainLayout class="continer">
<router-view></router-view> <router-view></router-view>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!