Commit 1191e62e by liangzhen

问题辅助整改

1 parent 63f3b89b
......@@ -204,3 +204,26 @@ export function xfappealAssistanceConfirmatio(params) {
export function wtssSelAssistanceConfirmatio(params) {
return post(`/api/appealAssistanceConfirmation/wtssSel`, params)
}
//问题辅助整改
//分页
export function ProblemRectification(params) {
return post(`/api/ProblemRectification/`, params)
}
//问题清单查询
export function wtssSelProblemRectification(params) {
return post(`/api/ProblemRectification/wtssSel`, params)
}
//问题整改保存
export function wtzgProblemRectification(params) {
return post(`/api/ProblemRectification/wtzg`, params)
}
//问题整改下发
export function wtzgxfProblemRectification(params) {
return post(`/api/ProblemRectification/wtzgxf`, params)
}
//材料同步归档
//列表
export function materialSync(params) {
return post(`/api/materialSync/`, params)
}
\ No newline at end of file
......@@ -37,12 +37,12 @@
>
</el-form-item>
</el-form>
<div class="setscroll">
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
......@@ -73,6 +73,7 @@
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -84,11 +85,11 @@
class="elpagination"
>
</el-pagination>
<!-- 问题确认 -->
<!-- 问题复核 -->
<el-dialog
title="问题确认"
:visible.sync="dialogQR"
width="90%"
width="79%"
:modal-append-to-body="false"
:append-to-body="false"
@close="closed"
......@@ -150,26 +151,37 @@
<el-input v-model="scope.row.feedback"></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId">
<el-table-column label="附加解释材料" prop="zgFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="复核情况" prop="zgFileId">
<template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" value=""></el-option>
<el-option label="未申诉" :value="0"></el-option>
<el-option label="已申诉" :value="1"></el-option>
<el-option label="申诉驳回" :value="2"></el-option>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</div>
</div>
<p class="midBtn">
<span @click="cancelSS()">取消</span
><span @click="saveSS()">确认</span>
><span @click="saveSS()">保存</span>
</p>
</el-dialog>
<!-- 申诉 -->
<!-- 复核下发 -->
<el-dialog
title="申诉"
title="复核情况"
:visible.sync="dialogSS"
width="90%"
width="79%"
:modal-append-to-body="false"
:append-to-body="false"
>
......@@ -230,19 +242,30 @@
<el-input v-model="scope.row.feedback"></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId">
<el-table-column label="附加解释材料" prop="zgFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="复核情况" prop="zgFileId">
<template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" :value="null"></el-option>
<el-option label="未申诉" :value="0"></el-option>
<el-option label="已申诉" :value="1"></el-option>
<el-option label="申诉驳回" :value="2"></el-option>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</div>
</div>
<p class="midBtn">
<span @click="cancel()">取消</span
><span @click="save()">确认</span>
><span @click="save()">问题下发</span>
</p>
</el-dialog>
......@@ -310,14 +333,10 @@
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.appealStatus == "1") {
this.$set(item, "postEvalState", "已申诉");
} else if (item.appealStatus == "2") {
this.$set(item, "postEvalState", "申诉驳回");
} else if (item.appealStatus == "3") {
this.$set(item, "postEvalState", "申诉通过");
if (item.reviewStatus >= "4") {
this.$set(item, "postEvalState", "复核已下发");
} else {
this.$set(item, "postEvalState", "未申诉");
this.$set(item, "postEvalState", "复核未下发");
}
});
this.total = res.data.total * 1;
......@@ -329,7 +348,7 @@
this.pageSize = 10;
this.submitForm();
},
//确认问题
//问题复核
async confirm() {
this.mergingPos=0;
this.mergingRows=[]
......@@ -476,10 +495,12 @@
this.dialogQR=false
},
async save(){
let res= await ssProblemAssistedFeedback(this.tableDataSS)
let res= await xfappealAssistanceConfirmatio(this.tableDataSS)
if(res.code=='200'){
this.dialogSS=false
this.resetForm()
}else{
this.$message('复核下发失败')
}
},
......@@ -487,18 +508,18 @@
this.dialogSS=false
},
async saveSS(){
let res= await qrProblemAssistedFeedback(this.tableDataQR)
let res= await wtfhappealAssistanceConfirmatio(this.tableDataQR)
if(res.code=='200'){
this.dialogQR=false
this.resetForm()
}
},
//申诉
//问题下发
async appeal(){
this.mergingPosss=0;
this.mergingRowsss=[];
if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行申诉");
this.$message("请选择一条数据进行下发");
return;
}
this.dialogSS = true;
......@@ -507,7 +528,7 @@
batchId: this.checkedList[0].batchId,
};
let res = await wtssSelProblemAssistedFeedback(params);
let res = await wtssSelAssistanceConfirmatio(params);
if (res.code == "200") {
this.tableDataSS = res.data.records;
this.tableDataSS.forEach((item) => {
......@@ -588,7 +609,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......@@ -632,6 +653,9 @@
.eltable {
box-sizing: border-box;
text-align: center;
width: 150%;
min-width: 150%;
margin-right: 210px;
// margin-top: 3vh;
}
/deep/ .el-table .warning-row {
......@@ -899,5 +923,27 @@
/deep/ .el-dialog__body{
padding-bottom: 15px;
}
.setscroll{
width: 100%;
height: 600px;
overflow: auto;
}
.dialog{
.eltable {
box-sizing: border-box;
text-align: center;
width: 100%;
min-width: 100%;
// margin-right: 210px;
// margin-top: 3vh;
}
}
// ::-webkit-scrollbar {
// width: 6px; // 横向滚动条
// height: 6px; // 纵向滚动条必写
// }
</style>
\ No newline at end of file
......@@ -577,7 +577,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
<!-- 辅助整改 --><template>
<div class="archiEvoluteLine">
<seachList searchtype="FZZG"></seachList>
<tableList class="tableList" tbtyps="FZZG"></tableList>
<template>
<div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName">
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.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="ruleForm.batchName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择">
<el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="button">
<el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
>
<el-button @click="resetForm('ruleForm')">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
>
<el-button @click="confirm()">
<i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;问题整改</el-button
>
<el-button @click="appeal()">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;整改提交</el-button
>
</el-form-item>
</el-form>
<div class="setscroll">
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
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 type="selection"> </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-column prop="projectStatus" label="项目建设阶段">
</el-table-column>
<!-- <el-table-column prop="createTime" label="历史审核状态">
</el-table-column> -->
<el-table-column prop="expertName" label="评审专家名单">
</el-table-column>
<el-table-column prop="appealDeadline" label="问题申诉截止时间">
</el-table-column>
<el-table-column prop="rectificationDeadline" label="问题整改截止时间">
</el-table-column>
<el-table-column prop="postEvalState" label="问题整改状态"> </el-table-column>
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table>
</div>
</template>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 15, 20, 50]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
class="elpagination"
>
</el-pagination>
<!-- 问题复核 -->
<el-dialog
title="问题确认"
:visible.sync="dialogQR"
width="79%"
:modal-append-to-body="false"
:append-to-body="false"
@close="closed"
>
<div class="dialog">
<h3>
项目名称:一期项目-电力营销-2023年网上国网(网上国网V1.0)-设计开发项目
</h3>
<div class="continer">
<p class="xqtitle"><span></span>问题清单</p>
<el-table
:data="tableDataQR"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
:span-method="arraySpanMethod"
border
>
<el-table-column
label="项目环节"
prop="projectStagetext"
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
</el-table-column>
<script>
import seachList from './components/seachList.vue'
import tableList from './components/tableList.vue'
<el-table-column label="问题检查项" prop="quesCheckItem">
</el-table-column>
<el-table-column label="检查说明" prop="checkDesc">
</el-table-column>
<el-table-column label="评估问题" prop="evalQues">
</el-table-column>
<el-table-column label="问题确认" width="auto">
<template slot-scope="scope">
<el-switch
v-model="scope.row.confirmStatus"
active-color="#C0C0C0"
inactive-color="#13ce66"
active-value="2"
inactive-value="1"
active-text="无异议"
inactive-text="有异议"
@change="controlSwitch($event, scope.row)"
>
<template v-slot:active>
<span>开启</span>
</template>
<template v-slot:inactive>
<span>关闭</span>
</template>
</el-switch>
</template>
</el-table-column>
<el-table-column label="解释批注" >
<template slot-scope="scope">
<el-input v-model="scope.row.feedback"></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="复核情况" prop="zgFileId">
<template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" value=""></el-option>
<el-option label="未申诉" :value="0"></el-option>
<el-option label="已申诉" :value="1"></el-option>
<el-option label="申诉驳回" :value="2"></el-option>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</div>
export default {
name: 'auxiliarySelection',
components: {
seachList,
tableList
},
</div>
<p class="midBtn">
<span @click="cancelSS()">取消</span
><span @click="saveSS()">保存</span>
</p>
</el-dialog>
<!-- 复核下发 -->
<el-dialog
title="复核情况"
:visible.sync="dialogSS"
width="79%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="dialog">
<h3>
项目名称:一期项目-电力营销-2023年网上国网(网上国网V1.0)-设计开发项目
</h3>
<div class="continer">
<p class="xqtitle"><span></span>问题清单</p>
<el-table
:data="tableDataSS"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
:span-method="arraySpanMethodss"
border
>
<el-table-column
label="项目环节"
prop="projectStagetext"
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
</el-table-column>
<el-table-column label="检查说明" prop="checkDesc">
</el-table-column>
<el-table-column label="评估问题" prop="evalQues">
</el-table-column>
<el-table-column label="问题确认" width="auto">
<template slot-scope="scope">
<el-switch
v-model="scope.row.confirmStatus"
active-color="#C0C0C0"
inactive-color="#13ce66"
active-value="2"
inactive-value="1"
active-text="无异议"
inactive-text="有异议"
@change="controlSwitch($event, scope.row)"
>
<template v-slot:active>
<span>开启</span>
</template>
<template v-slot:inactive>
<span>关闭</span>
</template>
</el-switch>
</template>
</el-table-column>
<el-table-column label="解释批注" >
<template slot-scope="scope">
<el-input v-model="scope.row.feedback"></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="复核情况" prop="zgFileId">
<template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" :value="null"></el-option>
<el-option label="未申诉" :value="0"></el-option>
<el-option label="已申诉" :value="1"></el-option>
<el-option label="申诉驳回" :value="2"></el-option>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</div>
</div>
<p class="midBtn">
<span @click="cancel()">取消</span
><span @click="save()">问题下发</span>
</p>
</el-dialog>
</div>
</template>
<script>
import { ProblemRectification, wtssSelProblemRectification,wtzgProblemRectification,wtzgxfProblemRectification} from "@/api/index";
export default {
data() {
return{
title:'确认更改'
return {
dialogSS:false,
ruleForm: {
batchYear: "",
batchName: "",
postEvalState: "",
},
ruleFormdialogBJ: {
appealDeadline: "",
rectificationDeadline: "",
},
rules: {
appealDeadline: [
{
required: true,
message: "请选择问题申诉截止时间",
trigger: "change",
},
],
rectificationDeadline: [
{
required: true,
message: "问题整改截止时间",
trigger: "change",
},
],
},
tableData: [],
tableDataQR: [],
tableDataSS:[],
checkedList: [],
currentPage: 1,
pageSizetjcl: 10,
total: 0,
dialogQR: false,
pageSize: 10,
mergingPos: 0,
mergingRows: [],
mergingPosss: 0,
mergingRowsss: [],
};
},
mounted() {
this.submitForm();
},
methods: {
async submitForm() {
let params = {
current: this.currentPage,
pageSize: this.pageSize,
};
Object.assign(params, this.ruleForm);
console.log(params);
let res = await ProblemRectification(params);
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.reviewStatus >= "5") {
this.$set(item, "postEvalState", "整改提交");
} else {
this.$set(item, "postEvalState", "整改未提交");
}
});
this.total = res.data.total * 1;
}
},
resetForm() {
this.$refs.formName.resetFields();
this.currentPage = 1;
this.pageSize = 10;
this.submitForm();
},
//问题整改
async confirm() {
this.mergingPos=0;
this.mergingRows=[]
if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行整改");
return;
}
this.dialogQR = true;
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
let res = await wtssSelAssistanceConfirmatio(params);
if (res.code == "200") {
this.tableDataQR = res.data.records;
this.tableDataQR.forEach((item) => {
switch (item.projectStage) {
case "1":
this.$set(item, "projectStagetext", "1.可研");
break;
case "2":
this.$set(item, "projectStagetext", "2.计划");
break;
case "3":
this.$set(item, "projectStagetext", "3.采购");
break;
case "4":
this.$set(item, "projectStagetext", "4.合同");
break;
case "5":
this.$set(item, "projectStagetext", "5.执行");
break;
case "6":
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
});
console.log(this.tableDataQR,'加不进去?')
this.dataPretreatment();
}
},
mounted(){
dataPretreatment() {
for (let i = 0; i < this.tableDataQR.length; i++) {
// tabledata 表格数据源
if (i === 0) {
this.mergingRows.push(1);
this.mergingPos = 0;
} else {
if (
this.tableDataQR[i].projectStage ===
this.tableDataQR[i - 1].projectStage
) {
//哪些数据是要合并的 合并的条件是什么
this.mergingRows[this.mergingPos] += 1;
this.mergingRows.push(0);
} else {
this.mergingRows.push(1);
this.mergingPos = i;
}
}
}
},
dataPretreatmentSS() {
for (let i = 0; i < this.tableDataSS.length; i++) {
// tabledata 表格数据源
if (i === 0) {
this.mergingRowsss.push(1);
this.mergingPosss = 0;
} else {
if (
this.tableDataSS[i].projectStage ===
this.tableDataSS[i - 1].projectStage
) {
//哪些数据是要合并的 合并的条件是什么
this.mergingRowsss[this.mergingPosss] += 1;
this.mergingRowsss.push(0);
} else {
this.mergingRowsss.push(1);
this.mergingPosss = i;
}
}
}
},
//表格颜色
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return "warning-row";
}
return "";
},
methods: {
//主列表选中行信息
handleSelectionChange(selection) {
console.log('222222')
if (Array.isArray(selection) && selection.length > 1) {
console.log('222222333',this.checkedList)
this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true);
}
}
</script>
<style scoped>
.archiEvoluteLine{
width: 100%;
this.checkedList = this.$refs.multipleTable.selection;
this.$forceUpdate();
console.log(this.checkedList, "2222");
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage = val;
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
//第一列
const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
}
},
arraySpanMethodss({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
//第一列
const _row = this.mergingRowsss[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
}
},
//问题确认开关
controlSwitch(val, row) {
console.log("333", val, row);
},
cancelSS(){
this.dialogQR=false
},
async save(){
let res= await xfappealAssistanceConfirmatio(this.tableDataSS)
if(res.code=='200'){
this.dialogSS=false
this.resetForm()
}else{
this.$message('复核下发失败')
}
},
cancel(){
this.dialogSS=false
},
async saveSS(){
let res= await wtfhappealAssistanceConfirmatio(this.tableDataQR)
if(res.code=='200'){
this.dialogQR=false
this.resetForm()
}
},
//问题提交
async appeal(){
this.mergingPosss=0;
this.mergingRowsss=[];
if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行提交");
return;
}
this.dialogSS = true;
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
let res = await wtssSelAssistanceConfirmatio(params);
if (res.code == "200") {
this.tableDataSS = res.data.records;
this.tableDataSS.forEach((item) => {
this.$set(item, "confirmStatus", "2")
switch (item.projectStage) {
case 1:
this.$set(item, "projectStagetext", "1.可研");
break;
case 2:
this.$set(item, "projectStagetext", "2.计划");
break;
case 3:
this.$set(item, "projectStagetext", "3.采购");
break;
case 4:
this.$set(item, "projectStagetext", "4.合同");
break;
case 5:
this.$set(item, "projectStagetext", "5.执行");
break;
case 6:
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
});
console.log(this.tableDataSS)
this.dataPretreatmentSS();
}
},
handleFileUpload(event) {
console.log('来了么')
this.file = event.target.files[0];
},
submitFile(row) {
this.$message('上传还没做')
return
console.log(row)
if (this.file) {
const formData = new FormData();
formData.append('file', this.file);
formData.append('prjId',this.checkedList[0].projectId);
formData.append('typeCode',row.typeCode);
ossupload(formData).then(response => {
console.log(response);
this.$set(row,'fileName',response.data.fileName)
})
.catch(error => {
console.error(error);
});
}
},
closed(){
console.log("关闭")
this.handleSelectionChange()
}
},
};
</script>
<style scoped lang="scss">
.main {
font-size: 14px;
position: relative;
height: 100%;
width: 100%;
box-sizing: border-box;
}
.el-form {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items:flex-start;
width: 99%;
flex-wrap: wrap;
border-top: 2px solid #23c6c8;
border-left: 1px solid #dee5e7;
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
margin-bottom: 20px;
.el-input {
width: 226px;
}
.el-select {
width: 226px;
}
}
.tableList{
/deep/ .el-form-item__content {
text-align: left;
}
/deep/ .el-form-item__label {
font-weight: bold;
color: #000;
width: 160px !important;
}
.button {
display: inline-block;
width: 100%;
text-align: left;
/deep/ .el-form-item__content {
margin-left: 20px !important;
text-align: left;
img {
width: 14px;
height: 14px;
margin-right: 15px;
vertical-align: middle;
}
}
.el-button {
background-color: #23c6c8;
border-color: #23c6c8;
color: #fff;
}
</style>
\ No newline at end of file
}
}
.eltable {
box-sizing: border-box;
text-align: center;
width: 150%;
min-width: 150%;
margin-right: 210px;
// margin-top: 3vh;
}
/deep/ .el-table .warning-row {
background: #f0ffff;
color: #2785e6;
}
.elpagination {
text-align: right;
margin-right: 100px;
}
/deep/ .el-dialog {
border-radius: 10px;
margin-top: 3vh !important;
}
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-dialog__wrapper {
position: absolute;
}
/deep/ .v-modal {
position: absolute;
}
/deep/ .el-dialog__header {
background-color: #0d867f;
padding-bottom: 20px;
text-align: left;
border-radius: 10px 10px 0 0;
.el-dialog__title {
color: #fff;
}
}
/deep/ .el-table__header th {
background-color: #eeeeee;
font-weight: bold;
.cell {
color: #333;
}
}
/deep/.el-table {
// width: 100%;
.el-table__header-wrapper table,
.el-table__body-wrapper table {
// width: 100% !important;
}
.el-table__body,
.el-table__footer,
.el-table__header {
table-layout: auto;
}
}
.textarea {
width: 100%;
.el-textarea {
width: 60%;
}
}
.Btn {
width: 200px;
margin: 0 auto;
height: 30px;
line-height: 30px;
span {
display: inline-block;
width: 80px;
height: 25px;
line-height: 25px;
text-align: center;
border-radius: 4px;
margin-right: 12px;
}
span:first-of-type {
border: 1px solid #000;
}
span:last-of-type {
background-color: #0d867f;
border: 1px solid #0d867f;
color: #fff;
}
}
/deep/ .el-dialog__headerbtn .el-dialog__close {
color: #fff;
}
.zjBtn {
width: 400px;
text-align: left;
vertical-align: middle;
span {
display: inline-block;
width: 140px;
height: 25px;
line-height: 25px;
text-align: center;
border-radius: 5px;
vertical-align: middle;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
padding: 5px 10px;
margin-left: 10px;
}
}
/deep/ .el-icon-position {
margin-right: 10px;
}
/deep/ .el-icon-folder-delete {
margin-right: 10px;
}
.cxItem {
text-align: right;
width: 20%;
.zjquery {
display: inline-block;
background-color: #4ca6a7;
width: 89px;
height: 40px;
color: #fff;
text-align: center;
line-height: 40px;
border-radius: 5px;
}
}
.midBtn {
margin: 0 auto;
margin-top: 20px;
span {
display: inline-block;
width: 80px;
height: 29px;
line-height: 29px;
text-align: center;
margin-right: 10px;
border-radius: 5px;
box-sizing: border-box;
}
span:first-of-type {
border: 1px solid grey;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
border: 1px solid #4ca6a7;
}
}
.dialog {
height: 700px;
overflow-y: auto;
.xqtitle {
text-align: left;
font-size: 18px;
border-bottom: 1px solid gainsboro;
padding-bottom: 10px;
span {
display: inline-block;
width: 5px;
height: 20px;
background: #0d867f;
margin-right: 14px;
vertical-align: middle;
}
}
/deep/ .el-form {
width: 65%;
flex-wrap: wrap;
padding: 0 10px;
text-align: center;
margin: 100px auto;
border: none;
.fromItem {
text-align: center;
width: 51%;
margin: 0 auto;
margin-bottom: 20px;
.el-input {
width: 226px;
}
.el-select {
width: 226px;
}
}
/deep/ .el-form-item__content {
text-align: left;
}
/deep/ .el-form-item__label {
font-weight: 400;
// color: #000;
width: 160px !important;
}
}
}
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-table__cell {
text-align: center;
}
h3 {
text-align: left;
}
/deep/.el-switch__core {
height: 30px;
width: 79px !important;
border-radius: 20px;
}
/deep/.el-switch.is-checked .el-switch__core::after {
margin-left: -28px;
}
/deep/ .el-switch_label {
height: 30px;
line-height: 30px;
}
/deep/.el-switch {
height: 30px;
line-height: 30px;
border-radius: 20px;
}
/deep/ .el-switch__label * {
font-size: 12px;
}
/deep/.el-switch__core:after {
width: 26px;
height: 26px;
}
/deep/.el-switch__label--left {
position: absolute;
left: 30px;
color: #fff;
z-index: -1111;
cursor: default;
user-select: none;
}
/deep/.el-switch__label--right {
position: absolute;
right: 30px;
color: #fff;
z-index: -1111;
cursor: default;
user-select: none;
}
/deep/.el-switch__label--right.is-active {
z-index: 1111;
color: grey !important;
height: 30px;
line-height: 30px;
}
/deep/.el-switch__label--left.is-active {
z-index: 1111;
color: #fff !important;
height: 30px;
line-height: 30px;
}
/deep/ .el-dialog__body{
padding-bottom: 15px;
}
.setscroll{
width: 100%;
height: 600px;
overflow: auto;
}
.dialog{
.eltable {
box-sizing: border-box;
text-align: center;
width: 100%;
min-width: 100%;
// margin-right: 210px;
// margin-top: 3vh;
}
}
// ::-webkit-scrollbar {
// width: 6px; // 横向滚动条
// height: 6px; // 纵向滚动条必写
// }
</style>
\ No newline at end of file
......@@ -810,7 +810,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -408,7 +408,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -352,7 +352,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -42,17 +42,18 @@
<el-button @click="submitForm()">
<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
>
<el-button @click="detailsForm('ruleForm')">
<el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
<el-button @click="attach('ruleForm')">
<img class="buttonIcon" src="../../assets/gd.png" />材料归档</el-button
<i class="el-icon-receiving"></i>&nbsp;&nbsp;&nbsp;材料归档</el-button
>
</el-form-item>
</el-form>
<div class="setscroll">
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
......@@ -106,6 +107,7 @@
<el-table-column prop="createTime" label="创建时间" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -171,7 +173,7 @@
<script>
import {
evalBatchInfo,
materialSync,
} from "@/api/index";
export default {
data() {
......@@ -279,7 +281,7 @@
};
Object.assign(params, this.ruleForm);
console.log(params);
let res = await evalBatchInfo(params);
let res = await materialSync(params);
if (res.code == "200") {
this.tableData = res.data.records;
......@@ -393,7 +395,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......@@ -435,8 +437,13 @@
}
}
.eltable {
widows: 100%;
// widows: 100%;
box-sizing: border-box;
box-sizing: border-box;
text-align: center;
width: 150%;
min-width: 150%;
// margin-right: 210px;
}
/deep/ .el-table .warning-row {
background: #f0ffff;
......@@ -592,4 +599,9 @@
/deep/ .el-table__cell{
text-align: center;
}
.setscroll{
width: 100%;
height: 600px;
overflow: auto;
}
</style>
\ No newline at end of file
......@@ -394,7 +394,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -280,7 +280,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
<!-- 评估项目辅助选定 -->
<template>
<div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName">
<el-form-item label="批次年度:" prop="batchYear" class="fromItem" >
<el-form
:model="ruleForm"
label-width="100px"
class="demo-ruleForm"
ref="formName"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
......@@ -47,6 +52,7 @@
</el-button>
</el-form-item>
</el-form>
<div class="setscroll">
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
......@@ -82,6 +88,7 @@
<el-table-column prop="createTime" label="创建时间" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -110,7 +117,11 @@
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
</el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-form-item
label="后评估批次名称:"
prop="batchName"
class="fromItem"
>
<el-input v-model="ruleFormdialogBJ.batchName" disabled></el-input>
</el-form-item>
<el-form-item
......@@ -119,7 +130,8 @@
class="fromItem"
>
<el-input
v-model="ruleFormdialogBJ.planReviewDate" disabled
v-model="ruleFormdialogBJ.planReviewDate"
disabled
></el-input>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea">
......@@ -136,8 +148,8 @@
disabled
></el-input>
</el-form-item>
</el-form>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
......@@ -174,6 +186,7 @@
<el-table-column prop="expertState" label="专家状态" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeBJ"
@current-change="handleCurrentChangeBJ"
......@@ -187,6 +200,7 @@
</el-pagination>
</div>
</el-dialog>
<el-dialog
title="新增后评估批次信息"
:visible.sync="dialogAdd"
......@@ -252,9 +266,14 @@
<p class="zjBtn">
后评估专家 <span @click="xzExperts()">选择专家</span>
</p>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
:data="
addtableData.slice(
(addcurrentPage - 1) * pageSizeAdd,
addcurrentPage * pageSizeAdd
)
"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
......@@ -288,6 +307,7 @@
<el-table-column prop="expertState" label="专家状态" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd"
......@@ -305,6 +325,7 @@
</p>
</div>
</el-dialog>
<!-- 选择专家弹窗 -->
<el-dialog
title="选择专家组长"
......@@ -341,6 +362,7 @@
<span class="zjquery" @click="xzExperts()"> 查询 </span>
</el-form-item>
</el-form>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChangeZJ"
ref="multipleTableZJ"
......@@ -387,6 +409,7 @@
>
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeZJ"
@current-change="handleCurrentChangeZJ"
......@@ -412,7 +435,6 @@
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="dialog">
<el-form
......@@ -422,15 +444,22 @@
ref="formNameBJ"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleFormdialogBJ.batchYear" placeholder="请选择">
<el-select
v-model="ruleFormdialogBJ.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="ruleFormdialogBJ.batchName" ></el-input>
<el-form-item
label="后评估批次名称:"
prop="batchName"
class="fromItem"
>
<el-input v-model="ruleFormdialogBJ.batchName"></el-input>
</el-form-item>
<el-form-item
label="计划评审日期:"
......@@ -459,11 +488,11 @@
placeholder="请输入内容"
></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">
后评估专家 <span @click="xzExperts()">选择专家</span>
</p>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
......@@ -500,6 +529,7 @@
<el-table-column prop="expertState" label="专家状态" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeBJ"
@current-change="handleCurrentChangeBJ"
......@@ -599,8 +629,8 @@ export default {
pageSizetjcl: 10,
total: 0,
dialogXQ: false,
currentPageBJ:1,
pageSizeBJ:10,
currentPageBJ: 1,
pageSizeBJ: 10,
dialogAdd: false,
dialogAddzj: false,
......@@ -616,7 +646,7 @@ export default {
xfParam: "",
dialogedit: false,
expertIdList: [],
totalBJ:0,
totalBJ: 0,
addZJList: [],
expertState: "",
fields: "",
......@@ -644,17 +674,17 @@ export default {
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach(item=>{
if (item.postEvalState==''||item.postEvalState==null){
this.tableData.forEach((item) => {
if (item.postEvalState == "" || item.postEvalState == null) {
// this.$set( item,'postEvalState','')
}else if (item.postEvalState=='0'){
this.$set( item,'postEvalState','未下发')
}else if(item.postEvalState=='2'){
this.$set( item,'postEvalState','已撤回')
}else{
this.$set( item,'postEvalState','已下发')
} else if (item.postEvalState == "0") {
this.$set(item, "postEvalState", "未下发");
} else if (item.postEvalState == "2") {
this.$set(item, "postEvalState", "已撤回");
} else {
this.$set(item, "postEvalState", "已下发");
}
})
});
this.total = res.data.total * 1;
}
},
......@@ -667,7 +697,7 @@ export default {
//点击新增
async add() {
this.dialogAdd = true;
this.addtableData=[];//每次新增清空不然点了还是这几个人
this.addtableData = []; //每次新增清空不然点了还是这几个人
},
//详情
async detailsForm() {
......@@ -675,19 +705,19 @@ export default {
this.$message("请选择");
return;
}
console.log("222",this.checkedList);
console.log("222", this.checkedList);
this.dialogXQ = true;
this.ruleFormdialogBJ=this.checkedList[0]
this.ruleFormdialogBJ = this.checkedList[0];
let params = {
current: this.currentedit,
pageSize: this.pageSizeedit,
batchId:this.checkedList[0].batchId
batchId: this.checkedList[0].batchId,
};
console.log(params,'params')
console.log(params, "params");
let res = await expert(params);
this.addtableData=res.data.records
this.totalBJ=res.data.total * 1;
this.addtableData = res.data.records;
this.totalBJ = res.data.total * 1;
},
//表格颜色
tableRowClassName({ row, rowIndex }) {
......@@ -709,10 +739,12 @@ export default {
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
this.submitForm();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage = val;
this.submitForm();
},
handleSizeChangeZJ(val) {
console.log(`每页 ${val} 条`);
......@@ -734,7 +766,7 @@ export default {
this.pageSizeAdd = val;
},
handleCurrentChangeAdd(val) {
this.currentAdd = val;
this.addcurrentPage = val;
},
handleSizeChangeBJ(val) {
console.log(`每页 ${val} 条`);
......@@ -760,8 +792,15 @@ export default {
this.$message("请选择专家");
return;
}
this.addtableData=this.addZJList;
console.log(this.addtableData, "addtableData");
// this.addtableData = this.addZJList;
this.addtableData = [...this.addtableData, ...this.addZJList];
this.addtableData= this.addtableData.filter((obj, index, self) =>
index === self.findIndex((t) => (
t.expertId === obj.expertId
))
)
this.addtotal = this.addtableData.length;
this.dialogAddzj = false;
},
......@@ -800,11 +839,10 @@ export default {
}
console.log(this.addZJList, "this.addZJList");
let expertIdList = [];
let expertStr='';
let expertStr = "";
this.addtableData.forEach((item) => {
expertIdList.push(item.expertId);
expertStr = JSON.stringify(expertIdList).slice(1, -1);
});
let params = {
expertStr: expertStr,
......@@ -814,7 +852,7 @@ export default {
console.log(params, "222");
adEvalBatchInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList=expertIdList
this.expertIdList = expertIdList;
this.resetForm();
});
}
......@@ -822,7 +860,6 @@ export default {
// this.$emit("listenToChildEvent", "reset");
// }
},
cancelXZ() {
......@@ -838,19 +875,18 @@ export default {
if (this.addtableData.length < 1) {
this.$message("请选择专家");
}
console.log(this.addtableData,'addtableData')
console.log(this.addtableData, "addtableData");
let expertIdList = [];
let expertStr='';
let expertStr = "";
this.addtableData.forEach((item) => {
expertIdList.push(item.expertId);
expertStr = JSON.stringify(expertIdList).slice(1, -1);
});
console.log(expertStr,'expertStr')
console.log(expertStr, "expertStr");
let params = {
expertStr: expertStr,
};
Object.assign( this.ruleFormdialogBJ,params);
// this.xfParams = JSON.parse(JSON.stringify(params));
Object.assign(this.ruleFormdialogBJ, params);
console.log(this.ruleFormdialogBJ, "222");
updEvalBatchInfo(this.ruleFormdialogBJ).then((res) => {
this.dialogedit = false;
......@@ -866,52 +902,49 @@ export default {
},
//点击编辑
async edit() {
//只能选择编辑未下发 待增加
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalState=='已下发'){
if (this.checkedList[0].postEvalState == "已下发") {
this.$message("不能编辑已下发的项目");
return;
}
this.ruleFormdialogBJ=this.checkedList[0]
this.dialogedit=true
this.ruleFormdialogBJ = this.checkedList[0];
this.dialogedit = true;
let params = {
current: this.currentedit,
pageSize: this.pageSizeedit,
batchId:this.checkedList[0].batchId
batchId: this.checkedList[0].batchId,
};
console.log(params,'params')
console.log(params, "params");
let res = await expert(params);
this.addtableData=res.data.records
this.totalBJ=res.data.total * 1;
this.addtableData.forEach(item=>{
this.expertIdList.push(item.expertId)
})
this.addtableData = res.data.records;
this.totalBJ = res.data.total * 1;
this.addtableData.forEach((item) => {
this.expertIdList.push(item.expertId);
});
},
//点击删除
async deletes() {
console.log("删除")
console.log("删除");
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
let res = await delEvalBatchInfo(this.checkedList[0]);
this.resetForm()
this.resetForm();
},
//点击下发
async sendMsg(){
async sendMsg() {
//只能选择未下发的 这块需要加一下
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalState=='已下发'){
if (this.checkedList[0].postEvalState == "已下发") {
this.$message("该项目已下发");
return;
}
......@@ -919,36 +952,35 @@ export default {
// this.$message("该项目已撤回");
// return;
// }
if(this.checkedList[0].postEvalState=='已撤回'){
this.$set(this.checkedList[0],'postEvalState','2')
}else{
this.$set(this.checkedList[0],'postEvalState','0')
if (this.checkedList[0].postEvalState == "已撤回") {
this.$set(this.checkedList[0], "postEvalState", "2");
} else {
this.$set(this.checkedList[0], "postEvalState", "0");
}
let res= await sendEvalBatchInfo(this.checkedList[0])
if(res.code=='200'){
this.resetForm()
let res = await sendEvalBatchInfo(this.checkedList[0]);
if (res.code == "200") {
this.resetForm();
}
},
//点击撤回
async withdraw(){
async withdraw() {
//只能选择已下发未确认的 这块需要加一下
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalState=='未下发'){
if (this.checkedList[0].postEvalState == "未下发") {
this.$message("该项目未下发");
return;
}
if(this.checkedList[0].postEvalState=='已撤回'){
if (this.checkedList[0].postEvalState == "已撤回") {
this.$message("该项目已撤回");
return;
}
this.$set(this.checkedList[0],'postEvalState','2')
let res= await chEvalBatchInfo(this.checkedList[0])
if(res.code=='200'){
this.resetForm()
this.$set(this.checkedList[0], "postEvalState", "2");
let res = await chEvalBatchInfo(this.checkedList[0]);
if (res.code == "200") {
this.resetForm();
}
},
},
......@@ -971,7 +1003,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......@@ -1016,6 +1048,7 @@ export default {
widows: 100%;
box-sizing: border-box;
}
/deep/ .el-table .warning-row {
background: #f0ffff;
color: #2785e6;
......@@ -1026,6 +1059,7 @@ export default {
}
/deep/ .el-dialog {
border-radius: 10px;
margin-top: 5vh !important;
}
/deep/ .el-dialog__wrapper {
position: absolute;
......@@ -1164,10 +1198,28 @@ export default {
color: #fff;
}
}
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
text-align: center;
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-table__cell{
/deep/ .el-table__cell {
text-align: center;
}
.setscroll {
width: 100%;
height: 600px;
overflow: auto;
}
.setscrolldialog {
width: 100%;
height: 300px;
overflow: auto;
}
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条必写
}
</style>
\ No newline at end of file
......@@ -349,7 +349,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -791,7 +791,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -374,7 +374,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -485,7 +485,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -413,7 +413,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -13,6 +13,7 @@ export default {
<style lang="scss" scoped>
.main{
padding: 10px;
padding-top:5px;
}
</style>
\ No newline at end of file
......@@ -413,7 +413,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -389,7 +389,7 @@
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 20px 0;
margin-bottom: 20px;
.fromItem {
width: 24%;
margin: 0 0.5%;
......
......@@ -3,7 +3,7 @@ const { defineConfig } = require('@vue/cli-service')
// const ip = '172.20.10.3';
// const ip = '172.20.10.9'; // 何鹏
// const ip = '192.168.0.120';
// const ip = '192.168.0.13';
// const ip = '192.168.50.1';
const ip = '192.168.8.120';
module.exports = defineConfig({
transpileDependencies: true,
......@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true,
proxy: {
'/api':{
target: `http://192.168.8.120:18101`, // pin
target: `http://192.168.8.248:18101`, // pin
changeOrigin: true,
pathRewrite:{
"^/api":""
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!