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

数据云图项目追踪情况改成持续关注项目、

Browse Source
master
吕天方 5 months ago
parent 892f843cc8
commit dbcc96fb2a
6 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File

6
.env.development
Unescape View File

@ -5,11 +5,11 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development' ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境 # 金鸡湖现代服务业品牌管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.0.117:9031' # 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'
# 正式环境数据库 # 正式环境数据库
# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'

2
package.json
Unescape View File

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

22
src/assets/styles/public.scss
Unescape View File

@ -3170,7 +3170,7 @@
} }
.card-type { .card-type {
font-size: 12px; font-size: 15px;
// font-size: 1.5vh; // font-size: 1.5vh;
font-family: PingFang-SC, PingFang-SC; font-family: PingFang-SC, PingFang-SC;
font-weight: 500; font-weight: 500;
@ -3482,7 +3482,7 @@
} }
} }
// 项目追踪情况 // 持续关注项目
.dataCloudMap-right-bottom { .dataCloudMap-right-bottom {
height: 29%; height: 29%;
background-color: #fff; background-color: #fff;
@ -3570,11 +3570,19 @@
background-color: #F6F9FD; background-color: #F6F9FD;
} }
.project-trace-table-number { // .project-trace-table-number {
font-family: DINCondensed, DINCondensed; // font-family: DINCondensed, DINCondensed;
// font-weight: bold; // // font-weight: bold;
font-size: 20px; // font-size: 20px;
color: #FF844D; // color: #FF844D;
// }
.remind-info {
width: 11em;
overflow: hidden;
/* 显示省略符号来代表被修剪的文本。 */
text-overflow:ellipsis;
/* 文本不换行 */
white-space:nowrap;
} }
} }
} }

29
src/views/dataCloudMap/index.vue
Unescape View File

@ -121,7 +121,7 @@
<div class="card-unit unit-two">亿</div> <div class="card-unit unit-two">亿</div>
</div> </div>
</div> </div>
<div class="card-items"> <!-- <div class="card-items">
<div class="card-item-left"> <div class="card-item-left">
<div class="card-img card-img-three"></div> <div class="card-img card-img-three"></div>
<div class="card-type">全口径增加值:</div> <div class="card-type">全口径增加值:</div>
@ -130,7 +130,7 @@
<div class="card-number number-three">{{ item.addValue ? item.addValue : '-' }}</div> <div class="card-number number-three">{{ item.addValue ? item.addValue : '-' }}</div>
<div class="card-unit unit-two">亿</div> <div class="card-unit unit-two">亿</div>
</div> </div>
</div> </div> -->
</el-card> </el-card>
</div> </div>
<div class="dataCloudMap-statistics"> <div class="dataCloudMap-statistics">
@ -256,13 +256,13 @@
</div> </div>
</div> </div>
<!-- 项目追踪情况 --> <!-- 持续关注项目 -->
<div class="dataCloudMap-right-bottom" id="dataCloudMap-right-box"> <div class="dataCloudMap-right-bottom" id="dataCloudMap-right-box">
<div class="project-trace-title" id="project-trace-title-id"> <div class="project-trace-title" id="project-trace-title-id">
<div class="right-bottom-title"> <div class="right-bottom-title">
<div class="L-title-left"> <div class="L-title-left">
<span class="dataCloudMap-birght"></span> <span class="dataCloudMap-birght"></span>
<span class="dataCloudMap-title">项目追踪情况</span> <span class="dataCloudMap-title">持续关注项目</span>
</div> </div>
<span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span> <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
</div> </div>
@ -270,16 +270,22 @@
</div> </div>
<section> <section>
<el-table v-loading="loadingTwo" class="dataMap-two-table" :data="tableTwoData" :row-class-name="tableRowClassName" :height="tabHeader" :header-cell-style="{background:'#E8F3FC'}"> <!-- :max-height="tabHeader" --> <el-table v-loading="loadingTwo" class="dataMap-two-table" :data="tableTwoData" :row-class-name="tableRowClassName" :height="tabHeader" :header-cell-style="{background:'#E8F3FC'}"> <!-- :max-height="tabHeader" -->
<el-table-column label="申报任务名称" prop="enterpriseDirectory" width="500" align="center"/> <el-table-column label="项目名称" prop="projectSmallType" width="400" align="center">
<el-table-column label="填报时间" prop="time" align="center"> <template slot-scope="scope">
<!-- <div>{{ scope.row.enterpriseDirectory }}</div> -->
<dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
</template>
</el-table-column>
<el-table-column label="提醒内容" prop="alertContent" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</div> <!-- <div v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</div>
<div v-else>长期有效</div> <div v-else>长期有效</div> -->
<div class="remind-info">{{ scope.row.alertContent }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已填报企业数" prop="count" align="center"> <el-table-column label="提醒时间" prop="alertTime" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="project-trace-table-number">{{ scope.row.count }}</div> <div class="project-trace-table-number">{{ scope.row.alertTime }}</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -302,6 +308,7 @@ import echartData from './components/echartData.vue'
import { honor, projectTracking, getIndustryDepth, selectCount } from "@/api/jin_ji_hu/dataCloudMap" import { honor, projectTracking, getIndustryDepth, selectCount } from "@/api/jin_ji_hu/dataCloudMap"
export default { export default {
components:{honorDialogVue,headqEnterprise,serviceIndustry,collectDialog,echartData}, components:{honorDialogVue,headqEnterprise,serviceIndustry,collectDialog,echartData},
dicts: ["project_small_type"],
data() { data() {
return { return {
activeIndex:1, activeIndex:1,
@ -426,7 +433,7 @@ export default {
}, },
projectBtn(){ projectBtn(){
this.$router.push({ this.$router.push({
name: 'EnterpriseDirectory', name: 'Project',
}) })
}, },
active(e) { active(e) {

2
src/views/home/index.vue
Unescape View File

@ -31,7 +31,7 @@
<span class="right-number">{{ parseTime(item.appropriationTime, '{y}-{m}-{d}') }}</span> <span class="right-number">{{ parseTime(item.appropriationTime, '{y}-{m}-{d}') }}</span>
</div> </div>
<div class="appropriate"> <div class="appropriate">
<span class="left-title">拨付金额<span class="left-unit">(亿元)</span>:</span> <span class="left-title">拨付金额<span class="left-unit">(元)</span>:</span>
<span class="right-number">{{item.fundAmount}}</span> <span class="right-number">{{item.fundAmount}}</span>
</div> </div>
</div> </div>

10
src/views/system/user/index.vue
Unescape View File

@ -608,6 +608,7 @@ export default {
nickName: undefined, nickName: undefined,
password: undefined, password: undefined,
phonenumber: undefined, phonenumber: undefined,
enterpriseId: undefined,
email: undefined, email: undefined,
sex: undefined, sex: undefined,
status: "0", status: "0",
@ -665,7 +666,9 @@ export default {
this.reset(); this.reset();
const userId = row.userId || this.ids; const userId = row.userId || this.ids;
getUser(userId).then(response => { getUser(userId).then(response => {
this.form = response.data; this.form = {...response.data};
this.form.enterpriseId = response.data.nickName;
this.enterpriseId = response.data.enterpriseId;
this.postOptions = response.posts; this.postOptions = response.posts;
this.roleOptions = response.roles; this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds); this.$set(this.form, "postIds", response.postIds);
@ -703,15 +706,14 @@ export default {
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.form.enterpriseId = this.enterpriseId
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
updateUser(this.form).then(response => { updateUser({...this.form,enterpriseId:this.enterpriseId}).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addUser(this.form).then(response => { addUser({...this.form,enterpriseId:this.enterpriseId}).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();

Write Preview
Loading…
Cancel
Save