Skip to content

Administrator / project_progress

Go to a project
Commit 68f4893f by liangzhen
Options

ifame

1 parent 5cd51fce
Expand all
Inline Side-by-side
Showing with 79 additions and 29 deletions
src/router/index.js
...@@ -144,6 +144,12 @@ export const routes = [ ...@@ -144,6 +144,12 @@ export const routes = [
}, },
] ]
}, },
{
path:'/analysisCore',
name:"analysisCore",
component: () => import('@/views/layout/analysisCore.vue'),
}
] ]
}, },
......
src/views/assessChecks/confirmRelease.vue
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="评估项目" width="auto"> <el-table-column prop="batchName" label="评估项目" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="prjsOfExpert" label="已选择数量" width="auto"> <!-- <el-table-column prop="prjsOfExpert" label="已选择数量" width="auto">
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
v-model="ruleFormdialogBJ.planReviewDate" disabled v-model="ruleFormdialogBJ.planReviewDate" disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem"> <!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
<el-input <el-input
v-model="ruleFormdialogBJ.prjsOfExpert" disabled v-model="ruleFormdialogBJ.prjsOfExpert" disabled
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="工作组织情况:" class="textarea"> <el-form-item label="工作组织情况:" class="textarea">
<el-input <el-input
type="textarea" type="textarea"
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="auto"> <el-table-column prop="projectYear" label="项目下达年度" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto"> <el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="auto"> <el-table-column prop="projectCategory" label="建设形式" width="auto">
</el-table-column> </el-table-column>
...@@ -196,7 +197,6 @@ ...@@ -196,7 +197,6 @@
:model="ruleFormdialogBJ" :model="ruleFormdialogBJ"
label-width="150px" label-width="150px"
class="demo-ruleForm" class="demo-ruleForm"
:rules="rules"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input> <el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
v-model="ruleFormdialogBJ.planReviewDate" disabled v-model="ruleFormdialogBJ.planReviewDate" disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem"> <!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
<el-select <el-select
v-model="ruleFormdialogBJ.prjsOfExpert" v-model="ruleFormdialogBJ.prjsOfExpert"
placeholder="请选择" placeholder="请选择"
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
<el-option label="300" value="300"></el-option> <el-option label="300" value="300"></el-option>
<el-option label="不限" value="不限"></el-option> <el-option label="不限" value="不限"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="工作组织情况:" class="textarea"> <el-form-item label="工作组织情况:" class="textarea">
<el-input <el-input
type="textarea" type="textarea"
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="auto"> <el-table-column prop="projectYear" label="项目下达年度" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto"> <el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="auto"> <el-table-column prop="projectCategory" label="建设形式" width="auto">
</el-table-column> </el-table-column>
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem" >
<el-input <el-input
v-model="ruleFormZJ.projectName" v-model="ruleFormZJ.projectName"
placeholder="请输入" placeholder="请输入"
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="200"> <el-table-column prop="projectYear" label="项目下达年度" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="200"> <el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="200"> <el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column> </el-table-column>
...@@ -493,16 +493,16 @@ export default { ...@@ -493,16 +493,16 @@ export default {
prjsOfExpert:"", prjsOfExpert:"",
description: "", description: "",
}, },
rules: { // rules: {
prjsOfExpert: [ // prjsOfExpert: [
{ // {
required: true, // required: true,
message: "请选择每位专家可评估项目数", // message: "请选择每位专家可评估项目数",
trigger: "change", // trigger: "change",
}, // },
] // ]
}, // },
tableData: [], tableData: [],
tableDataQD: [], //清单列表 tableDataQD: [], //清单列表
checkedList: [], checkedList: [],
......
src/views/assessChecks/materialAcquisition.vue
...@@ -311,6 +311,25 @@ export default { ...@@ -311,6 +311,25 @@ export default {
}, },
{ batchtype: "开发、实施类", typeText: "安全防护方案", typeCode: "4" }, { batchtype: "开发、实施类", typeText: "安全防护方案", typeCode: "4" },
], //清单列表 ], //清单列表
tableDataNew: [
{ batchtype: "开发、实施类", typeText: "技术规范书", typeCode: "0" },
{
batchtype: "开发、实施类",
typeText: "可行性研究报告",
typeCode: "1",
},
{
batchtype: "开发、实施类",
typeText: "需求规格说明书",
typeCode: "2",
},
{
batchtype: "开发、实施类",
typeText: "概要设计说明书",
typeCode: "3",
},
{ batchtype: "开发、实施类", typeText: "安全防护方案", typeCode: "4" },
],
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
...@@ -380,15 +399,16 @@ export default { ...@@ -380,15 +399,16 @@ export default {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
this.tableDataQD =this.tableDataNew
if (res.data.records.length > 0) { if (res.data.records.length > 0) {
// this.tableDataQD = res.data.records;
this.tableDataQD = this.tableDataQD this.tableDataQD = this.tableDataQD
.concat(res.data.records) .concat(res.data.records)
.reduce((accumulator, currentObj) => { .reduce((accumulator, currentObj) => {
const existingObj = accumulator.find( const existingObj = accumulator.find(
(obj) => obj.itypeCode === currentObj.typeCode (obj) => obj.typeCode == currentObj.typeCode
); );
if (existingObj) { if (existingObj) {
Object.assign(existingObj, currentObj); Object.assign(existingObj, currentObj);
...@@ -422,13 +442,15 @@ export default { ...@@ -422,13 +442,15 @@ export default {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
this.tableDataQD =this.tableDataNew
this.tableDataQD = this.tableDataQD this.tableDataQD = this.tableDataQD
.concat(res.data.records) .concat(res.data.records)
.reduce((accumulator, currentObj) => { .reduce((accumulator, currentObj) => {
const existingObj = accumulator.find( const existingObj = accumulator.find(
(obj) => obj.itypeCode === currentObj.typeCode (obj) => obj.typeCode == currentObj.typeCode
); );
if (existingObj) { if (existingObj) {
Object.assign(existingObj, currentObj); Object.assign(existingObj, currentObj);
...@@ -501,6 +523,7 @@ export default { ...@@ -501,6 +523,7 @@ export default {
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);
formData.append("bathId", this.checkedList[0].batchId);
ossupload(formData) ossupload(formData)
.then((response) => { .then((response) => {
......
src/views/layout/analysisCore.vue
<template> <template>
<div> <div>
<iframe name="iframeName" id="iframeId" src="./test.html"></iframe> <!-- <iframe name="iframeName" id="iframeId" src="../static/index.html" frameborder="0"></iframe> -->
<iframe src="/static/index.html" frameborder="0" style="width:100vw;height:100vh;"></iframe>
</div> </div>
</template> </template>
...@@ -11,5 +12,9 @@ export default { ...@@ -11,5 +12,9 @@ export default {
</script> </script>
<style> <style>
#iframeId{
width: 100%;
height: 100vh;
}
</style> </style>
\ No newline at end of file
src/views/layout/index.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div id="hpg" @click="navigateToChild('5','/mainLayout')" :class="active=='5'?'active':''"> <div id="hpg" @click="navigateToChild('5','/mainLayout')" :class="active=='5'?'active':''">
<span class="between iconfont" >&#xe612;</span>&nbsp;后评估管控中心 <span class="between iconfont" >&#xe612;</span>&nbsp;后评估管控中心
</div> </div>
<div id="zhfx" :class="active=='6'?'active':''" @click="navigateToChild('6','/mainLayout')"> <div id="zhfx" :class="active=='6'?'active':''" @click="navigateToChild('6','/analysisCore')">
<span class="between iconfont">&#xe603;</span>&nbsp;综合分析中心 <span class="between iconfont">&#xe603;</span>&nbsp;综合分析中心
</div> </div>
<div id="xtgl" :class="active=='7'?'active':''"> <div id="xtgl" :class="active=='7'?'active':''">
......
src/views/layout/mainLayout.vue
<template> <template>
<div class="layout"> <div class="layout">
<LeftBar class="bar" :authority="authority" :autho="autho"></LeftBar> <LeftBar class="bar" :authority="authority" :autho="autho" ref="child"></LeftBar>
<ContinerView class="continer" id="myElement"> <ContinerView class="continer" id="myElement">
<router-view></router-view> <router-view></router-view>
</ContinerView> </ContinerView>
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
:unique-opened="true" :unique-opened="true"
@open="handleOpen" @open="handleOpen"
@close="handleClose"
ref="menu"
> >
<el-submenu <el-submenu
v-for="(item, index) in menuList" v-for="(item, index) in menuList"
...@@ -147,8 +149,10 @@ export default { ...@@ -147,8 +149,10 @@ export default {
}, },
], ],
authority: null, authority: null,
autho:null autho:null,
KeyIndex:"",
}; };
}, },
mounted() { mounted() {
// window.addEventListener("resize", this.handleResize); // window.addEventListener("resize", this.handleResize);
...@@ -181,7 +185,16 @@ export default { ...@@ -181,7 +185,16 @@ export default {
sessionStorage.setItem("authorName", a.id); sessionStorage.setItem("authorName", a.id);
this.authority = a.id; this.authority = a.id;
this.autho= b.code this.autho= b.code
}, this.$refs.menu.close("0");
},
handleOpen(key,bb) {
console.log(key,bb)
this.KeyIndex = key;
},
handleClose(){
this.isCollapsed=!this.isCollapsed
}
}, },
}; };
</script> </script>
......
static/css/chunk-vendors.10dd4e95.css 0 → 100644
This diff could not be displayed because it is too large.
static/fonts/element-icons.f1a45d74.ttf 0 → 100644
No preview for this file type
static/fonts/element-icons.ff18efd1.woff 0 → 100644
No preview for this file type
static/index.html 0 → 100644
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><script defer="defer" src="/js/chunk-vendors.4a9bcec5.js"></script><script defer="defer" src="/js/app.ae14cf60.js"></script><link href="/css/chunk-vendors.10dd4e95.css" rel="stylesheet"><link href="/css/app.9c33aee3.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
\ No newline at end of file
static/js/app.ae14cf60.js 0 → 100644
This diff could not be displayed because it is too large.
static/js/app.ae14cf60.js.map 0 → 100644
This diff could not be displayed because it is too large.
static/js/chunk-vendors.4a9bcec5.js 0 → 100644
This diff could not be displayed because it is too large.
static/js/chunk-vendors.4a9bcec5.js.map 0 → 100644
This diff could not be displayed because it is too large.
vue.config.js
...@@ -13,7 +13,7 @@ module.exports = defineConfig({ ...@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true, hot: true,
proxy: { proxy: {
'/api':{ '/api':{
target: `http://192.168.50.1:18101`, // pin target: `http://192.168.50.1:19000/arch-evaluation`, // pin
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
"^/api":"" "^/api":""
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!