suzhou-jichuang-lanhai
/
jin_ji_hu
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

正式环境备忘录跳转、去除多余展示、拨付类型更改

Browse Source
lijinlong
吕天方 6 months ago
parent 5ca400fd27
commit 24396a880c
6 changed files with 101 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -5,9 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development' ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境 # 金鸡湖现代服务业品牌管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.0.110:9040' VUE_APP_BASE_API = 'http://192.168.0.110:9040'
# 测试环境数据库 # 测试环境数据库
VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# 脱敏三方测试用数据库 # 脱敏三方测试用数据库
# VUE_APP_BASE_API = 'http://39.101.188.84:9031' # VUE_APP_BASE_API = 'http://39.101.188.84:9031'
# 正式环境数据库 # 正式环境数据库

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "1.0.202408301742", "version": "1.0.202409031604",
"description": "金鸡湖现代服务业品牌管理系统", "description": "金鸡湖现代服务业品牌管理系统",
"author": "若依", "author": "若依",
"license": "MIT", "license": "MIT",

68
src/assets/styles/publicPro.scss
Unescape View File

@ -264,12 +264,14 @@
.service-left { .service-left {
padding: 10px; padding: 10px;
height: 100%;
overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.home-mainPro-top, .home-mainPro-top {
.home-mainPro-middle, height: 32%;
.home-mainPro-bottom { // height: 250px;
display: flex; display: flex;
align-items: center; align-items: center;
@ -288,12 +290,6 @@
.pro-right-box { .pro-right-box {
width: 45%; width: 45%;
} }
}
.home-mainPro-top {
// height: 32%;
height: 250px;
.home-mainPro-top-box { .home-mainPro-top-box {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -534,14 +530,32 @@
.home-mainPro-middle { .home-mainPro-middle {
margin: 10px 0; margin: 10px 0;
// height: 45%; height: 40%;
flex: 2; display: flex;
align-items: center;
// overflow: hidden;
.pro-left-box,
.pro-right-box {
height: 100%;
padding: 10px;
background-color: #F5F8FA;
border-radius: 10px;
display: flex;
flex-direction: column;
}
.pro-left-box {
width: 55%;
}
.pro-right-box {
width: 45%;
}
// flex: 2;
// 企业获得资金拨付排名TOP5 // 企业获得资金拨付排名TOP5
.capitalConditionTOP5-box,.wancheng-project { .capitalConditionTOP5-box,.wancheng-project {
flex: 1; flex: 1;
section { section {
margin-top: 10px; margin-top: 10px;
.el-table--border { .el-table--border {
border: 1px solid #dfe6ec; border: 1px solid #dfe6ec;
} }
@ -605,8 +619,26 @@
} }
.home-mainPro-bottom { .home-mainPro-bottom {
// height: 25.5%; height: 25.5%;
flex: 1.3; // flex: 1.3;
display: flex;
align-items: center;
.pro-left-box,
.pro-right-box {
height: 100%;
padding: 10px;
background-color: #F5F8FA;
border-radius: 10px;
display: flex;
flex-direction: column;
}
.pro-left-box {
width: 55%;
}
.pro-right-box {
width: 45%;
}
.wancheng-project { .wancheng-project {
flex: 1; flex: 1;
section { section {
@ -681,6 +713,7 @@
} }
} }
} }
} }
@ -826,6 +859,13 @@
color: #0086FF; color: #0086FF;
} }
} }
.el-radio-group {
.el-radio-button {
.el-radio-button__inner {
padding: 5px 15px;
}
}
}
.years-select { .years-select {
margin-right: 10px; margin-right: 10px;
} }

4
src/views/homeTwo/index.vue
Unescape View File

@ -10,7 +10,7 @@
<el-col :span="12" class="enterprise-honor" id="one-table" style="margin-right: 10px;"> <el-col :span="12" class="enterprise-honor" id="one-table" style="margin-right: 10px;">
<div class="box-header" id="one-table-header"> <div class="box-header" id="one-table-header">
<span class="garden"></span> <span class="garden"></span>
<span class="box-header-title">企业荣誉资质（5个）</span> <span class="box-header-title">企业荣誉资质</span>
</div> </div>
<div class="two-tables" :style="{height : tabOneHeader + 'px'}" v-if="enterpriseHonor.length > 0"> <div class="two-tables" :style="{height : tabOneHeader + 'px'}" v-if="enterpriseHonor.length > 0">
<div class="table-items" v-for="item in enterpriseHonor" :key="item.id"> <div class="table-items" v-for="item in enterpriseHonor" :key="item.id">
@ -34,7 +34,7 @@
<el-col :span="12" class="relevancy-project"> <el-col :span="12" class="relevancy-project">
<div class="box-header"> <div class="box-header">
<span class="garden"></span> <span class="garden"></span>
<span class="box-header-title">关联项目进展（3个）</span> <span class="box-header-title">关联项目进展</span>
</div> </div>
<div class="promoteProject-box-wai-box" :style="{height:tableTwoHeight + 'px'}" v-if="tableTwoData.length > 0"> <div class="promoteProject-box-wai-box" :style="{height:tableTwoHeight + 'px'}" v-if="tableTwoData.length > 0">
<div class="promoteProject-box-div" v-for="(item,index) in tableTwoData" :key="index"> <div class="promoteProject-box-div" v-for="(item,index) in tableTwoData" :key="index">

31
src/views/workbenchPro/components/capitalConditionTOP5/index.vue
Unescape View File

@ -1,7 +1,7 @@
<!-- 拨付资金企业申请情况TOP5 --> <!-- 拨付资金企业申请情况TOP5 -->
<template> <template>
<section> <section>
<el-table v-loading="loading" :data="tableData" :height="tabHeader" border :header-cell-style="{background:'#E8F3FC'}"> <el-table v-loading="loading" :data="tableData" :height="height" border :header-cell-style="{background:'#E8F3FC'}">
<el-table-column label="排名" key="type" prop="type" align="center" width="80"> <el-table-column label="排名" key="type" prop="type" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="project-trace-table-ranking" :style="{backgroundColor: scope.row.rankingBg}">{{ scope.row.ranking }}</div> <div class="project-trace-table-ranking" :style="{backgroundColor: scope.row.rankingBg}">{{ scope.row.ranking }}</div>
@ -22,9 +22,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="拨付类型" key="projectName" prop="projectName" align="center" width="130"> <el-table-column label="拨付类型" key="projectName" prop="projectName" align="center" width="130">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<div class="project-table-Info">{{ scope.row.projectName }}</div> <div >{{ scope.row.projectName == "区级总部" ? '总部专项' : '服务业专项'}}</div>
</template> --> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属企业" key="qymc" prop="qymc" align="center" /> <el-table-column label="所属企业" key="qymc" prop="qymc" align="center" />
</el-table> </el-table>
@ -45,6 +45,10 @@ export default {
type:Number, type:Number,
default:2, default:2,
}, },
height:{
type:Number,
default:0,
},
yearsValue:{ yearsValue:{
type:Number, type:Number,
default:1, default:1,
@ -63,8 +67,8 @@ export default {
}, },
}, },
mounted() { mounted() {
this.cancalDebounce(); // this.cancalDebounce();
window.addEventListener('resize', this.cancalDebounce); // window.addEventListener('resize', this.cancalDebounce);
this.getList(); this.getList();
}, },
methods:{ methods:{
@ -92,7 +96,6 @@ export default {
}) })
}, },
ProjectInfo(item){ ProjectInfo(item){
console.log(item,"item");
if((item.projectName == "区级总部" || item.projectName == "市级服务业领军") && item.projectId) { if((item.projectName == "区级总部" || item.projectName == "市级服务业领军") && item.projectId) {
this.$router.push({ this.$router.push({
name: 'projectInfo', name: 'projectInfo',
@ -111,13 +114,13 @@ export default {
} }
}, },
// 屏幕尺寸变化 // 屏幕尺寸变化
cancalDebounce(){ // cancalDebounce(){
const element = document.getElementById('home-mainPro-middle-id'); // 通过元素的 ID 获取元素 // const element = document.getElementById('home-mainPro-middle-id'); // 通过元素的 ID 获取元素
const header = document.getElementById('TOP-header-id'); // 通过元素的 ID 获取元素 // const header = document.getElementById('TOP-header-id'); // 通过元素的 ID 获取元素
const elementHeight = element.offsetHeight; // const elementHeight = element.offsetHeight;
const headerHeight = header.offsetHeight; // const headerHeight = header.offsetHeight;
this.tabHeader = elementHeight - headerHeight - 30; // this.tabHeader = elementHeight - headerHeight - 20;
} // }
}, },
} }
</script> </script>

28
src/views/workbenchPro/index.vue
Unescape View File

@ -88,7 +88,7 @@
</div> </div>
</div> </div>
<div class="capitalConditionTOP5-box"> <div class="capitalConditionTOP5-box">
<table-three :typeValue="typeValue" :yearsValue="yearsChange"></table-three> <table-three :typeValue="typeValue" :yearsValue="yearsChange" :height="tabHeaderOne"></table-three>
</div> </div>
</div> </div>
<div class="pro-right-box"> <div class="pro-right-box">
@ -98,7 +98,7 @@
</div> </div>
<div class="wancheng-project"> <div class="wancheng-project">
<section> <section>
<el-table v-loading="loadingProject" :data="tableData" :height="tabHeader" border :header-cell-style="{background:'#E8F3FC'}"> <el-table v-loading="loadingProject" :data="tableData" :height="tabHeaderOne" border :header-cell-style="{background:'#E8F3FC'}">
<el-table-column label="项目名称" key="type" prop="type" align="center" width="180"> <el-table-column label="项目名称" key="type" prop="type" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="project-trace-table-name" @click="goProjectInfo(scope.row.id)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div> <div class="project-trace-table-name" @click="goProjectInfo(scope.row.id)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div>
@ -127,7 +127,7 @@
<el-table v-loading="loadingTwo" :data="tableDataTWo" :height="tabHeaderTwo" border :header-cell-style="{background:'#E8F3FC'}"> <el-table v-loading="loadingTwo" :data="tableDataTWo" :height="tabHeaderTwo" border :header-cell-style="{background:'#E8F3FC'}">
<el-table-column label="项目名称" key="type" prop="type" align="center" width="180"> <el-table-column label="项目名称" key="type" prop="type" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="project-trace-table-name" @click="goProjectInfo(scope.row.id)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div> <div class="project-trace-table-name" @click="goProjectInfo(scope.row.id,1)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申报时间" key="createTime" prop="createTime" align="center" width="120"> <el-table-column label="申报时间" key="createTime" prop="createTime" align="center" width="120">
@ -162,7 +162,7 @@
</el-table-column> </el-table-column>
<el-table-column label="备忘录类型" key="type" prop="type" align="center" width="100"> <el-table-column label="备忘录类型" key="type" prop="type" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="project-trace-table-name" @click="goProjectInfo(scope.row.projectId)">{{ scope.row.type == 1 ? '企业备忘' : scope.row.type == 2 ? '项目备忘' : '' }}</div> <div class="project-trace-table-name" @click="goProjectInfo(scope.row,2)">{{ scope.row.type == 1 ? '企业备忘' : scope.row.type == 2 ? '项目备忘' : '' }}</div>
</template> </template>
</el-table-column> </el-table-column>
@ -365,7 +365,7 @@ export default {
yearsChange: 1, yearsChange: 1,
typeValue: 2, typeValue: 2,
tableData:[], tableData:[],
tabHeader:null, tabHeaderOne:null,
tableDataTWo:[], tableDataTWo:[],
tableDataThree:[], tableDataThree:[],
tabHeaderTwo:null, tabHeaderTwo:null,
@ -418,11 +418,25 @@ export default {
this.loadingTwo = false; this.loadingTwo = false;
}) })
}, },
goProjectInfo(item){ goProjectInfo(item,id){
if(id == 1) {
this.$router.push({ this.$router.push({
name: 'projectInfo', name: 'projectInfo',
query: { userId: Number(item) } query: { userId: Number(item) }
}) })
} else {
if(item.type == '1') {
this.$router.push({
name: 'enterpriselibraryInfo',
query: { userId: Number(item.projectId) }
})
} else if(item.type == '2'){
this.$router.push({
name: 'projectInfo',
query: { userId: Number(item.projectId) }
})
}
}
}, },
// 备忘录更新情况 // 备忘录更新情况
getMemorandum(){ getMemorandum(){
@ -585,7 +599,7 @@ export default {
const headerHeight = header.offsetHeight; const headerHeight = header.offsetHeight;
const elementHeightTwo = elementTwo.offsetHeight; const elementHeightTwo = elementTwo.offsetHeight;
const headerHeightTwo = headerTwo.offsetHeight; const headerHeightTwo = headerTwo.offsetHeight;
this.tabHeader = elementHeight - headerHeight - 23; this.tabHeaderOne = elementHeight - headerHeight - 28;
this.tabHeaderTwo = elementHeightTwo - headerHeightTwo - 28; this.tabHeaderTwo = elementHeightTwo - headerHeightTwo - 28;
} }
}, },

Write Preview
Loading…
Cancel
Save