Commit c5410595 by liangzhen

暂存

1 parent 3dd71352
......@@ -38,7 +38,100 @@ export function adEvalBatchInfo(params) {
export function chEvalBatchInfo(params) {
return post(`/api/postEvalBatchInfo/ch`, params)
}
//评估批次确认发布分组
// 查询项目信息
//评估批次确认发布分页查询
export function projectInfo(params) {
return post(`/api/projectInfo/`, params)
}
//确认发布
export function fbProjectInfo(params) {
return post(`/api/projectInfo/fb`, params)
}
//删除  
export function delProjectInfo(params) {
return post(`/api/projectInfo/del`, params)
}
//撤回
export function chProjectInfo(params) {
return post(`/api/projectInfo/ch`, params)
}
// 查询项目信息
export function getProjectInfo(params) {
return post(`/api/projectInfo/getProjectInfo`, params)
}
// 查询关联项目
export function joinProjectInfo(params) {
return post(`/api/projectInfo/joinProjectInfo`, params)
}
//选择待评估项目
export function updProjectInfo(params) {
return post(`/api/projectInfo/upd`, params)
}
//评估材料自动获取
//评估材料自动获取分页查询
export function evaluationMaterials(params) {
return post(`/api/evaluationMaterials/`, params)
}
//查询材料清单
export function clqdevaluationMaterials(params) {
return post(`/api/evaluationMaterials/clqd`, params)
}
//查询材料清单
export function qrscevaluationMaterials(params) {
return post(`/api/evaluationMaterials/qrsc`, params)
}
//项目辅助检查
//项目辅助检查分页查询
export function postEvalQuesInfo(params) {
return post(`/api/postEvalQuesInfo/`, params)
}
//问题辅助下发
//问题辅助下发分页查询
export function problemAssistedDistribution(params) {
return post(`/api/problemAssistedDistribution/`, params)
}
// 撤回
export function chproblemAssistedDistribution(params) {
return post(`/api/problemAssistedDistribution/ch`, params)
}
// 问题批量下发
export function wtplxfproblemAssistedDistribution(params) {
return post(`/api/problemAssistedDistribution/wtplxf`, params)
}
//问题下发
export function wtxfproblemAssistedDistribution(params) {
return post(`/api/problemAssistedDistribution/wtxf`, params)
}
//问题辅助查询
//问题辅助查询分页查询
export function fzcxpostSelect(params) {
return post(`/api/postSelect/fzcx`, params)
}
//问题清单
export function WtqdpostSelect(params) {
return post(`/api/postSelect/selWtqd`, params)
}
//问题辅助反馈
//问题辅助反馈分页查询
export function ProblemAssistedFeedback(params) {
return post(`/api/ProblemAssistedFeedback/`, params)
}
//申诉
export function ssProblemAssistedFeedback(params) {
return post(`/api/ProblemAssistedFeedback/ss`, params)
}
//确认
export function qrProblemAssistedFeedback(params) {
return post(`/api/ProblemAssistedFeedback/qr`, params)
}
// 问题确认查询-申诉查询
export function wtssSelProblemAssistedFeedback(params) {
return post(`/api/ProblemAssistedFeedback/wtssSel`, params)
}
\ No newline at end of file
......@@ -107,82 +107,17 @@ export const routes = [
name: 'materialAnalysis',
component: () => import('@/views/assessChecks/materialAnalysis.vue'),
},
{
path: '/mainLayout/Compliance',
name: 'Compliance',
component: () => import('@/views/assessChecks/checkCompliance.vue'),
},
]
},
]
},
// {
// path:'/mainLayout',
// name:"mainLayout",
// component: () => import('@/views/layout/mainLayout.vue'),
// children:[
// {
// path: 'mainLayout/auxiliarySelection',
// name: 'auxiliarySelection',
// component: () => import('@/views/assessChecks/auxiliarySelection.vue'),
// meta: {
// title: "评估项目辅助选定",
// },
// },
// {
// path: 'mainLayout/archiving',
// name: 'archiving',
// component: () => import('@/views/assessChecks/archiving.vue'),
// },
// {
// path: 'mainLayout/assistedConfirm',
// name: 'assistedConfirm',
// component: () => import('@/views/assessChecks/assistedConfirm.vue'),
// },
// {
// path: 'mainLayout/assistedFeedback',
// name: 'assistedFeedback',
// component: () => import('@/views/assessChecks/assistedFeedback.vue'),
// },
// {
// path: 'mainLayout/assistedRect',
// name: 'assistedRect',
// component: () => import('@/views/assessChecks/assistedRect.vue'),
// },
// {
// path: 'mainLayout/assistedVerif',
// name: 'assistedVerif',
// component: () => import('@/views/assessChecks/assistedVerif.vue'),
// },
// {
// path: 'mainLayout/assistedViewing',
// name: 'assistedViewing',
// component: () => import('@/views/assessChecks/assistedViewing.vue'),
// },
// {
// path: 'mainLayout/assitedDistribution',
// name: 'assitedDistribution',
// component: () => import('@/views/assessChecks/assitedDistribution.vue'),
// },
// {
// path: 'mainLayout/auxiliaryInspection',
// name: 'auxiliaryInspection',
// component: () => import('@/views/assessChecks/auxiliaryInspection.vue'),
// },
// {
// path: 'mainLayout/auxiliaryQuery',
// name: 'auxiliaryQuery',
// component: () => import('@/views/assessChecks/auxiliaryQuery.vue'),
// },
// {
// path: 'mainLayout/confirmRelease',
// name: 'confirmRelease',
// component: () => import('@/views/assessChecks/confirmRelease.vue'),
// },
// {
// path: 'mainLayout/materialAcquisition',
// name: 'materialAcquisition',
// component: () => import('@/views/assessChecks/materialAcquisition.vue'),
// },
// ]
// },
//
]
......
<template>
<div class="main">
<div class="close"><i class="el-icon-circle-close"></i></div>
<p class="title">国网辽宁电力-桌面终端管理系统合规性检查评估</p>
<div class="continer">
<div class="left">
<p class="tableTitle">检查项</p>
<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"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="batchYear">
</el-table-column>
<el-table-column label="检查说明" prop="batchYear"> </el-table-column>
</el-table>
</div>
<div class="right">
<el-steps :active="0" align-center finish-status="success">
<el-step title="可研" icon="el-icon-circle-check"></el-step
><i class="el-icon-caret-right"></i>
<el-step title="计划" class="ssss"></el-step>
<el-step title="采购"></el-step>
<el-step title="合同"></el-step>
<el-step title="执行"></el-step>
<el-step title="结决算及转资"></el-step>
</el-steps>
<p class="tableTitle">检查内容</p>
</div>
</div>
</div>
</template>
<script>
export default {};
</script>
<style lang="scss" scoped>
.main {
font-size: 14px;
position: relative;
height: 100%;
width: 100%;
box-sizing: border-box;
}
.close{
position: absolute;
right:20px;
top: 20px;
.el-icon-circle-close{
font-size: 30px;
// background-color: #0d867f;
// color: #fff;
}
}
.title {
text-align: left;
background-color: #fff;
height: 40px;
line-height: 40px;
color: grey;
font-size: 15px;
}
.continer {
width: 100%;
display: flex;
background-color: #f5f5f6;
padding: 20px;
position: relative;
// background-color:#ccc;
.left {
width: 30%;
min-height: 100px;
margin-top: 100px;
color: #fff;
}
.right {
width: 70%;
margin-top: 44px;
padding: 0 20px;
}
}
/deep/.el-step__icon {
color: #0d867f;
border-color: #0d867f;
width: 20px;
height: 20px;
// border:3px solid #0d867f;
}
/deep/.el-icon-caret-right {
font-size: 30px;
line-height: 23px;
display: inline-block;
color: #0d867f;
z-index: 4;
}
/deep/.el-step.is-horizontal .el-step__line {
height: 1px;
margin-right: -20px !important;
z-index: 1;
}
/deep/.el-step__line {
color: gainsboro;
}
.el-step__head.is-wait {
color: #0d867f;
border-color: #0d867f;
}
/deep/.el-step__title {
color: #000;
}
/deep/.el-step__title.is-process {
color: #0d867f;
}
/deep/ .is-wait .el-step__icon-inner {
display: none;
}
.tableTitle {
background: #0d867f;
color: #f5f5f6;
height: 40px;
line-height: 40px;
text-align: left;
padding-left: 20px;
font-weight: 600;
font-size: 15px;
}
</style>
\ No newline at end of file
......@@ -368,6 +368,7 @@
:visible.sync="dialogAdd"
width="70%"
:modal-append-to-body="false"
@close="closeDialog"
>
<div class="adddialog">
<div class="addform-horizontal">
......@@ -646,7 +647,7 @@
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName">
:row-class-name="tableRowClassName"
border
>
<el-table-column prop="expertId" label="id" width="auto" v-show="false">
......@@ -706,6 +707,7 @@ import {expertInfo,expert,sendEvalBatchInfo,adEvalBatchInfo,updEvalBatchInfo } f
export default {
data() {
return {
expertIdList:[],
BJbatchYear:'',
BJbatchName:'',
BJplanTime:"",
......@@ -850,11 +852,11 @@ export default {
},
async saveBJ(){
let expertIdList=[]
this.addZJList.forEach(item=>{
expertIdList.push(item.expertId)
})
let expertStr=JSON.stringify(expertIdList).slice(1, -1)
// let expertIdList=[]
// this.addZJList.forEach(item=>{
// expertIdList.push(item.expertId)
// })
let expertStr=JSON.stringify(this.expertIdList).slice(1, -1)
let params=this.selection[0]
params.batchYear=this.BJbatchYear
params.batchName=this.BJbatchName
......@@ -866,6 +868,7 @@ export default {
if(res.code=='200'){
this.$emit("listenToChildEvent", "reset");
}
this.dialogedit=false;
},
cancelXZ(){
......@@ -895,6 +898,8 @@ export default {
this.xfParams=JSON.parse(JSON.stringify(params))
console.log(params,'222')
let res= await adEvalBatchInfo(params)
this.$emit("listenToChildEvent", "reset");
this.expertIdList=expertIdList
}
},
......@@ -981,6 +986,7 @@ export default {
let res = await expert(params);
this.addtableData=res.data.records
this.addtotal=res.data.total * 1;
this.$emit("listenToChildEvent", "reset");
},
......@@ -1005,6 +1011,9 @@ export default {
this.BJbzarea=this.selection[0].remark
this.addtableData=res.data.records
this.addtotal=res.data.total * 1;
this.addtableData.forEach(item=>{
this.expertIdList.push(item.expertId)
})
},
......@@ -1018,6 +1027,7 @@ export default {
submitQuestion() {},
//撤回
async withdraw() {
//只能撤回已下发的 单个撤回传batchId: 0,
let res= await chEvalBatchInfo
},
......
......@@ -8,7 +8,7 @@
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName">
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
......
<template>
<div class="navbar">
<el-scrollbar style="height:800px;" ref="scroll">
<el-scrollbar style="height:900px;" ref="scroll">
<el-menu
router
class="el-menu-vertical-demo"
:unique-opened="true"
@open="handleOpen"
@close="handleClose"
default-active="/mainLayout/auxiliarySelection"
:default-active="activeIndex"
>
<!-- :default-openeds="['submenu1']" -->
<el-submenu
......@@ -83,7 +83,7 @@ export default {
url: "/mainLayout/materialAcquisition",
children: [],
},
{ name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] },
// { name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] },
{ name: "项目辅助检查", url: "/mainLayout/auxiliaryInspection", children: [] },
{ name: "项目评估结果确认更改", url: "/mainLayout/confirmChanges", children: [] },
{ name: "评估结果辅助查看", url: "/mainLayout/assistedViewing", children: [] },
......@@ -217,11 +217,13 @@ export default {
],
isOpen: false,
openeds: ['0'],//默认展开导航栏
activeIndex:"/mainLayout/auxiliarySelection",
// openeds:["/mainLayout/confirmRelease"]
};
},
mounted(){
this.activeIndex = this.$route.path
},
methods: {
......
<template>
<div class="layout">
<div class="layout" >
<LeftBar class="bar"></LeftBar>
<ContinerView class="continer">
<ContinerView class="continer" id="myElement">
<router-view></router-view>
</ContinerView>
......@@ -25,9 +25,23 @@ export default {
},
mounted(){
window.addEventListener('resize', this.handleResize);
},
methods: {
handleResize() {
// 处理窗口大小变化的逻辑
console.log('Window was resized!');
var element = document.getElementById('myElement'); // 获取元素
var maxWidth = window.innerWidth; // 窗口宽度
var elementWidth = element.offsetWidth; // 元素宽度
var elementLeft = element.offsetLeft; // 元素左边缘到文档左边缘的距离
if (elementLeft + elementWidth > maxWidth) {
// 如果元素右边界超出窗口右边界,将元素左边缘设置为窗口宽度减去元素宽度
element.style.left = maxWidth - elementWidth + 'px';
}
}
}
}
......@@ -35,16 +49,22 @@ export default {
<style lang="scss" scoped>
.layout{
width: 100%;
height: 100%;
// height: 100%;
height: 100vh;
display: flex;
padding: 15px;
background-color: #fff;
overflow: hidden;
.bar{
width: 235px;
height: 100%;
}
.continer{
flex:1
width: 100%;
// height: 100%;
flex:1;
box-sizing: border-box;
}
}
......
......@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true,
proxy: {
'/api':{
target: `http://192.168.8.248:18101`, // pin
target: `http://192.168.50.1: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!