wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
a0049873 2022-12-05 17:35:27 +08:00
parent f3c6415726 15d0c850c4
commit 3169ff030e
12 changed files with 76 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
back/src/mixins/view-module.js
View File

@ -71,26 +71,30 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
this.dataList.map((item, index) => { if(!['/sys/notice/page','/sys/notice/mynotice/page'].includes(this.mixinViewModuleOptions.getDataListURL)){//我得通知、通知管理不需要特殊处理
if (this.dataList[index].type != null) { this.dataList.map((item, index) => {
switch (item.type) { if (this.dataList[index].type != null) {
case 1: this.dataList[index].type = '省'; break switch (item.type) {
case 2: this.dataList[index].type = '市'; break case 1: this.dataList[index].type = '省'; break
case 3: this.dataList[index].type = '区'; break case 2: this.dataList[index].type = '市'; break
case 4: this.dataList[index].type = '企业'; break case 3: this.dataList[index].type = '区'; break
} case 4: this.dataList[index].type = '企业'; break
}
if (item.children != null) {
item.children.map((item2, index2) => {
switch (item2.type) {
case 1: this.dataList[index].children[index2].type = '省'; break
case 2: this.dataList[index].children[index2].type = '市'; break
case 3: this.dataList[index].children[index2].type = '区'; break
case 4: this.dataList[index].children[index2].type = '企业'; break
} }
}) }
} if (item.children != null) {
}) item.children.map((item2, index2) => {
switch (item2.type) {
case 1: this.dataList[index].children[index2].type = '省'; break
case 2: this.dataList[index].children[index2].type = '市'; break
case 3: this.dataList[index].children[index2].type = '区'; break
case 4: this.dataList[index].children[index2].type = '企业'; break
}
})
}
})
}
// 我的代办特殊处理 // 我的代办特殊处理
if (this.mixinViewModuleOptions.getDataListURL === '/act/task/myToDoTaskPage') { if (this.mixinViewModuleOptions.getDataListURL === '/act/task/myToDoTaskPage') {
this.$http.get('/sys/user/info').then(userRes => { this.$http.get('/sys/user/info').then(userRes => {

4
back/src/views/modules/bscatalogue/bscatalogue.vue
View File

@ -65,12 +65,12 @@
</template> </template>
</cardDragger> </cardDragger>
<!-- 编辑卡片按钮 --> <!-- 编辑卡片按钮 -->
<div v-show="isShowEdit" class="resource-manager-edit-card"> <div @click.stop="editTopicCard" v-show="isShowEdit" class="resource-manager-edit-card">
<div> <div>
<div /> <div />
</div> </div>
<div> <div>
<span @click.stop="editTopicCard">{{ <span>{{
isRemoveCard ? '完成' : '编辑' isRemoveCard ? '完成' : '编辑'
}}</span> }}</span>
</div> </div>

2
back/src/views/modules/notice/notice-user-view.vue
View File

@ -48,10 +48,12 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.dataForm = { this.dataForm = {
...this.dataForm, ...this.dataForm,
...res.data ...res.data
} }
console.log("========================this.dataForm",this.dataForm)
}).catch(() => {}) }).catch(() => {})
} }
} }

20
back/src/views/modules/workBench/components/bottom-view.vue
View File

@ -3,8 +3,8 @@
<!-- 部门发布动态 --> <!-- 部门发布动态 -->
<div class="left container"> <div class="left container">
<content-title :title="title.dynamic"></content-title> <content-title :title="title.dynamic"></content-title>
<div class="dynamic-box" v-loading="loadingDynamic"> <div v-if="(list.length>0)" class="dynamic-box" v-loading="loadingDynamic">
<div class="dynamicView" v-for="(item, index) in list" :key="index" :number="index + 1" :item="item"> <div class="dynamicView" v-for="(item, index) in list" :key="index" :number="index + 1" :item="item">
<div class="wrapper"> <div class="wrapper">
<div class="content"> <div class="content">
<div class="left">{{ item.createDate }}</div> <div class="left">{{ item.createDate }}</div>
@ -16,6 +16,13 @@
</div> </div>
<div class="more" @click="jumpTo">查看更多 ></div> <div class="more" @click="jumpTo">查看更多 ></div>
</div> </div>
<div
class="no-data"
v-else
style="display: flex; align-items: center; justify-content: center"
>
暂无数据
</div>
</div> </div>
<!-- 部门推荐能力 --> <!-- 部门推荐能力 -->
@ -156,7 +163,14 @@ export default {
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.no-data {
width: 800px;
height: 335px;
line-height: 335px;
font-size: 16px;
color: #212121;
text-align: center;
}
.container { .container {
background: #fff; background: #fff;
width: 800px; width: 800px;

7
back/src/views/modules/workBench/components/trend-view.vue
View File

@ -68,7 +68,7 @@ export default {
const valueItem = y + '-' + m + '-' + d // 组合 const valueItem = y + '-' + m + '-' + d // 组合
days.unshift(valueItem) // 添加至数组 days.unshift(valueItem) // 添加至数组
} }
console.log('最近七天日期：', days)
return days return days
}, },
@ -88,6 +88,7 @@ export default {
endDate: this.endDate endDate: this.endDate
}, },
(res) => { (res) => {
// if (res.data.code !== 0) { // if (res.data.code !== 0) {
// return // return
// } // }
@ -111,7 +112,7 @@ export default {
ydata: [] ydata: []
} }
} }
this.$nextTick(() => { this.$nextTick(() => {
trendLineChart('trendId', this.trendChartData) trendLineChart('trendId', this.trendChartData)
}) })
@ -124,7 +125,7 @@ export default {
handleTitleSwitch (idx) { handleTitleSwitch (idx) {
this.selectedTitle = idx this.selectedTitle = idx
this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30) this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30)
console.log(this.startDate)
this.initChart() this.initChart()
}, },
getData (aa) { getData (aa) {

BIN
front/src/views/assertReport/image/jump.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 464 B

18
front/src/views/assertReport/index.vue
View File

@ -8,13 +8,14 @@
<div style="color: #bed1df; font-size: 32px">累计节省财政资金</div> <div style="color: #bed1df; font-size: 32px">累计节省财政资金</div>
<div class="area-right"> <div class="area-right">
<!-- <div class="mianJi">累计节省财政资金</div> --> <!-- <div class="mianJi">累计节省财政资金</div> -->
<template v-for="(item, index) in saveMonmy"> <template v-for="(item, index) in saveMonmy">
<p v-if="item == '.'" :key="index"> <p v-if="item == '.'" :key="index">
{{ item }} {{ item }}
</p> </p>
<span v-else>{{ item }}</span> <span @click="jumpToPage" v-else>{{ item }}</span>
</template> </template>
<div class="mianJi">万元</div> <div class="mianJi" >万元</div>
<!-- <div stype="margin-left:10px" ><img src="./image/jump.png"/></div> -->
</div> </div>
<div style="color: #bed1df; font-size: 16px"> <div style="color: #bed1df; font-size: 16px">
注：资源参考价格由部门提供或参考市场价格设定 注：资源参考价格由部门提供或参考市场价格设定
@ -50,6 +51,7 @@
import ReservoirRight from './components/ReservoirRight' import ReservoirRight from './components/ReservoirRight'
import ReservoirBottom from './components/ReservoirBottom' import ReservoirBottom from './components/ReservoirBottom'
import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js' import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js'
import Cookies from 'js-cookie'
export default { export default {
//import引入的组件需要注入到对象中才能使用 //import引入的组件需要注入到对象中才能使用
components: { components: {
@ -87,6 +89,11 @@
watch: {}, watch: {},
//方法集合 //方法集合
methods: { methods: {
//跳转后台资金报表 详情
jumpToPage(){
Cookies.remove('JSESSIONID')
window.open(window.SITE_CONFIG.backUrl + '/#/assetReport-index')
},
getSaveMoney() { getSaveMoney() {
getApplyPriceCount().then((res) => { getApplyPriceCount().then((res) => {
this.saveMonmy = NumbersConvertedToArrays(res.data.data) this.saveMonmy = NumbersConvertedToArrays(res.data.data)
@ -174,6 +181,7 @@
color: #bed1df; color: #bed1df;
margin-left: 100px; margin-left: 100px;
span { span {
cursor: pointer;
width: 36px; width: 36px;
// height: 45px; // height: 45px;
// line-height: 45px; // line-height: 45px;
@ -187,6 +195,10 @@
margin-right: 3px; margin-right: 3px;
font-family: DinPro-Bold; font-family: DinPro-Bold;
}
span:hover{
color: #f2bc0a;
} }
.mianJi { .mianJi {
margin-top: 6px; margin-top: 6px;

8
front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
View File

@ -60,10 +60,10 @@
申请使用 申请使用
</a-button> </a-button>
<a-button type="primary" @click="addShoppingCart()"> <a-button type="primary" @click="addShoppingCart()">
<template #icon> <!-- <template #icon>
<shopping-cart-outlined /> <shopping-cart-outlined />
</template> </template> -->
加入申购车 {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车
</a-button> </a-button>
<a-button type="primary" @click="goTOCollection()"> <a-button type="primary" @click="goTOCollection()">
{{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏 {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏
@ -95,7 +95,7 @@ const router = useRouter()
const applicationArea = ref('') const applicationArea = ref('')
const deploymentLocation = ref('') //部署位置 const deploymentLocation = ref('') //部署位置
//加入申购车 //加入申购车
const addShoppingCart = () => { const addShoppingCart = () => {
if (props.dataList.isInShoppingCart) { if (props.dataList.isInShoppingCart) {
message.error('已经加入申购车了') message.error('已经加入申购车了')
} else { } else {

4
front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
View File

@ -64,8 +64,8 @@
type="primary" type="primary"
@click="addShoppingCart()" @click="addShoppingCart()"
> >
<template #icon><shopping-cart-outlined /></template> <!-- <template #icon><shopping-cart-outlined /></template> -->
加入购物车 {{ props.dataList.isInShoppingCart ? '已' : '' }}加入购物车
</a-button> </a-button>
<a-button type="primary" @click="goTOCollection()"> <a-button type="primary" @click="goTOCollection()">
{{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏 {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

6
front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
View File

@ -57,10 +57,10 @@
申请使用 申请使用
</a-button> </a-button>
<a-button type="primary" @click="addShoppingCart()"> <a-button type="primary" @click="addShoppingCart()">
<template #icon> <!-- <template #icon>
<shopping-cart-outlined /> <shopping-cart-outlined />
</template> </template> -->
加入申购车 {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车
</a-button> </a-button>
<a-button type="primary" @click="goTOCollection()"> <a-button type="primary" @click="goTOCollection()">
{{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏 {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

4
front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
View File

@ -55,8 +55,8 @@
申请使用 申请使用
</a-button> </a-button>
<a-button type="primary" @click="addShoppingCart()"> <a-button type="primary" @click="addShoppingCart()">
<template #icon><shopping-cart-outlined /></template> <!-- <template #icon><shopping-cart-outlined /></template> -->
加入购物车 {{ props.dataList.isInShoppingCart ? '已' : '' }}加入购物车
</a-button> </a-button>
<a-button type="primary" @click="goTOCollection()"> <a-button type="primary" @click="goTOCollection()">
{{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏 {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

4
front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
View File

@ -63,8 +63,8 @@
).length === 0 ).length === 0
" "
> >
<template #icon><shopping-cart-outlined /></template> <!-- <template #icon><shopping-cart-outlined /></template> -->
加入申购车 {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车
</a-button> </a-button>
<a-button type="primary" @click="goTOCollection()"> <a-button type="primary" @click="goTOCollection()">
{{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏 {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏