|
|
@@ -4,82 +4,113 @@
|
|
|
<div class="pAHeader">
|
|
|
<div class="pAHeader1">成果展示</div>
|
|
|
</div>
|
|
|
- <hr>
|
|
|
-
|
|
|
+ <hr />
|
|
|
+
|
|
|
<!-- 搜索栏开始 -->
|
|
|
<div class="selectInp">
|
|
|
<div class="manageSelects">
|
|
|
- <div class="selectsBlock">
|
|
|
- <span class="selectLabel">项目筛选</span>
|
|
|
- <el-select v-model="pavalues.value" @change="getData" placeholder="我的项目">
|
|
|
- <el-option label="所有项目" value=""/>
|
|
|
- <el-option
|
|
|
- v-for="item in options"
|
|
|
- :key="item.courseId"
|
|
|
- :label="item.title"
|
|
|
- :value="item.courseId">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <div class="selectsBlock">
|
|
|
+ <span class="selectLabel">项目筛选</span>
|
|
|
+ <el-select
|
|
|
+ v-model="pavalues.value"
|
|
|
+ @change="getData"
|
|
|
+ placeholder="我的项目"
|
|
|
+ >
|
|
|
+ <el-option label="所有项目" value="" />
|
|
|
+ <el-option
|
|
|
+ v-for="item in options"
|
|
|
+ :key="item.courseId"
|
|
|
+ :label="item.title"
|
|
|
+ :value="item.courseId"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
|
|
|
- <div class="selectsBlock">
|
|
|
- <span class="selectLabel">部门</span>
|
|
|
- <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有部门" value=""/>
|
|
|
- <el-option
|
|
|
- v-for="item in options1"
|
|
|
- :key="item.classid"
|
|
|
- :label="item.name"
|
|
|
- :value="item.classid">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <div class="selectsBlock">
|
|
|
+ <span class="selectLabel">部门</span>
|
|
|
+ <el-select
|
|
|
+ v-model="pavalues.value1"
|
|
|
+ @change="getData"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option label="所有部门" value="" />
|
|
|
+ <el-option
|
|
|
+ v-for="item in options1"
|
|
|
+ :key="item.classid"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.classid"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
|
|
|
- <div class="selectsBlock">
|
|
|
- <span class="selectLabel">分类</span>
|
|
|
- <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有分类" value=""/>
|
|
|
- <el-option
|
|
|
- v-for="item in options2"
|
|
|
- :key="item.typeid"
|
|
|
- :label="item.name"
|
|
|
- :value="item.typeid">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <div class="selectsBlock">
|
|
|
+ <span class="selectLabel">分类</span>
|
|
|
+ <el-select
|
|
|
+ v-model="pavalues.value2"
|
|
|
+ @change="getData"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option label="所有分类" value="" />
|
|
|
+ <el-option
|
|
|
+ v-for="item in options2"
|
|
|
+ :key="item.typeid"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.typeid"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
|
|
|
- <div class="selectsBlock">
|
|
|
- <span class="selectLabel">负责人</span>
|
|
|
- <el-select v-model="pavalues.value3" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有负责人" value=""/>
|
|
|
- <el-option
|
|
|
- v-for="item in options3"
|
|
|
- :key="item.pro_leader"
|
|
|
- :label="item.pro_leader"
|
|
|
- :value="item.pro_leader">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
- <div class="selectsBlock">
|
|
|
- <span class="selectLabel">年份</span>
|
|
|
- <el-select v-model="pavalues.value4" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有年份" value=""/>
|
|
|
- <el-option
|
|
|
- v-for="item in options4"
|
|
|
- :key="item.time"
|
|
|
- :label="item.time+'年'"
|
|
|
- :value="item.time">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <div class="selectsBlock">
|
|
|
+ <span class="selectLabel">负责人</span>
|
|
|
+ <el-select
|
|
|
+ v-model="pavalues.value3"
|
|
|
+ @change="getData"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option label="所有负责人" value="" />
|
|
|
+ <el-option
|
|
|
+ v-for="item in options3"
|
|
|
+ :key="item.pro_leader"
|
|
|
+ :label="item.pro_leader"
|
|
|
+ :value="item.pro_leader"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="selectsBlock">
|
|
|
+ <span class="selectLabel">年份</span>
|
|
|
+ <el-select
|
|
|
+ v-model="pavalues.value4"
|
|
|
+ @change="getData"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option label="所有年份" value="" />
|
|
|
+ <el-option
|
|
|
+ v-for="item in options4"
|
|
|
+ :key="item.time"
|
|
|
+ :label="item.time + '年'"
|
|
|
+ :value="item.time"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="ProjectManagementQuery">
|
|
|
- <el-input v-model="input" style="width:240px" placeholder="请输入项目名称/编号"></el-input>
|
|
|
- <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
|
|
|
+ <el-input
|
|
|
+ v-model="input"
|
|
|
+ style="width: 240px"
|
|
|
+ placeholder="请输入项目名称/编号"
|
|
|
+ ></el-input>
|
|
|
+ <el-button type="primary" class="btn" @click="getData" size="mini"
|
|
|
+ >查询</el-button
|
|
|
+ >
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 搜索栏结束 -->
|
|
|
-
|
|
|
+
|
|
|
<!-- 表格开始 -->
|
|
|
<div>
|
|
|
<el-table
|
|
|
@@ -88,47 +119,53 @@
|
|
|
tooltip-effect="dark"
|
|
|
stripe
|
|
|
class="fontSize"
|
|
|
- :header-cell-style="{ background: '#f2f2f2',color:'#000' }">
|
|
|
+ :header-cell-style="{ background: '#f2f2f2', color: '#000' }"
|
|
|
+ >
|
|
|
<el-table-column
|
|
|
prop="ProjectNo"
|
|
|
label="项目编号"
|
|
|
align="center"
|
|
|
- min-width="9%">
|
|
|
+ min-width="9%"
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="title"
|
|
|
label="项目名称"
|
|
|
align="center"
|
|
|
- min-width="10%">
|
|
|
+ min-width="10%"
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="pro_leader"
|
|
|
align="center"
|
|
|
label="项目负责人"
|
|
|
- min-width="9%">
|
|
|
+ min-width="9%"
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
prop="dName"
|
|
|
align="center"
|
|
|
label="所在部门"
|
|
|
- min-width="10%">
|
|
|
-
|
|
|
+ min-width="10%"
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="tName"
|
|
|
align="center"
|
|
|
label="分类"
|
|
|
- min-width="10%">
|
|
|
+ min-width="10%"
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="fund"
|
|
|
label="预算(万)"
|
|
|
align="center"
|
|
|
- min-width="8%">
|
|
|
+ min-width="8%"
|
|
|
+ >
|
|
|
<template #default="scope">
|
|
|
<div>
|
|
|
- {{ scope.row.fund/10000 }}
|
|
|
+ {{ scope.row.fund / 10000 }}
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -136,7 +173,8 @@
|
|
|
prop="startTime"
|
|
|
align="center"
|
|
|
label="开始时间"
|
|
|
- min-width="9%">
|
|
|
+ min-width="9%"
|
|
|
+ >
|
|
|
<template #default="scope">
|
|
|
<div>
|
|
|
{{ scope.row.startTime }}
|
|
|
@@ -147,21 +185,27 @@
|
|
|
prop="endTime"
|
|
|
label="结项时间"
|
|
|
align="center"
|
|
|
- min-width="9%">
|
|
|
+ min-width="9%"
|
|
|
+ >
|
|
|
<template #default="scope">
|
|
|
- <div>
|
|
|
- {{ scope.row.endTime}}
|
|
|
- </div>
|
|
|
- </template>
|
|
|
+ <div>
|
|
|
+ {{ scope.row.endTime }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="phone"
|
|
|
align="center"
|
|
|
label="联系电话"
|
|
|
- min-width="10%">
|
|
|
+ min-width="10%"
|
|
|
+ >
|
|
|
<template #default="scope">
|
|
|
<div>
|
|
|
- {{ scope.row.phone!=null||scope.row.phone==''?scope.row.phone:"-" }}
|
|
|
+ {{
|
|
|
+ scope.row.phone != null || scope.row.phone == ""
|
|
|
+ ? scope.row.phone
|
|
|
+ : "-"
|
|
|
+ }}
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -170,16 +214,20 @@
|
|
|
width="200"
|
|
|
align="center"
|
|
|
label="操作"
|
|
|
- >
|
|
|
+ >
|
|
|
<template #default="scope">
|
|
|
- <div class="operations" style="justify-content: center;">
|
|
|
- <el-button type="primary" @click="rsBtn(scope.row['courseId'],scope.row['typeid'])">成果展示</el-button>
|
|
|
- </div>
|
|
|
+ <div class="operations" style="justify-content: center">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ @click="rsBtn(scope.row['courseId'], scope.row['typeid'])"
|
|
|
+ >成果展示</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
-<!-- 表格结束 -->
|
|
|
+ <!-- 表格结束 -->
|
|
|
<!-- 循环展示框列表开始 -->
|
|
|
<!-- <div class="classBlocks core_dialogue">
|
|
|
<div class="classBlock" v-for="(item,index) in items" :key="index">
|
|
|
@@ -205,108 +253,114 @@
|
|
|
</div> -->
|
|
|
<!-- 展示框列表结束 -->
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <!-- 分页 -->
|
|
|
- <el-pagination
|
|
|
- @current-change="handleCurrentChange"
|
|
|
- :current-page="Page.currentPage"
|
|
|
- :page-size="Page.lim"
|
|
|
- layout=" prev, pager, next"
|
|
|
- background
|
|
|
- class="paginations"
|
|
|
- :total="Page.total">
|
|
|
- </el-pagination>
|
|
|
- <!-- 分页结束 -->
|
|
|
-
|
|
|
-
|
|
|
+ <!-- 分页 -->
|
|
|
+ <el-pagination
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ :current-page="Page.currentPage"
|
|
|
+ :page-size="Page.lim"
|
|
|
+ layout=" prev, pager, next"
|
|
|
+ background
|
|
|
+ class="paginations"
|
|
|
+ :total="Page.total"
|
|
|
+ >
|
|
|
+ </el-pagination>
|
|
|
+ <!-- 分页结束 -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- export default {
|
|
|
- data() {
|
|
|
- return {
|
|
|
- input:'',
|
|
|
- items:[], //项目展示小方块
|
|
|
- options:[],
|
|
|
- options1:[],
|
|
|
- options2:[],
|
|
|
- options3:[],
|
|
|
- options4:[],
|
|
|
- loading:false,
|
|
|
- pavalues:{
|
|
|
- value:'',
|
|
|
- value1:'',
|
|
|
- value2:'',
|
|
|
- value3:'',
|
|
|
- value4:new Date().getFullYear().toString(),
|
|
|
- },
|
|
|
- Page:{
|
|
|
- currentPage:1,
|
|
|
- total:0,
|
|
|
- lim:8
|
|
|
- }
|
|
|
- }
|
|
|
+export default {
|
|
|
+ data() {
|
|
|
+ return {
|
|
|
+ input: "",
|
|
|
+ items: [], //项目展示小方块
|
|
|
+ options: [],
|
|
|
+ options1: [],
|
|
|
+ options2: [],
|
|
|
+ options3: [],
|
|
|
+ options4: [],
|
|
|
+ loading: false,
|
|
|
+ pavalues: {
|
|
|
+ value: "",
|
|
|
+ value1: "",
|
|
|
+ value2: "",
|
|
|
+ value3: "",
|
|
|
+ value4: new Date().getFullYear().toString(),
|
|
|
},
|
|
|
- methods:{
|
|
|
- handleCurrentChange(val) { //当页数发生改变的时候调用获取列表数据请求
|
|
|
- // console.log(`当前页: ${val}`);
|
|
|
- this.Page.currentPage=val
|
|
|
- this.getData()
|
|
|
- },
|
|
|
- rsBtn(pid,tid){
|
|
|
- // console.log(pid,tid)
|
|
|
- window.open(`/resultShowDetail?pid=${pid}&tid=${tid}`)
|
|
|
- },
|
|
|
- getData(){ //获取渲染数据
|
|
|
- this.loading = true;
|
|
|
- let param={
|
|
|
- uid:this.$store.state.userInfo.userid, //当前账号id
|
|
|
- pid:this.pavalues.value, //项目筛选
|
|
|
- did:this.pavalues.value1, //部门
|
|
|
- tid:this.pavalues.value2, //分类
|
|
|
- leader:this.pavalues.value3, //负责人
|
|
|
- year:this.pavalues.value4,
|
|
|
- textInp:this.input,
|
|
|
- page:this.Page.currentPage, //当前页
|
|
|
- lim:this.Page.lim, //限制获取几条数据
|
|
|
- }
|
|
|
- this.ajax
|
|
|
- .get(this.$store.state.api+'/GetProjectIsConclusion',param)
|
|
|
- .then(res=>{
|
|
|
- let data = res.data;
|
|
|
+ Page: {
|
|
|
+ currentPage: 1,
|
|
|
+ total: 0,
|
|
|
+ lim: 8,
|
|
|
+ },
|
|
|
+ };
|
|
|
+ },
|
|
|
+ methods: {
|
|
|
+ handleCurrentChange(val) {
|
|
|
+ //当页数发生改变的时候调用获取列表数据请求
|
|
|
+ // console.log(`当前页: ${val}`);
|
|
|
+ this.Page.currentPage = val;
|
|
|
+ this.getData();
|
|
|
+ },
|
|
|
+ rsBtn(pid, tid) {
|
|
|
+ // console.log(pid,tid)
|
|
|
+ window.open(`/resultShowDetail?pid=${pid}&tid=${tid}`);
|
|
|
+ },
|
|
|
+ getData() {
|
|
|
+ //获取渲染数据
|
|
|
+ this.loading = true;
|
|
|
+ let param = {
|
|
|
+ uid: this.$store.state.userInfo.userid, //当前账号id
|
|
|
+ pid: this.pavalues.value, //项目筛选
|
|
|
+ did: this.pavalues.value1, //部门
|
|
|
+ tid: this.pavalues.value2, //分类
|
|
|
+ leader: this.pavalues.value3, //负责人
|
|
|
+ year: this.pavalues.value4,
|
|
|
+ textInp: this.input,
|
|
|
+ page: this.Page.currentPage, //当前页
|
|
|
+ lim: this.Page.lim, //限制获取几条数据
|
|
|
+ };
|
|
|
+ this.ajax
|
|
|
+ .post(this.$store.state.api + "/GetProjectIsConclusion", param)
|
|
|
+ .then(
|
|
|
+ (res) => {
|
|
|
+ let data = res.data;
|
|
|
|
|
|
- console.log(data)
|
|
|
- if (data[0].length==0 && data[5][0]['total'] != 0&&this.Page.currentPage!=1) {
|
|
|
- this.Page.currentPage=1
|
|
|
- return this.getData()
|
|
|
- }
|
|
|
- this.items = data[0];
|
|
|
- this.options = data[1];
|
|
|
- this.options1 = data[2];
|
|
|
- this.options2 = data[3];
|
|
|
- this.options3 = data[4];
|
|
|
- this.options4 = data[6];
|
|
|
- if(this.options4.filter(item=>item['time']==new Date().getFullYear().toString()).length==0){
|
|
|
- this.options4.push({time:new Date().getFullYear().toString()})
|
|
|
- }
|
|
|
- this.Page.total = data[5][0]['total']
|
|
|
+ console.log(data);
|
|
|
+ if (
|
|
|
+ data[0].length == 0 &&
|
|
|
+ data[5][0]["total"] != 0 &&
|
|
|
+ this.Page.currentPage != 1
|
|
|
+ ) {
|
|
|
+ this.Page.currentPage = 1;
|
|
|
+ return this.getData();
|
|
|
+ }
|
|
|
+ this.items = data[0];
|
|
|
+ this.options = data[1];
|
|
|
+ this.options1 = data[2];
|
|
|
+ this.options2 = data[3];
|
|
|
+ this.options3 = data[4];
|
|
|
+ this.options4 = data[6];
|
|
|
+ if (
|
|
|
+ this.options4.filter(
|
|
|
+ (item) => item["time"] == new Date().getFullYear().toString()
|
|
|
+ ).length == 0
|
|
|
+ ) {
|
|
|
+ this.options4.push({ time: new Date().getFullYear().toString() });
|
|
|
+ }
|
|
|
+ this.Page.total = data[5][0]["total"];
|
|
|
|
|
|
- this.loading = false;
|
|
|
- },err=>{
|
|
|
- console.log(err);
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
- },
|
|
|
- mounted(){
|
|
|
- this.getData();
|
|
|
- }
|
|
|
- }
|
|
|
+ this.loading = false;
|
|
|
+ },
|
|
|
+ (err) => {
|
|
|
+ console.log(err);
|
|
|
+ }
|
|
|
+ );
|
|
|
+ },
|
|
|
+ },
|
|
|
+ mounted() {
|
|
|
+ this.getData();
|
|
|
+ },
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
<style lang="less">
|
|
|
@@ -373,7 +427,7 @@
|
|
|
// text-overflow: ellipsis;
|
|
|
// }
|
|
|
// .classBlock3{ //名字、学院
|
|
|
-
|
|
|
+
|
|
|
// box-sizing: border-box;
|
|
|
// padding: 0 5px;
|
|
|
// font-size: 16px;
|
|
|
@@ -395,9 +449,6 @@
|
|
|
// }
|
|
|
// }
|
|
|
// }
|
|
|
-
|
|
|
-
|
|
|
|
|
|
-
|
|
|
// }
|
|
|
</style>
|
zengyicheng