Skip to content

Administrator / project_progress

Go to a project
Commit 13153b38 by liangzhen
Options

暂存

1 parent 0fa24916
Inline Side-by-side
Showing with 266 additions and 220 deletions
src/utils/format.js 0 → 100644
export function getCurrentDate() {
const date = new Date();
const year = date.getFullYear();
const month = date.getMonth() + 1; // JavaScript的月份是从0开始的，所以需要加1
const day = date.getDate();
const hours = date.getHours().toString().padStart(2, '0'); // 补零
const minutes = date.getMinutes().toString().padStart(2, '0'); // 补零
return `${year}-${month}-${day}-${hours}:${minutes}`;
console.log(this.currentDate, '3322323')
}
src/views/assessChecks/assistedConfirm.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="rectificationDeadline" label="问题整改截止时间"> <el-table-column prop="rectificationDeadline" label="问题整改截止时间">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalState" label="复核状态"> </el-table-column> <el-table-column prop="postEvalStateText" label="复核状态"> </el-table-column>
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
...@@ -334,9 +334,9 @@ ...@@ -334,9 +334,9 @@
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
if (item.reviewStatus >= "4") { if (item.reviewStatus >= "4") {
this.$set(item, "postEvalState", "复核已下发"); this.$set(item, "postEvalStateText", "复核已下发");
} else { } else {
this.$set(item, "postEvalState", "复核未下发"); this.$set(item, "postEvalStateText", "复核未下发");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -522,6 +522,10 @@ ...@@ -522,6 +522,10 @@
this.$message("请选择一条数据进行下发"); this.$message("请选择一条数据进行下发");
return; return;
} }
if(this.checkedList[0].postEvalStateText=='复核已下发'){
this.$message("请选择未下发的数据");
return
}
this.dialogSS = true; this.dialogSS = true;
let params = { let params = {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
...@@ -655,7 +659,7 @@ ...@@ -655,7 +659,7 @@
text-align: center; text-align: center;
width: 150%; width: 150%;
min-width: 150%; min-width: 150%;
// margin-right: 210px; margin-right: 210px;
// margin-top: 3vh; // margin-top: 3vh;
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
...@@ -807,7 +811,7 @@ ...@@ -807,7 +811,7 @@
} }
} }
.dialog { .dialog {
height: 700px; height: 680px;
overflow-y: auto; overflow-y: auto;
.xqtitle { .xqtitle {
text-align: left; text-align: left;
...@@ -928,6 +932,7 @@ ...@@ -928,6 +932,7 @@
width: 100%; width: 100%;
height: 650px; height: 650px;
overflow: auto; overflow: auto;
padding-right: 500px;
} }
.dialog{ .dialog{
.eltable { .eltable {
......
src/views/assessChecks/assistedFeedback.vue
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -69,10 +70,11 @@ ...@@ -69,10 +70,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="rectificationDeadline" label="问题整改截止时间"> <el-table-column prop="rectificationDeadline" label="问题整改截止时间">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalState" label="申诉状态"> </el-table-column> <el-table-column prop="postEvalStateText" label="申诉状态"> </el-table-column>
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -231,7 +233,7 @@ ...@@ -231,7 +233,7 @@
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancel()">取消</span <span @click="cancel()">取消</span
><span @click="save()">确认</span> ><span @click="save()">申诉</span>
</p> </p>
</el-dialog> </el-dialog>
...@@ -300,13 +302,13 @@ export default { ...@@ -300,13 +302,13 @@ export default {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
if (item.appealStatus == "1") { if (item.appealStatus == "1") {
this.$set(item, "postEvalState", "已申诉"); this.$set(item, "postEvalStateText", "已申诉");
} else if (item.appealStatus == "2") { } else if (item.appealStatus == "2") {
this.$set(item, "postEvalState", "申诉驳回"); this.$set(item, "postEvalStateText", "申诉驳回");
} else if (item.appealStatus == "3") { } else if (item.appealStatus == "3") {
this.$set(item, "postEvalState", "申诉通过"); this.$set(item, "postEvalStateText", "申诉通过");
} else { } else {
this.$set(item, "postEvalState", "未申诉"); this.$set(item, "postEvalStateText", "未申诉");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -338,22 +340,22 @@ export default { ...@@ -338,22 +340,22 @@ export default {
this.tableDataQR.forEach((item) => { this.tableDataQR.forEach((item) => {
this.$set(item, "confirmStatus", "2") this.$set(item, "confirmStatus", "2")
switch (item.projectStage) { switch (item.projectStage) {
case 1: case "1":
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
break; break;
case 2: case "2":
this.$set(item, "projectStagetext", "2.计划"); this.$set(item, "projectStagetext", "2.计划");
break; break;
case 3: case "3":
this.$set(item, "projectStagetext", "3.采购"); this.$set(item, "projectStagetext", "3.采购");
break; break;
case 4: case "4":
this.$set(item, "projectStagetext", "4.合同"); this.$set(item, "projectStagetext", "4.合同");
break; break;
case 5: case "5":
this.$set(item, "projectStagetext", "5.执行"); this.$set(item, "projectStagetext", "5.执行");
break; break;
case 6: case "6":
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
...@@ -430,10 +432,12 @@ export default { ...@@ -430,10 +432,12 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm()
}, },
arraySpanMethod({ row, column, rowIndex, columnIndex }) { arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) { if (columnIndex === 0) {
...@@ -490,6 +494,11 @@ export default { ...@@ -490,6 +494,11 @@ export default {
this.$message("请选择一条数据进行申诉"); this.$message("请选择一条数据进行申诉");
return; return;
} }
if(this.checkedList[0].postEvalStateText!='未申诉'){
this.$message("请选择未申诉的数据");
return
}
this.dialogSS = true; this.dialogSS = true;
let params = { let params = {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
...@@ -502,22 +511,22 @@ export default { ...@@ -502,22 +511,22 @@ export default {
this.tableDataSS.forEach((item) => { this.tableDataSS.forEach((item) => {
this.$set(item, "confirmStatus", "2") this.$set(item, "confirmStatus", "2")
switch (item.projectStage) { switch (item.projectStage) {
case 1: case "1":
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
break; break;
case 2: case "2":
this.$set(item, "projectStagetext", "2.计划"); this.$set(item, "projectStagetext", "2.计划");
break; break;
case 3: case "3":
this.$set(item, "projectStagetext", "3.采购"); this.$set(item, "projectStagetext", "3.采购");
break; break;
case 4: case "4":
this.$set(item, "projectStagetext", "4.合同"); this.$set(item, "projectStagetext", "4.合同");
break; break;
case 5: case "5":
this.$set(item, "projectStagetext", "5.执行"); this.$set(item, "projectStagetext", "5.执行");
break; break;
case 6: case "6":
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
...@@ -771,7 +780,7 @@ export default { ...@@ -771,7 +780,7 @@ export default {
} }
} }
.dialog { .dialog {
height: 700px; height:680px;
overflow-y: auto; overflow-y: auto;
.xqtitle { .xqtitle {
text-align: left; text-align: left;
...@@ -888,5 +897,11 @@ h3 { ...@@ -888,5 +897,11 @@ h3 {
/deep/ .el-dialog__body{ /deep/ .el-dialog__body{
padding-bottom: 15px; padding-bottom: 15px;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/assistedViewing.vue
...@@ -415,10 +415,12 @@ export default { ...@@ -415,10 +415,12 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm()
}, },
cancel() { cancel() {
this.dialog = false; this.dialog = false;
......
src/views/assessChecks/assitedDistribution.vue
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -76,6 +77,7 @@ ...@@ -76,6 +77,7 @@
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -238,6 +240,10 @@ export default { ...@@ -238,6 +240,10 @@ export default {
}, },
//问题批量下发 //问题批量下发
sendQuestions() { sendQuestions() {
if (this.checkedList.length < 1) {
this.$message("请选择项目下发");
return;
}
try { try {
this.checkedList.forEach((item) => { this.checkedList.forEach((item) => {
if (item.reviewStatus == 1) { if (item.reviewStatus == 1) {
...@@ -274,6 +280,8 @@ export default { ...@@ -274,6 +280,8 @@ export default {
console.log(params, "222"); console.log(params, "222");
let res = await wtplxfproblemAssistedDistribution(params); let res = await wtplxfproblemAssistedDistribution(params);
if (res.code == "200") { if (res.code == "200") {
this.resetForm()
this.dialogXQ = false; this.dialogXQ = false;
} else { } else {
this.$message("下发失败"); this.$message("下发失败");
...@@ -300,10 +308,12 @@ export default { ...@@ -300,10 +308,12 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm()
}, },
//点击撤回 //点击撤回
...@@ -587,4 +597,10 @@ export default { ...@@ -587,4 +597,10 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/auxiliaryInspection.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入"></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择">
...@@ -102,97 +102,12 @@ ...@@ -102,97 +102,12 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<el-dialog
title="提交评估材料"
:visible.sync="dialog"
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
@close="closeDialog"
>
<div class="dialog">
<p class="xqtitle"><span></span>批次详情</p>
<el-form
:model="ruleFormdialog"
ref="ruleFormdialog"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialog.batchYear" disabled></el-input>
<!-- <el-select v-model="ruleFormdialog.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select> -->
</el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleFormdialog.batchName" disabled></el-input>
</el-form-item>
<el-form-item
label="计划评审日期:"
prop="planReviewDate"
class="fromItem"
>
<el-input
v-model="ruleFormdialog.planReviewDate"
disabled
></el-input>
</el-form-item>
<el-form-item label="后评估专家:" prop="fullName" class="fromItem">
<el-input v-model="ruleFormdialog.fullName" disabled></el-input>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea">
<el-input type="textarea" v-model="ruleFormdialog.desc"></el-input>
</el-form-item>
</el-form>
<p class="xqtitle"><span></span>本项目材料清单</p>
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableDataQD"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="材料类别" prop="batchYear"> </el-table-column>
<el-table-column prop="batchName" label="资料类型"> </el-table-column>
<el-table-column prop="projectName" label="资料名称">
</el-table-column>
<el-table-column prop="projectCategory" label="操作">
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChangetjcl"
@current-change="handleCurrentChangetjcl"
:current-page="currentPagetjcl"
:page-sizes="[10, 15, 20, 50]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
class="elpagination"
>
</el-pagination>
<p class="Btn" v-if="showButton">
<span @click="cancel()">取消</span
><span @click="save('add')">确认上传</span>
</p>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
evaluationMaterials, postEvalQuesInfo,
chpostEvalQuesInfo, chpostEvalQuesInfo,
qrscevaluationMaterials, qrscevaluationMaterials,
} from "@/api/index"; } from "@/api/index";
...@@ -247,7 +162,7 @@ export default { ...@@ -247,7 +162,7 @@ export default {
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
let res = await evaluationMaterials(params); let res = await postEvalQuesInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
...@@ -325,6 +240,9 @@ export default { ...@@ -325,6 +240,9 @@ export default {
batchId:this.checkedList[0].batchId batchId:this.checkedList[0].batchId
}; };
let res =await chpostEvalQuesInfo(params) let res =await chpostEvalQuesInfo(params)
if(res.code==200){
this.resetForm()
}
}, },
//表格颜色 //表格颜色
...@@ -347,18 +265,12 @@ export default { ...@@ -347,18 +265,12 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
}, this.submitForm()
handleSizeChangetjcl(val) {
console.log(`每页 ${val} 条`);
this.pageSizetjcl = val;
},
handleCurrentChangetjcl(val) {
console.log(`当前页: ${val}`);
this.currentPagetjcl = val;
}, },
cancel() { cancel() {
this.dialog = false; this.dialog = false;
......
src/views/assessChecks/auxiliaryQuery.vue
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
</el-form-item> </el-form-item>
</el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -225,10 +226,10 @@ ...@@ -225,10 +226,10 @@
query: { query: {
clqparams: JSON.stringify(params), clqparams: JSON.stringify(params),
fromType:'fzcx', fromType:'fzcx',
Form:{ Form:JSON.stringify({
appealDeadline:this.checkedList[0].appealDeadline, appealDeadline:this.checkedList[0].appealDeadline,
rectificationDeadline:this.checkedList[0].rectificationDeadline, rectificationDeadline:this.checkedList[0].rectificationDeadline,
} })
}, },
}); });
} }
...@@ -255,10 +256,12 @@ ...@@ -255,10 +256,12 @@
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm()
}, },
}, },
}; };
...@@ -515,4 +518,10 @@ ...@@ -515,4 +518,10 @@
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/auxiliarySelection.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
ref="formName" ref="formName"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入"></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem" >
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
...@@ -560,6 +560,7 @@ import { ...@@ -560,6 +560,7 @@ import {
delEvalBatchInfo, delEvalBatchInfo,
chEvalBatchInfo, chEvalBatchInfo,
} from "@/api/index"; } from "@/api/index";
import { getCurrentDate } from '@/utils/format'
export default { export default {
data() { data() {
return { return {
...@@ -655,15 +656,18 @@ export default { ...@@ -655,15 +656,18 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(getCurrentDate(),'222222')
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
async submitForm(formName) { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
}; };
console.log( this.ruleForm,' this.ruleForm')
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
let res = await evalBatchInfo(params); let res = await evalBatchInfo(params);
...@@ -852,6 +856,8 @@ export default { ...@@ -852,6 +856,8 @@ export default {
}); });
let params = { let params = {
expertStr: expertStr, expertStr: expertStr,
creator:sessionStorage.getItem('author'),
createTime:getCurrentDate(),
}; };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
this.xfParams = JSON.parse(JSON.stringify(params)); this.xfParams = JSON.parse(JSON.stringify(params));
......
src/views/assessChecks/checkComplianceXF.vue
...@@ -118,9 +118,11 @@ export default { ...@@ -118,9 +118,11 @@ export default {
mounted() { mounted() {
this.clqparams = JSON.parse(this.$route.query.clqparams); this.clqparams = JSON.parse(this.$route.query.clqparams);
if (this.$route.query.fromType == "fzcx") { if (this.$route.query.fromType == "fzcx") {
this.fromType = true; this.fromType = true;
this.ruleForm=this.$route.query.Form this.ruleForm=JSON.parse(this.$route.query.Form);
console.log(this.ruleForm,'ruleForm')
} }
console.log(this.fromType,'this.fromType') console.log(this.fromType,'this.fromType')
console.log(this.clqparams, "this.clqparams"); console.log(this.clqparams, "this.clqparams");
......
src/views/assessChecks/confirmChanges.vue
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
<el-table-column prop="postEvalState" label="检查评估状态"> </el-table-column> <el-table-column prop="postEvalState" label="检查评估状态"> </el-table-column>
<el-table-column prop="planReviewDate" label="评估日期"> </el-table-column> <el-table-column prop="planReviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -90,6 +92,7 @@ ...@@ -90,6 +92,7 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<el-dialog <el-dialog
title="国网辽宁电力-桌面终端管理系统合规性检查评估" title="国网辽宁电力-桌面终端管理系统合规性检查评估"
:visible.sync="dialog" :visible.sync="dialog"
...@@ -304,10 +307,12 @@ ...@@ -304,10 +307,12 @@
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm()
}, },
handleSizeChangetjcl(val) { handleSizeChangetjcl(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSizetjcl = val; this.pageSizetjcl = val;
this.submitForm()
}, },
handleCurrentChangetjcl(val) { handleCurrentChangetjcl(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
...@@ -492,4 +497,10 @@ ...@@ -492,4 +497,10 @@
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/confirmRelease.vue
...@@ -298,6 +298,7 @@ ...@@ -298,6 +298,7 @@
width="90%" width="90%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
> >
<div class="adzjdialog"> <div class="adzjdialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
...@@ -424,7 +425,7 @@ ...@@ -424,7 +425,7 @@
</el-table> </el-table>
</div> </div>
<!-- <el-pagination <el-pagination
@size-change="handleSizeChangeZJ" @size-change="handleSizeChangeZJ"
@current-change="handleCurrentChangeZJ" @current-change="handleCurrentChangeZJ"
:current-page="currentZJ" :current-page="currentZJ"
...@@ -434,7 +435,7 @@ ...@@ -434,7 +435,7 @@
:total="zjtotal" :total="zjtotal"
class="elpagination" class="elpagination"
> >
</el-pagination> --> </el-pagination>
<p class="midBtn"> <p class="midBtn">
<span @click="cancelZJ()">取消</span <span @click="cancelZJ()">取消</span
...@@ -506,20 +507,18 @@ export default { ...@@ -506,20 +507,18 @@ export default {
pageSizetjcl: 10, pageSizetjcl: 10,
total: 0, total: 0,
dialogXQ: false, dialogXQ: false,
currentPageBJ:1,
pageSizeBJ:10,
dialogAdd: false, dialogAdd: false,
dialogAddzj: false, dialogAddzj: false,
pageSize: 10, pageSize: 10,
current: 1, current: 1,
pageSizeZJ: 10, pageSizeZJ:5,
currentZJ: 1, currentZJ: 1,
addtotal: 0, addtotal: 0,
currentAdd: 1, currentAdd: 1,
pageSizeAdd: 10, pageSizeAdd: 5,
currentedit: 1, currentedit: 1,
pageSizeedit: 10, pageSizeedit:5,
xfParam: "", xfParam: "",
dialogedit: false, dialogedit: false,
expertIdList: [], expertIdList: [],
...@@ -578,8 +577,8 @@ export default { ...@@ -578,8 +577,8 @@ export default {
this.dialogXQ = true; this.dialogXQ = true;
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ=this.checkedList[0]
let params={ let params={
current:1, current:this.addcurrentPage,
pageSize:10, pageSize:this.pageSizeAdd,
batchId:this.checkedList[0].batchId batchId:this.checkedList[0].batchId
} }
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
...@@ -650,22 +649,22 @@ export default { ...@@ -650,22 +649,22 @@ export default {
handleSizeChangeZJ(val) { handleSizeChangeZJ(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSizeZJ = val; this.pageSizeZJ = val;
this.xzExperts()
}, },
handleCurrentChangeZJ(val) { handleCurrentChangeZJ(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentZJ = val; this.currentZJ = val;
this.xzExperts()
}, },
handleSizeChangeAdd(val) { handleSizeChangeAdd(val) {
this.pageSizeAdd = val; this.pageSizeAdd = val;
this.detailsForm()
}, },
handleCurrentChangeAdd(val) { handleCurrentChangeAdd(val) {
this.currentAdd = val; this.currentAdd = val;
this.detailsForm()
}, },
handleCurrentChangeBJ(val) {
console.log(`当前页: ${val}`);
this.currentPageBJ = val;
},
//选择项目 //选择项目
saveZJ() { saveZJ() {
if (this.addZJList.length < 1) { if (this.addZJList.length < 1) {
...@@ -697,7 +696,7 @@ export default { ...@@ -697,7 +696,7 @@ export default {
let res = await getProjectInfo(params); let res = await getProjectInfo(params);
console.log(res.data.records,'res.data.recordsres.data.records') console.log(res.data.records,'res.data.recordsres.data.records')
this.zjtableData = res.data.records; this.zjtableData = res.data.records;
// this.zjtotal = res.data.total * 1; this.zjtotal = res.data.total * 1;
console.log(res, "xxx"); console.log(res, "xxx");
}, },
...@@ -897,6 +896,7 @@ text-align: center; ...@@ -897,6 +896,7 @@ text-align: center;
} }
} }
.dialog { .dialog {
height: 680px;
.xqtitle { .xqtitle {
text-align: left; text-align: left;
font-size: 18px; font-size: 18px;
......
src/views/assessChecks/materialAcquisition.vue
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm('ruleForm')"> <el-button @click="resetForm()">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button <img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
> >
<el-button @click="detailsForm('ruleForm')"> <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<el-button @click="submitNexts()" <el-button @click="submitNexts()"
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column> <el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
...@@ -107,18 +108,11 @@ ...@@ -107,18 +108,11 @@
<p class="xqtitle"><span></span>批次详情</p> <p class="xqtitle"><span></span>批次详情</p>
<el-form <el-form
:model="ruleFormdialog" :model="ruleFormdialog"
ref="ruleFormdialog"
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialog.batchYear" disabled></el-input> <el-input v-model="ruleFormdialog.batchYear" disabled></el-input>
<!-- <el-select v-model="ruleFormdialog.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleFormdialog.batchName" disabled></el-input> <el-input v-model="ruleFormdialog.batchName" disabled></el-input>
...@@ -137,7 +131,11 @@ ...@@ -137,7 +131,11 @@
<el-input v-model="ruleFormdialog.fullName" disabled></el-input> <el-input v-model="ruleFormdialog.fullName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工作组织情况:" class="textarea"> <el-form-item label="工作组织情况:" class="textarea">
<el-input type="textarea" v-model="ruleFormdialog.desc" disabled></el-input> <el-input
type="textarea"
v-model="ruleFormdialog.desc"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -156,17 +154,16 @@ ...@@ -156,17 +154,16 @@
</el-table-column> </el-table-column>
<el-table-column label="材料类别" prop="batchtype"> </el-table-column> <el-table-column label="材料类别" prop="batchtype"> </el-table-column>
<el-table-column prop="typeCode" label="资料类型"> </el-table-column> <el-table-column prop="typeText" label="资料类型"> </el-table-column>
<el-table-column prop="fileName" label="资料名称"> </el-table-column> <el-table-column prop="fileName" label="资料名称"> </el-table-column>
<el-table-column prop="projectCategory" label="操作"> <el-table-column prop="projectCategory" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <!-- <el-pagination
@size-change="handleSizeChangetjcl" @size-change="handleSizeChangetjcl"
@current-change="handleCurrentChangetjcl" @current-change="handleCurrentChangetjcl"
:current-page="currentPagetjcl" :current-page="currentPagetjcl"
...@@ -176,7 +173,7 @@ ...@@ -176,7 +173,7 @@
:total="total" :total="total"
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination> -->
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span <span @click="cancel()">取消</span
><span @click="save()">确认上传</span> ><span @click="save()">确认上传</span>
...@@ -201,12 +198,6 @@ ...@@ -201,12 +198,6 @@
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialog.batchYear" disabled></el-input> <el-input v-model="ruleFormdialog.batchYear" disabled></el-input>
<!-- <el-select v-model="ruleFormdialog.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleFormdialog.batchName" disabled></el-input> <el-input v-model="ruleFormdialog.batchName" disabled></el-input>
...@@ -225,7 +216,11 @@ ...@@ -225,7 +216,11 @@
<el-input v-model="ruleFormdialog.fullName" disabled></el-input> <el-input v-model="ruleFormdialog.fullName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工作组织情况:" class="textarea"> <el-form-item label="工作组织情况:" class="textarea">
<el-input type="textarea" v-model="ruleFormdialog.desc" disabled></el-input> <el-input
type="textarea"
v-model="ruleFormdialog.desc"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -244,7 +239,7 @@ ...@@ -244,7 +239,7 @@
</el-table-column> </el-table-column>
<el-table-column label="材料类别" prop="batchtype"> </el-table-column> <el-table-column label="材料类别" prop="batchtype"> </el-table-column>
<el-table-column prop="typeCode" label="资料类型"> </el-table-column> <el-table-column prop="typeText" label="资料类型"> </el-table-column>
<el-table-column prop="fileName" label="资料名称"> </el-table-column> <el-table-column prop="fileName" label="资料名称"> </el-table-column>
<!-- <el-table-column prop="projectCategory" label="操作"> <!-- <el-table-column prop="projectCategory" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -252,9 +247,8 @@ ...@@ -252,9 +247,8 @@
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<el-pagination <!-- <el-pagination
@size-change="handleSizeChangetjcl" @size-change="handleSizeChangetjcl"
@current-change="handleCurrentChangetjcl" @current-change="handleCurrentChangetjcl"
:current-page="currentPagetjcl" :current-page="currentPagetjcl"
...@@ -264,7 +258,7 @@ ...@@ -264,7 +258,7 @@
:total="total" :total="total"
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination> -->
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -275,13 +269,13 @@ import { ...@@ -275,13 +269,13 @@ import {
evaluationMaterials, evaluationMaterials,
clqdevaluationMaterials, clqdevaluationMaterials,
qrscevaluationMaterials, qrscevaluationMaterials,
ossupload ossupload,
} from "@/api/index"; } from "@/api/index";
export default { export default {
data() { data() {
return { return {
dialogXQ:false, dialogXQ: false,
file:"", file: "",
showButton: true, showButton: true,
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
...@@ -298,23 +292,23 @@ export default { ...@@ -298,23 +292,23 @@ export default {
}, },
tableData: [], tableData: [],
tableDataQD: [ tableDataQD: [
{batchtype:'开发、实施类', { batchtype: "开发、实施类", typeText: "技术规范书", typeCode: "0" },
typeCode:'技术规范书', {
}, batchtype: "开发、实施类",
{batchtype:'开发、实施类', typeText: "可行性研究报告",
typeCode:'可行性研究报告', typeCode: "1",
}, },
{batchtype:'开发、实施类', {
typeCode:'需求规格说明书', batchtype: "开发、实施类",
typeText: "需求规格说明书",
typeCode: "2",
}, },
{batchtype:'开发、实施类', {
typeCode:'概要设计说明书', batchtype: "开发、实施类",
typeText: "概要设计说明书",
typeCode: "3",
}, },
{batchtype:'开发、实施类', { batchtype: "开发、实施类", typeText: "安全防护方案", typeCode: "4" },
typeCode:'安全防护方案',
},
], //清单列表 ], //清单列表
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
...@@ -357,6 +351,7 @@ export default { ...@@ -357,6 +351,7 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
console.log("重置");
this.submitForm(); this.submitForm();
}, },
//提交评估材料 //提交评估材料
...@@ -365,7 +360,7 @@ export default { ...@@ -365,7 +360,7 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText =="已上传") { if (this.checkedList[0].postEvalStateText == "已上传") {
this.$message("已上传评估材料"); this.$message("已上传评估材料");
return; return;
} }
...@@ -377,11 +372,27 @@ export default { ...@@ -377,11 +372,27 @@ export default {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
if(res.data.records.length>0){ if (res.data.records.length > 0) {
this.tableDataQD = res.data.records; // this.tableDataQD = res.data.records;
this.tableDataQD.forEach((item) => { this.tableDataQD = this.tableDataQD
this.$set(item, "batchtype", "开发、实施类"); .concat(res.data.records)
}); .reduce((accumulator, currentObj) => {
const existingObj = accumulator.find(
(obj) => obj.itypeCode === currentObj.typeCode
);
if (existingObj) {
Object.assign(existingObj, currentObj);
} else {
accumulator.push(currentObj);
}
return accumulator;
}, []);
console.log( this.tableDataQD,' mergedArray mergedArray mergedArray')
// this.tableDataQD.forEach((item) => {
// // this.$set(item, "batchtype", "开发、实施类");
// });
} }
// this.tableDataQD.forEach((item) => { // this.tableDataQD.forEach((item) => {
...@@ -403,10 +414,19 @@ export default { ...@@ -403,10 +414,19 @@ export default {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
this.tableDataQD = res.data.records; this.tableDataQD = this.tableDataQD
this.tableDataQD.forEach((item) => { .concat(res.data.records)
this.$set(item, "batchtype", "开发、实施类"); .reduce((accumulator, currentObj) => {
}); const existingObj = accumulator.find(
(obj) => obj.itypeCode === currentObj.typeCode
);
if (existingObj) {
Object.assign(existingObj, currentObj);
} else {
accumulator.push(currentObj);
}
return accumulator;
}, []);
}, },
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
...@@ -454,36 +474,35 @@ export default { ...@@ -454,36 +474,35 @@ export default {
async save(type) { async save(type) {
this.dialog = false; this.dialog = false;
let params = { let params = {
projectId:this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId batchId: this.checkedList[0].batchId,
}; };
let res = await qrscevaluationMaterials(params); let res = await qrscevaluationMaterials(params);
this.resetForm() this.resetForm();
}, },
handleFileUpload(event) { handleFileUpload(event) {
console.log('来了么') console.log("来了么");
this.file = event.target.files[0]; this.file = event.target.files[0];
}, },
submitFile(row) { submitFile(row) {
console.log(row) console.log(row);
if (this.file) { if (this.file) {
const formData = new FormData(); const formData = new FormData();
formData.append('file', this.file); formData.append("file", this.file);
formData.append('prjId',this.checkedList[0].projectId); formData.append("prjId", this.checkedList[0].projectId);
formData.append('typeCode',row.typeCode); formData.append("typeCode", row.typeCode);
ossupload(formData).then(response => { ossupload(formData)
.then((response) => {
console.log(response); console.log(response);
this.$set(row,'fileName',response.data.fileName) this.$set(row, "fileName", response.data.fileName);
}) })
.catch(error => { .catch((error) => {
console.error(error); console.error(error);
}); });
} }
} },
} },
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
...@@ -492,6 +511,7 @@ export default { ...@@ -492,6 +511,7 @@ export default {
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
.el-form { .el-form {
......
src/views/assessChecks/qrCompliance.vue
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
width: 98%; width: 98%;
position: absolute; position: absolute;
// height: 80px; // height: 80px;
bottom: 150px; bottom: 120px;
left: 50%; left: 50%;
z-index: 100; z-index: 100;
transform: translate(-50%); transform: translate(-50%);
......
src/views/layout/continerView.vue
...@@ -6,6 +6,19 @@ ...@@ -6,6 +6,19 @@
<script> <script>
export default { export default {
data(){
return{
currentDate:""
}
}
,
mounted(){
sessionStorage.setItem('author','sgitg_weizheng')
},
methods:{
}
} }
</script> </script>
......
src/views/layout/leftBar.vue
...@@ -373,6 +373,7 @@ export default { ...@@ -373,6 +373,7 @@ export default {
console.log("oldVal:", oldVal); // coderkey console.log("oldVal:", oldVal); // coderkey
console.log("newVal:", newVal); // pink console.log("newVal:", newVal); // pink
if (newVal == 1) { if (newVal == 1) {
sessionStorage.setItem('author','sgtig_zhangyu')
this.menuList = [ this.menuList = [
{ {
name: "后评估检查", name: "后评估检查",
...@@ -415,6 +416,7 @@ export default { ...@@ -415,6 +416,7 @@ export default {
this.$refs.kzMenu.activeIndex =this.$route.path this.$refs.kzMenu.activeIndex =this.$route.path
} else if (newVal == 2) { } else if (newVal == 2) {
sessionStorage.setItem('author','sgtig_liyiming')
this.menuList = [ this.menuList = [
{ {
name: "后评估检查", name: "后评估检查",
...@@ -462,6 +464,7 @@ export default { ...@@ -462,6 +464,7 @@ export default {
}); });
this.$refs.kzMenu.activeIndex =this.$route.path; this.$refs.kzMenu.activeIndex =this.$route.path;
} else if (newVal == 3) { } else if (newVal == 3) {
sessionStorage.setItem('author','sgtig_mengdejian')
this.menuList = [ this.menuList = [
{ {
name: "后评估检查", name: "后评估检查",
...@@ -505,10 +508,25 @@ export default { ...@@ -505,10 +508,25 @@ export default {
}, },
mounted() { mounted() {
console.log("重新来了么"); console.log("重新来了么");
this.activeIndex = this.$route.path;
this.handleOpen(0,['0']) this.handleOpen(0,['0'])
console.log('333333',this.$route.query)
if(this.$route.path=='/mainLayout/Compliancefz'||this.$route.path=='/mainLayout/Compliance'){
this.activeIndex='/mainLayout/auxiliaryInspection'
}else if(this.$route.path=="/mainLayout/qrCompliance"){
this.activeIndex='/mainLayout/confirmChanges'
}else if(this.$route.path=="/mainLayout/Compliancexf"){
if(this.$route.query.fromType=='fzcx'){
this.activeIndex='/mainLayout/auxiliaryQuery'
}else{
this.activeIndex='/mainLayout/assitedDistribution'
}
}else{
this.activeIndex = this.$route.path;
}
// this.$refs.kzMenu.open(0-0,['0','0-0']) // this.$refs.kzMenu.open(0-0,['0','0-0'])
console.log( this.$refs.kzMenu,' this.$refs.kzMenu.open')
// this.handleOpen(0-0,['0','0-0']) // this.handleOpen(0-0,['0','0-0'])
}, },
......
src/views/layout/mainLayout.vue
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
}; };
}, },
mounted() { mounted() {
window.addEventListener("resize", this.handleResize); // window.addEventListener("resize", this.handleResize);
}, },
methods: { methods: {
handleResize() { handleResize() {
...@@ -89,14 +89,13 @@ export default { ...@@ -89,14 +89,13 @@ export default {
position: relative; position: relative;
// overflow: hidden; // overflow: hidden;
.bar { .bar {
width: 235px; width: 235px !important;
height: 100%; height: 100%;
} }
.continer { .continer {
width: 100%; min-width: 100%;
height: 100%; height: 100%;
// height:86vh; // flex: 1;
flex: 1;
box-sizing: border-box; box-sizing: border-box;
// overflow: auto; // overflow: auto;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!