Skip to content

Administrator / project_progress

Go to a project
Commit 9a5ca2af by liangzhen
Options

暂存

1 parent 68f4893f
Expand all
Inline Side-by-side
Showing with 39 additions and 12 deletions
src/views/assessChecks/assistedViewing.vue
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<el-tab-pane label="问题清单" name="second"> <el-tab-pane label="问题清单" name="second">
<p class="title"><span></span>项目基本信息</p> <p class="title"><span></span>项目基本信息</p>
<el-table <el-table
:data="qdtableData" :data="xxtableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
...@@ -243,6 +243,7 @@ export default { ...@@ -243,6 +243,7 @@ export default {
return { return {
listData: {}, listData: {},
qdtableData: [], qdtableData: [],
xxtableData:[],
showButton: true, showButton: true,
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
...@@ -365,11 +366,11 @@ export default { ...@@ -365,11 +366,11 @@ export default {
}; };
let res = await wtqdqselect(params); let res = await wtqdqselect(params);
if (res.code == "200") { if (res.code == "200") {
this.qdtableData = res.data.records; this.xxtableData = res.data.records;
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
this.qdtableData.forEach((item) => { this.xxtableData.forEach((item) => {
switch (item.projectStage) { switch (item.projectStage) {
case 1: case 1:
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
......
src/views/assessChecks/confirmRelease.vue
...@@ -463,6 +463,7 @@ import { ...@@ -463,6 +463,7 @@ import {
export default { export default {
data() { data() {
return { return {
oldid:"",
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
...@@ -590,6 +591,7 @@ export default { ...@@ -590,6 +591,7 @@ export default {
console.log("222",this.checkedList); console.log("222",this.checkedList);
this.dialogXQ = true; this.dialogXQ = true;
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ=this.checkedList[0]
let params={ let params={
current:this.addcurrentPage, current:this.addcurrentPage,
pageSize:this.pageSizeAdd, pageSize:this.pageSizeAdd,
...@@ -601,6 +603,7 @@ export default { ...@@ -601,6 +603,7 @@ export default {
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
} }
}, },
...@@ -628,6 +631,12 @@ export default { ...@@ -628,6 +631,12 @@ export default {
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
this.oldid ="";
if(this.addtableData.length>0){
this.addtableData.forEach((item) => {
this.oldid= this.oldid.concat(item.projectId+',')
});
}
} }
}, },
closeXQ(){ closeXQ(){
...@@ -705,6 +714,7 @@ export default { ...@@ -705,6 +714,7 @@ export default {
let params = { let params = {
current: this.currentZJ, current: this.currentZJ,
pageSize: this.pageSizeZJ, pageSize: this.pageSizeZJ,
projectStr:this.oldid
}; };
Object.assign(params, this.ruleFormZJ); Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params); let res = await getProjectInfo(params);
......
src/views/assessChecks/materialAcquisition.vue
...@@ -241,7 +241,12 @@ ...@@ -241,7 +241,12 @@
<el-table-column label="材料类别" prop="batchtype"> </el-table-column> <el-table-column label="材料类别" prop="batchtype"> </el-table-column>
<el-table-column prop="typeText" 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="资料名称">
<template slot-scope="scope">
<el-button @click="handleClickXZ(scope.row)">{{scope.row.fileName}}</el-button>
</template>
</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">
...@@ -389,10 +394,10 @@ export default { ...@@ -389,10 +394,10 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "已上传") { // if (this.checkedList[0].postEvalStateText == "已上传") {
this.$message("已上传评估材料"); // this.$message("已上传评估材料");
return; // return;
} // }
console.log("222"); console.log("222");
this.dialog = true; this.dialog = true;
let params = { let params = {
...@@ -535,6 +540,15 @@ export default { ...@@ -535,6 +540,15 @@ export default {
}); });
} }
}, },
handleClickXZ(scope){
console.log(scope.url)
// const link = document.createElement('a')
//_blank表示在新窗口打开链接
// link.target = '_blank'
// link.href =scope.url
window.open(scope.url, '_blank');
}
}, },
}; };
</script> </script>
......
src/views/layout/analysisCore.vue
<template> <template>
<div> <div>
<!-- <iframe name="iframeName" id="iframeId" src="../static/index.html" frameborder="0"></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> <iframe src="http://192.168.50.1/static/#/" frameborder="0" style="width:100vw;height:100vh;"></iframe>
</div> </div>
</template> </template>
......
src/views/layout/mainLayout.vue
...@@ -156,6 +156,8 @@ export default { ...@@ -156,6 +156,8 @@ export default {
}, },
mounted() { mounted() {
// window.addEventListener("resize", this.handleResize); // window.addEventListener("resize", this.handleResize);
sessionStorage.setItem("author", "sgtig_weizheng");
sessionStorage.setItem("authorName",99);
}, },
methods: { methods: {
handleResize() { handleResize() {
......
vue.config.js
...@@ -12,11 +12,11 @@ module.exports = defineConfig({ ...@@ -12,11 +12,11 @@ module.exports = defineConfig({
devServer: { devServer: {
hot: true, hot: true,
proxy: { proxy: {
'/api':{ '/arch-evaluation':{
target: `http://192.168.50.1:19000/arch-evaluation`, // pin target: `http://192.168.50.1`, // pin
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
"^/api":"" // "^/arch-evaluation":"/"
}, },
} }
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!