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

Compare commits

merge into: wuhongjian:hi-ucs-pre
Branches Tags
wuhongjian:master
wuhongjian:hi-ucs-dev
wuhongjian:release
wuhongjian:hi-ucs-pre
wuhongjian:hi-ucs-dev-xha
wuhongjian:hi-ucs-bt
wuhongjian:hi-ucs-xha
wuhongjian:v0.8.2.2.release.sj
wuhongjian:v0.8.2.1.release
wuhongjian:v0.8.2.2.release
wuhongjian:v0.8.1.6.release
wuhongjian:v0.8.1.5.release
wuhongjian:v0.8.1.4.release
wuhongjian:v0.8.1.3.release
wuhongjian:v0.8.1.2.release
wuhongjian:v0.8.1.1.release
wuhongjian:v0.8.1.dev
wuhongjian:v0.8.1.release
wuhongjian:v0.8.0
...
pull from: wuhongjian:master
Branches Tags
wuhongjian:hi-ucs-dev
wuhongjian:release
wuhongjian:master
wuhongjian:hi-ucs-pre
wuhongjian:hi-ucs-dev-xha
wuhongjian:hi-ucs-bt
wuhongjian:hi-ucs-xha
wuhongjian:v0.8.2.2.release.sj
wuhongjian:v0.8.2.1.release
wuhongjian:v0.8.2.2.release
wuhongjian:v0.8.1.6.release
wuhongjian:v0.8.1.5.release
wuhongjian:v0.8.1.4.release
wuhongjian:v0.8.1.3.release
wuhongjian:v0.8.1.2.release
wuhongjian:v0.8.1.1.release
wuhongjian:v0.8.1.dev
wuhongjian:v0.8.1.release
wuhongjian:v0.8.0

28 Commits
hi-ucs-pre ... master

Author SHA1 Message Date
wuhongjian 4a6416de51 二级路由登录 2022-11-22 10:45:32 +08:00
wuhongjian 8e53d92898 展厅问题修改 2022-11-21 20:38:14 +08:00
gongjiale 82a188251a 新增说明文档和下载图标 2022-09-27 09:20:48 +08:00
gongjiale 1f44d96460 部分问题修改 2022-09-27 09:20:09 +08:00
unknown 43b36362c0 按钮显示修改 2022-09-26 09:26:47 +08:00
unknown 7438e98f19 能力统计明细 2022-09-24 13:20:18 +08:00
unknown 479b96ee06 添加政务云资源申请 2022-09-24 12:24:10 +08:00
wuhongjian ff971b798b 合并版本v0.8.7.2 2022-08-29 18:02:43 +08:00
wuhongjian 754b6ebdec gitignore 2022-08-29 18:01:27 +08:00
wuhongjian 0c78639afa 配置文件更新 2022-08-29 09:58:43 +08:00
wuhongjian 48097bdd54 合并版本v0.8.7.2 2022-08-29 09:58:12 +08:00
wuhongjian cd832f3f90 合并版本v0.8.7.2 2022-08-24 09:20:04 +08:00
wuhongjian 931e3a0e0a 合并版本v0.8.7.1 2022-08-23 16:38:48 +08:00
wuhongjian 31e81a258c 配置文件更新 2022-08-16 16:28:26 +08:00
wuhongjian 307bd6c020 合并版本v0.8.6.1 2022-08-16 09:57:36 +08:00
wuhongjian 8a58e70fc6 合并版本v0.8.4.3 2022-08-08 09:19:39 +08:00
wuhongjian 9601541628 合并版本v0.8.4.1 2022-08-02 16:06:08 +08:00
wuhongjian 0a16dd5e84 合并版本v0.8.4.1 2022-08-02 10:19:04 +08:00
wuhongjian ff44fd4691 测试环境配置更新 2022-08-02 10:18:01 +08:00
wuhongjian dbb6d55bce 合并版本v0.8.3.2 2022-07-29 09:12:15 +08:00
wuhongjian c9a5bf9f69 合并版本v0.8.3.2 2022-07-28 16:58:01 +08:00
wuhongjian bab0689c4c 合并版本v0.8.3.1 2022-07-26 18:56:46 +08:00
wuhongjian 13622255f8 合并版本v0.8.3.1 2022-07-26 18:08:52 +08:00
wuhongjian e8dc08504c 合并版本v0.8.3.1 2022-07-26 16:34:23 +08:00
a0049873 ba195e1758 配置修改 2022-07-22 18:45:32 +08:00
wuhongjian a53121649a 合并版本 2022-07-04 11:50:01 +08:00
wuhongjian 676a738518 上传配置文件修改 2022-06-16 17:04:52 +08:00
wuhongjian 36b8fec5a0 上传配置文件修改 2022-06-16 17:04:20 +08:00
22 changed files with 569 additions and 294 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
back/dist-西海岸-后台管理.zip back/*.zip
back/public/index.html back/public/index.html
back/dist-西海岸-后台管理-带配置文件.zip back/dist-西海岸-后台管理-带配置文件.zip
back/dist-市局-后台管理-带配置文件.zip back/dist-市局-后台管理-带配置文件.zip

6
back/public/config/basicConfig.js
View File

@ -2,14 +2,14 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49 * @Date: 2022-08-25 14:37:49
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-27 14:25:39 * @LastEditTime: 2022-08-29 09:57:52
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
version: 'qingdao', // 青岛 // version: 'qingdao', // 青岛
// version: 'xihaian', // 西海岸 // version: 'xihaian', // 西海岸
// version: 'test', // 测试 version: 'test', // 测试
// version: 'frp', // 内网穿透 // version: 'frp', // 内网穿透
// version: 'dev', // 开发 // version: 'dev', // 开发
vNum: 'v0.8.7.2', vNum: 'v0.8.7.2',

2
back/public/index.html
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-11 10:11:40 * @Date: 2022-04-11 10:11:40
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-25 14:51:36 * @LastEditTime: 2022-08-29 09:54:59
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>

420
back/src/views/modules/abilityStatistics/index.vue
View File

@ -22,90 +22,179 @@
</span> </span>
</el-tree> </el-tree>
</div> --> </div> -->
<el-form :inline="true">
<!--起始日期 @keyup.enter.native="getDataList()"-->
<el-form-item>
<el-date-picker
v-model="value1"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format='yyyy-MM-dd HH:mm:ss'
value-format='yyyy-MM-dd HH:mm:ss'
>
</el-date-picker>
</el-form-item>
<!--审核状态-->
<el-form-item>
<el-select
v-model="examineStatus"
placeholder="请选审核状态"
clearable
>
<el-option
label="审核完成"
value="1"
></el-option>
<el-option
label="审核中"
value="0"
></el-option>
</el-select>
</el-form-item>
<!--部门-->
<el-form-item>
<el-select
v-model="abilityDepartment"
placeholder="请选择部门"
clearable
>
<el-option label="全部" value=""></el-option>
<el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
</el-select>
</el-form-item>
<!--类型-->
<el-form-item>
<el-select
v-model="abilityType"
placeholder="请选择类型"
clearable
>
<el-option label="全部" value=""></el-option>
<el-option v-for="item in typeOptions" :key="item.value" :label="item.name" v-bind="item"></el-option>
</el-select>
</el-form-item>
<!--操作按钮查询-->
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<!--操作按钮重置-->
<el-form-item>
<el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
</el-form-item>
</el-form>
<el-card shadow="never" class="aui-card--fill" v-if='homeIsShow'> <el-card shadow="never" class="aui-card--fill" v-if='homeIsShow'>
<div class="mod-demand__bsdemand"> <div class="mod-demand__bsdemand">
<div class='top-box'> <!-- <div class='top-box'>
<span class='title'>能力统计</span> <span class='title'>能力统计</span>
<div class='title-list-style'> <div class='title-list-style'>
<div v-for="(item,index) in titleList" :key='index' class='title-single' :class="{'choseStyle':choseId=== index}" @click="choseBtn(index)"> <div v-for="(item,index) in titleList" :key='index' class='title-single' :class="{'choseStyle':choseId=== index}" @click="choseBtn(index)">
<span class='box-style'>{{item.name}}</span> <span class='box-style'>{{item.name}}</span>
</div> </div>
</div> </div>
</div> </div> -->
<div class='second-title'> <div class='second-title'>
<span style='margin-right:30px' :class="[departmentId===1?'departmentStyle':'']" @click="handleChose(1)"> <span style='margin-right:30px' :class="[departmentId===1?'departmentStyle':'']" @click="handleChose(1)">
部门发布情况 能力上架统计
</span> </span>
<span v-if='this.choseId===0' :class="[departmentId===2?'departmentStyle':'']" @click="handleChose(2)"> <span :class="[departmentId===2?'departmentStyle':'']" @click="handleChose(2)">
部门使用情况 能力使用统计
</span>
<!-- <span v-if='this.choseId===0' :class="[departmentId===3?'departmentStyle':'']" @click="handleChose(3)">
能力上架明细
</span>
<span v-if='this.choseId===0' :class="[departmentId===4?'departmentStyle':'']" @click="handleChose(4)">
能力使用明细
</span> -->
<span v-if="detailFlag" class="detail-button" @click="goToDetail()">
明细
</span>
<span v-else class="detail-button" @click="goToBack()">
返回
</span> </span>
</div> </div>
<div class='line-style'></div> <div class='line-style'></div>
<!--统计表-->
<el-table <el-table
:data="tableData" :data="tableData"
:header-cell-style="{textAlign:'center'}"
:cell-style="{textAlign:'center'}"
border border
style="width: 100%"> style="width: 100%" v-if='this.departmentId===1 ||this.departmentId===2'>
<el-table-column <el-table-column
prop="deptName" prop="name"
label="部门名称" label="部门名称"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column v-if='this.departmentId===1' <el-table-column label="组件">
prop="resourceNum" <el-table-column
label="发布总数" prop="znsf"
min-width="100%"> label="智能算法"
</el-table-column>
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceCarNum"
label="被申请总数"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.departmentId===1"
prop="resourceBrowseNum"
label="浏览总量"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.departmentId===1"
prop="resourceCollectionNum"
label="收藏量"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceVisits"
label="被调用总数"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceRelNum"
label="被应用总数"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceShareNum"
label="需申请数量"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceShareNonNum"
label="免批数量"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.departmentId===2"
prop="resourceUseNum"
label="使用总数"
min-width="100%">
</el-table-column>
<el-table-column v-if="this.departmentId===2"
prop="resourceCallNum"
label="申请总数"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" prop="tcfw"
min-width="92%"> label="图层服务"
<template slot-scope="scope"> min-width="100%">
<el-button @click="handleClick(scope.row)" type="text" size="small">查看详情</el-button> </el-table-column>
</template> <el-table-column
prop="kfzj"
label="通用开发组件"
min-width="100%">
</el-table-column>
<el-table-column
prop="ywzj"
label="业务能力组件"
min-width="100%">
</el-table-column>
</el-table-column>
<el-table-column
prop="yyzy"
label="应用资源"
min-width="100%">
</el-table-column>
<el-table-column
prop="zj"
label="总计"
min-width="100%">
</el-table-column>
</el-table>
<!--明细表-->
<el-table
:data="tableData"
:header-cell-style="{textAlign:'center'}"
:cell-style="{textAlign:'center'}"
border
style="width: 100%" v-if='this.departmentId===3 ||this.departmentId===4'>
<el-table-column
prop="deptName"
label="部门"
min-width="100%">
</el-table-column>
<el-table-column
prop="resourceName"
label="资源名称"
min-width="100%">
</el-table-column>
<el-table-column
prop="type"
label="类型"
min-width="100%">
</el-table-column>
<el-table-column
prop="createDate"
label="日期"
min-width="100%">
</el-table-column>
<el-table-column
prop="approveStatus"
label="状态"
min-width="100%">
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
@ -130,6 +219,7 @@
import componentServices from './componentServices.vue' import componentServices from './componentServices.vue'
import applicationResources from './applicationResources.vue' import applicationResources from './applicationResources.vue'
import ComponentUsed from './componentUsed.vue' import ComponentUsed from './componentUsed.vue'
import { mapState } from 'vuex'
export default { export default {
components: { componentServices, applicationResources, ComponentUsed }, components: { componentServices, applicationResources, ComponentUsed },
data () { data () {
@ -187,14 +277,41 @@ export default {
titleList: [ titleList: [
{ name: '组件服务', key: 1 }, { name: '应用资源', key: 2 }, { name: '基础设施', key: 3 }, { name: '数据资源', key: 3 }, { name: '知识库', key: 3 } { name: '组件服务', key: 1 }, { name: '应用资源', key: 2 }, { name: '基础设施', key: 3 }, { name: '数据资源', key: 3 }, { name: '知识库', key: 3 }
], ],
tableData: [{ deptName: '部门', resourceNum: 222 }] tableData: [{ deptName: '部门', resourceNum: 222 }],
examineStatus: '0',//审核状态
value1:[],//起始时间
abilityDepartment:"",//部门
abilityType:"",//能力
beginTime: '',//开始时间
endTime: '',//结束时间
typeOptions:[
{ name: '智能算法', value: 1 },
{ name: '图层服务', value: 2 },
{ name: '通用开发组件', value: 3 },
{ name: '页面开发组件', value: 4 },
{ name: '应用资源', value: 5 }],//类型备选列表
detailFlag:true,//明细返回按钮显示标志位
} }
}, },
created () { created () {
//当前设定的日期时间
let d = new Date
let year1,month1,day1;
[year1,month1,day1] = [d.getFullYear(),d.getMonth(),d.getDate()]
let date1 = new Date(year1, month1, day1,7)
this.value1.push(date1)
//前一天设定的日期时间
let year2,month2,day2
d.setTime(d.getTime()-24*60*60*1000);
[year2,month2,day2] = [d.getFullYear(),d.getMonth(),d.getDate()]
let date2 = new Date(year2,month2,day2,7)
this.value1.unshift(date2)
}, },
mounted () { mounted () {
this.getFirstTree() this.getFirstTree()
},
computed: {
...mapState(['departmentSelects'])
}, },
methods: { methods: {
// 搜索框 // 搜索框
@ -241,44 +358,139 @@ export default {
// }) // })
// }, // },
// 组件服务部门发布情况 // 组件服务部门发布情况--改为能力上架统计
getFirstTree (page) { getFirstTree (page) {
this.$http.get('/census/center/v3/resourceReleaseDetails/', { this.$http.get('/census/center/selectDeptDetailTypeCountList/', {
params: { params: {
page: page || 1, page: page || 1,
limit: 5, limit: 5,
// id:'1067246875800000066', approveStatus: '',
resourceType: '组件服务' deptId: '',
params: '',
startDate: ''
} }
}).then(res => { }).then(res => {
this.tableData = res.data.data.list let result= res.data.data
for(let i=0;i<result.length;i++){
if(!result[i].hasOwnProperty('yyzy') ){
result[i].yyzy= 0
}
if(!result[i].hasOwnProperty('kfzj') ){
result[i].kfzj= 0
}
if(!result[i].hasOwnProperty('znsf') ){
result[i].znsf= 0
}
if(!result[i].hasOwnProperty('tcfw') ){
result[i].tcfw= 0
}
if(!result[i].hasOwnProperty('ywzj') ){
result[i].ywzj= 0
}
result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
}
this.tableData = res.data.data
this.total = res.data.data.total this.total = res.data.data.total
}) })
}, },
// 组件服务部门使用情况列表 // 组件服务部门使用情况列表-改为能力使用统计
getSecondTree () { getSecondTree () {
this.$http.get('/census/center/v3/resourceUsedDetails/', { this.$http.get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: { params: {
// page: page || 1,
limit: 5, limit: 5,
page: 1, approveStatus: '',
// id:'1067246875800000064', deptId: '',
resourceType: '组件服务' params: '',
startDate: ''
} }
}).then(res => { }).then(res => {
this.tableData = res.data.data.list let result= res.data.data
for(let i=0;i<result.length;i++){
if(!result[i].hasOwnProperty('yyzy') ){
result[i].yyzy= 0
}
if(!result[i].hasOwnProperty('kfzj') ){
result[i].kfzj= 0
}
if(!result[i].hasOwnProperty('znsf') ){
result[i].znsf= 0
}
if(!result[i].hasOwnProperty('tcfw') ){
result[i].tcfw= 0
}
if(!result[i].hasOwnProperty('ywzj') ){
result[i].ywzj= 0
}
result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
}
this.tableData = res.data.data
this.total = res.data.data.total
}) })
}, },
// 应用资源部门发布情况列表 // 能力上架明细
getReleaseTree (page) { getOneDetail (page) {
this.$http.get('/census/center/v3/resourceReleaseDetails/', { this.$http.get('/census/center/selectCensusResourceTable/', {
params: { params: {
limit: 5, limit: 5,
page: page || 1, // page: page || 1,
// id:'1067246875800000066', approveStatus: '',
resourceType: '应用资源' deptId: '',
params: '',
startDate: ''
} }
}).then(res => { }).then(res => {
this.tableData = res.data.data.list this.tableData = res.data.data
this.total = res.data.data.total
})
},
// 能力使用明细
getTwoDetail (page) {
this.$http.get('/census/center/selectCensusApplyTable/', {
params: {
limit: 5,
// page: page || 1,
approveStatus: '',
deptId: '',
params: '',
startDate: ''
}
}).then(res => {
this.tableData = res.data.data
this.total = res.data.data.total
})
},
getReleaseTree (page) {
this.$http.get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: {
limit: 5,
// page: page || 1,
approveStatus: '',
deptId: '',
params: '',
startDate: ''
}
}).then(res => {
let result= res.data.data
for(let i=0;i<result.length;i++){
if(!result[i].hasOwnProperty('yyzy') ){
result[i].yyzy= 0
}
if(!result[i].hasOwnProperty('kfzj') ){
result[i].kfzj= 0
}
if(!result[i].hasOwnProperty('znsf') ){
result[i].znsf= 0
}
if(!result[i].hasOwnProperty('tcfw') ){
result[i].tcfw= 0
}
if(!result[i].hasOwnProperty('ywzj') ){
result[i].ywzj= 0
}
result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
}
this.tableData = res.data.data
this.total = res.data.data.total this.total = res.data.data.total
}) })
}, },
@ -338,13 +550,26 @@ export default {
if (this.choseId === 0) { if (this.choseId === 0) {
this.getFirstTree() this.getFirstTree()
} else if (this.choseId === 1) { } else if (this.choseId === 1) {
this.getReleaseTree() //this.getReleaseTree()
} }
} else if (index === 2) { } else if (index === 2) {
if (this.choseId === 0) { if (this.choseId === 0) {
this.getSecondTree() this.getSecondTree()
} else { } else {
this.getUsedTree() //this.getUsedTree()
}
}
else if (index === 3) {
if (this.choseId === 0) {
this.getOneDetail()
} else {
//this.getUsedTree()
}
} else if (index === 4) {
if (this.choseId === 0) {
this.getTwoDetail()
} else {
// this.getUsedTree()
} }
} }
}, },
@ -366,6 +591,24 @@ export default {
this.homeIsShow = true this.homeIsShow = true
this.resourcesIsShow = false this.resourcesIsShow = false
this.handleCurrentChange(1) this.handleCurrentChange(1)
},
//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
goToDetail(){
this.detailFlag = !this.detailFlag;
if(this.departmentId===1){
this.handleChose(3);
//this.departmentId = 1;
}else if(this.departmentId===2){
this.handleChose(4);
//this.departmentId = 2;
}else{
}
},
//返回按钮
goToBack(){
//departmentId 1，3 2，4 两个值共同判断
this.detailFlag = !this.detailFlag;
} }
} }
@ -374,6 +617,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
display: flex; display: flex;
flex-direction: column;
} }
.container-left { .container-left {
width: 250px; width: 250px;
@ -464,6 +708,18 @@ input::placeholder {
font-size: 14px; font-size: 14px;
color: #979eb9; color: #979eb9;
cursor: pointer; cursor: pointer;
.detail-button{
width: 60px;
height: 30px;
right: 60px;
background-color: #0058e1;
position: absolute;
text-align: center;
line-height: 30px;
margin-top: -20px;
border-radius: 2px;
color: #fff;
}
} }
.line-style { .line-style {
width: 100%; width: 100%;

4
front/public/index.html
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-25 11:18:05 * @LastEditTime: 2022-11-21 20:17:38
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -85,7 +85,7 @@
properly without JavaScript enabled. Please enable it to continue. properly without JavaScript enabled. Please enable it to continue.
</strong> </strong>
</noscript> </noscript>
<div id="app"> <div id="app" style="background: #010519">
<div class="first-loading-wrp"> <div class="first-loading-wrp">
<div class="loading-wrp"> <div class="loading-wrp">
<span class="dot dot-spin"> <span class="dot dot-spin">

8
front/public/static/config/basicConfig.js
View File

@ -2,15 +2,15 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-27 14:25:54 * @LastEditTime: 2022-11-21 19:37:54
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
version: 'qingdao', //青岛 //version: 'qingdao', //青岛
//version: 'xihaian', // 西海岸 //version: 'xihaian', // 西海岸
//version: 'dev', // 开发 //version: 'dev', // 开发
//version: 'test', // 测试 version: 'test', // 测试
//version: 'frp', // 内网穿透 //version: 'frp', // 内网穿透
vNum: 'v0.8.7.2', vNum: 'v0.8.7.2',
configData: { configData: {
@ -72,7 +72,7 @@ var CONFIGITEM = {
}, },
backUrl: 'http://192.168.124.243:9797', backUrl: 'http://192.168.124.243:9797',
previewUrl: 'http://192.168.124.243:9796/', previewUrl: 'http://192.168.124.243:9796/',
websocketURL: '192.168.124.243:8888/renren-admin', websocketURL: '221.0.232.149:7082/renren-admin',
POI_URL: POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
}, },

4
front/public/static/config/location.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-25 18:47:08 * @LastEditTime: 2022-08-29 09:55:56
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
@ -34,7 +34,7 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
{ name: '能力云图', key: 'capabilityCloud' }, { name: '能力云图', key: 'capabilityCloud' },
{ name: '能力统计', key: 'abilityStatistics' }, { name: '能力统计', key: 'abilityStatistics' },
// { name: '开发指南', key: 'developmentGuide' }, // { name: '开发指南', key: 'developmentGuide' },
{ name: '技术文档', key: 'instructionManual' }, { name: '新手指南', key: 'instructionManual' },
{ name: '需求中心', key: 'demandCenter' }, { name: '需求中心', key: 'demandCenter' },
// { name: '个人中心', key: 'personalCenter' }, // { name: '个人中心', key: 'personalCenter' },
{ name: '区市站点', key: 'mapTest' }, { name: '区市站点', key: 'mapTest' },

BIN
front/public/static/doc/userbook.docx Normal file
View File

Binary file not shown.

BIN
front/src/assets/developmentGuide/download.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 293 B

2
front/src/router/index.js
View File

@ -495,7 +495,7 @@ export const constantRoutes = [
name: 'instructionManual', name: 'instructionManual',
component: () => import('@/views/instructionManual/index'), component: () => import('@/views/instructionManual/index'),
meta: { meta: {
title: '技术文档', title: '新手指南',
icon: 'error-warning-line', icon: 'error-warning-line',
}, },
}, },

10
front/src/utils/request.js
View File

@ -146,7 +146,7 @@ instance.interceptors.response.use(
// } // }
}, },
(error) => { (error) => {
// debugger debugger
console.log('接口error', error) console.log('接口error', error)
if (loadingInstance) loadingInstance.close() if (loadingInstance) loadingInstance.close()
@ -159,6 +159,14 @@ instance.interceptors.response.use(
setAccessToken(response.headers.token) setAccessToken(response.headers.token)
} }
if (response.headers.redirect) { if (response.headers.redirect) {
if (response.headers.redirect === '/#/login') {
setAccessToken('')
window.location.replace('/ucs/#/login')
setTimeout(() => {
location.reload()
}, 1000)
return Promise.resolve()
}
window.location.replace(response.headers.redirect) window.location.replace(response.headers.redirect)
return Promise.resolve() return Promise.resolve()
} }

3
front/src/views/components/upload/index.vue
View File

@ -8,7 +8,7 @@
<template> <template>
<a-upload <a-upload
v-model:file-list="fileList" v-model:file-list="fileList"
:action="`${apiURL}/upload`" :action="`${window.SITE_CONFIG.apiURL}/upload`"
list-type="picture" list-type="picture"
class="upload-list-inline" class="upload-list-inline"
:maxCount="props.maxCount" :maxCount="props.maxCount"
@ -38,6 +38,7 @@
// import { baseURL } from '@/config' // import { baseURL } from '@/config'
import { message, Upload } from 'ant-design-vue' import { message, Upload } from 'ant-design-vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const props = defineProps({ const props = defineProps({
btnName: { type: String, default: '' }, btnName: { type: String, default: '' },
type: { type: String, default: '' }, type: { type: String, default: '' },

19
front/src/views/home/DetailsPageconetent.vue
View File

@ -1337,20 +1337,6 @@
pageSize: paramsGetResources.pageSize, //分页大小 pageSize: paramsGetResources.pageSize, //分页大小
} }
getDataResource(dataResourceParams).then((res) => { getDataResource(dataResourceParams).then((res) => {
if (whoShow1.value.itShowQingDao) {
res.data.data.data.forEach((val) => {
val.id = val.guid // id
val.name = val.zyname // 名字
val.sjlCount = val.sjcczl // 数据量
val.applyCount = val.syqk // 申请量
val.deptName = val.TGBM // 部门
val.createDate = val.fbrq // 发布时间
val.description = val.xgxt // 描述
})
resourceList.data = res.data.data.data || []
resourceTotal.value = res.data.data.rows || ''
loading.value = false
} else if (whoShow1.value.itShowXiHaiAn) {
res.data.data.list.forEach((val) => { res.data.data.list.forEach((val) => {
val.id = val.serviceId // id val.id = val.serviceId // id
val.name = val.serviceName // 名字 val.name = val.serviceName // 名字
@ -1363,7 +1349,6 @@
resourceList.data = res.data.data.list || [] resourceList.data = res.data.data.list || []
resourceTotal.value = res.data.data.total || '' resourceTotal.value = res.data.data.total || ''
loading.value = false loading.value = false
}
}) })
} else if ( } else if (
paramsGetResources.type !== '数据资源' && paramsGetResources.type !== '数据资源' &&
@ -2095,7 +2080,7 @@
.talk-monitor { .talk-monitor {
position: fixed; position: fixed;
bottom: 0.5rem; bottom: 0.5rem;
right: 0.1rem; right: calc(100% - 19rem);
z-index: 9999; z-index: 9999;
cursor: pointer; cursor: pointer;
@ -2120,7 +2105,7 @@
position: fixed; position: fixed;
z-index: 10; z-index: 10;
bottom: 1.56rem; bottom: 1.56rem;
right: 0.1rem; right: calc(100% - 19rem);
cursor: pointer; cursor: pointer;
background: #e3edfc; background: #e3edfc;
p { p {

4
front/src/views/home/apply.vue
View File

@ -147,7 +147,7 @@
<a-upload <a-upload
v-model:file-list="fileList" v-model:file-list="fileList"
name="file" name="file"
:action="`${baseURL}/upload`" :action="`${window.SITE_CONFIG.apiURL}/upload`"
:headers="headers" :headers="headers"
@change="handleChange" @change="handleChange"
:before-upload="beforeUpload" :before-upload="beforeUpload"
@ -882,7 +882,7 @@
handleChange, handleChange,
applySuccess, applySuccess,
disabled, disabled,
baseURL, // baseURL,
beforeUpload, beforeUpload,
dataList, dataList,
systemHandleChange, systemHandleChange,

2
front/src/views/home/components/header.vue
View File

@ -222,7 +222,7 @@
// path: '/developmentGuide', // path: '/developmentGuide',
// }) // })
// break // break
case '技术文档': case '新手指南':
router.push({ router.push({
path: '/instructionManual', path: '/instructionManual',
}) })

11
front/src/views/home/components/searchResultList.vue
View File

@ -532,11 +532,11 @@
name: '发布时间', name: '发布时间',
orderType: 'DESC', orderType: 'DESC',
}, },
{ // {
value: 'update_date', // value: 'update_date',
name: '更新时间', // name: '更新时间',
orderType: 'DESC', // orderType: 'DESC',
}, // },
]) ])
// 购物车id列表 // 购物车id列表
const selList = ref([ const selList = ref([
@ -604,7 +604,6 @@
console.log('or use this.value', searchValue.value) console.log('or use this.value', searchValue.value)
} }
function toView(type, item) { function toView(type, item) {
debugger
if (props.selectCardsname == '数据资源') { if (props.selectCardsname == '数据资源') {
if (whoShow1.itShowQingDao) { if (whoShow1.itShowQingDao) {
window.open( window.open(

43
front/src/views/home/infrastructurePage.vue
View File

@ -451,18 +451,22 @@
type="primary" type="primary"
@click="batchPicturePreview" @click="batchPicturePreview"
class="buttonAdd" class="buttonAdd"
v-else v-if="!cloudResourcesFlag"
> >
批量预览 批量预览
</a-button> </a-button>
<!-- 添加至申购车 --> <!-- 添加至申购车 -->
<a-button type="primary" @click="addShoppingCart" class="buttonAdd"> <a-button type="primary" @click="addShoppingCart" class="buttonAdd" v-if="!cloudResourcesFlag">
添加至申购车 添加至申购车
</a-button> </a-button>
<!-- 一键申请 --> <!-- 一键申请 -->
<a-button type="primary" @click="apply" class="buttonAdd"> <a-button type="primary" @click="apply" class="buttonAdd" v-if="!cloudResourcesFlag">
一键申请 一键申请
</a-button> </a-button>
<!-- 申请政务云资源 -->
<a-button type="primary" @click="applyCloudResources" class="buttonAdd" v-if="cloudResourcesFlag">
我要申请政务云资源
</a-button>
</div> </div>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
@ -894,7 +898,7 @@
getCamera() getCamera()
} }
} else { } else {
tabClick(0, '视频资源') tabClick(0, '政务云资源')
getCamera() getCamera()
} }
@ -916,7 +920,7 @@
const tabList = ref([ const tabList = ref([
{ {
title: '设施类型', title: '设施类型',
content: ['视频资源', '云资源', '感知资源', '城市云脑会客厅'], content: ['政务云资源','视频资源', '感知资源', '城市云脑会客厅'],
}, },
{ {
title: '视频标签', title: '视频标签',
@ -991,7 +995,7 @@
// const dataTypeList = () => { // const dataTypeList = () => {
// if (tabList.value[0].content.indexOf('视频资源') != -1) { // if (tabList.value[0].content.indexOf('视频资源') != -1) {
// tabList.value[1].content = ['123344', '213124'] // tabList.value[1].content = ['123344', '213124']
// }else if(tabList.value[0].content.indexOf('云资源') != -1){ // }else if(tabList.value[0].content.indexOf('政务云资源') != -1){
// tabList.value[1].content = ['5555', '666'] // tabList.value[1].content = ['5555', '666']
// } // }
@ -1336,19 +1340,22 @@
selectedList.value = [] selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) { if (clickList.value[indexFather].content.indexOf(name) != -1) {
if (name == '视频资源') { if (name == '视频资源') {
cloudResourcesFlag.value = false;
room.value = true room.value = true
tableHeight.value = 330 tableHeight.value = 330
showMap.value = true showMap.value = true
tabList.value[1].title = '视频标签' tabList.value[1].title = '视频标签'
} else if (name == '云资源') { } else if (name == '政务云资源') {
cloudResourcesFlag.value = true;
room.value = true room.value = true
tableHeight.value = 600 tableHeight.value = 600
showMap.value = false showMap.value = false
dataSource.value = [] dataSource.value = []
dataSource2.value = [] dataSource2.value = []
pagination.value.total = 0 pagination.value.total = 0
tabList.value[1].title = '云资源分类' tabList.value[1].title = '政务云资源分类'
} else if (name == '感知资源') { } else if (name == '感知资源') {
cloudResourcesFlag.value = false;
room.value = true room.value = true
tableHeight.value = 330 tableHeight.value = 330
showMap.value = true showMap.value = true
@ -1356,6 +1363,7 @@
dataSource2.value = [] dataSource2.value = []
pagination.value.total = 0 pagination.value.total = 0
} else if (name == '城市云脑会客厅') { } else if (name == '城市云脑会客厅') {
cloudResourcesFlag.value = false;
// room.value = false // room.value = false
// wrjFlag.value = true // wrjFlag.value = true
// showMap.value = false // showMap.value = false
@ -1372,6 +1380,7 @@
} else { } else {
if (name == '视频资源') { if (name == '视频资源') {
wrjFlag.value = false wrjFlag.value = false
cloudResourcesFlag.value = false;
tableHeight.value = 330 tableHeight.value = 330
showMap.value = true showMap.value = true
tabList.value[1].content = [] tabList.value[1].content = []
@ -1398,14 +1407,15 @@
mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
emits('add', 1) emits('add', 1)
getCamera() getCamera()
} else if (name == '云资源') { } else if (name == '政务云资源') {
cloudResourcesFlag.value = true;
tableHeight.value = 600 tableHeight.value = 600
showMap.value = false showMap.value = false
dataSource.value = [] dataSource.value = []
dataSource2.value = [] dataSource2.value = []
pagination.value.total = 0 pagination.value.total = 0
clickList.value[1].content = [] clickList.value[1].content = []
tabList.value[1].title = '云资源分类' tabList.value[1].title = '政务云资源分类'
clickList.value[indexFather].content[0] = name clickList.value[indexFather].content[0] = name
tabList.value[1].content = [ tabList.value[1].content = [
'云主机', '云主机',
@ -1421,6 +1431,7 @@
wrjFlag.value = false wrjFlag.value = false
emits('add', 2) emits('add', 2)
} else if (name == '感知资源') { } else if (name == '感知资源') {
cloudResourcesFlag.value = false;
tableHeight.value = 330 tableHeight.value = 330
showMap.value = true showMap.value = true
clickList.value[1].content = [] clickList.value[1].content = []
@ -1434,6 +1445,7 @@
wrjFlag.value = false wrjFlag.value = false
emits('add', 3) emits('add', 3)
} else if (name == '无人机') { } else if (name == '无人机') {
cloudResourcesFlag.value = false;
room.value = true room.value = true
tableHeight.value = 600 tableHeight.value = 600
showMap.value = false showMap.value = false
@ -1454,6 +1466,7 @@
}) })
wrjFlag.value = true wrjFlag.value = true
} else if (name == '单兵设备') { } else if (name == '单兵设备') {
cloudResourcesFlag.value = false;
room.value = true room.value = true
tableHeight.value = 600 tableHeight.value = 600
showMap.value = false showMap.value = false
@ -1474,6 +1487,7 @@
}) })
wrjFlag.value = true wrjFlag.value = true
} else if (name == '城市云脑会客厅') { } else if (name == '城市云脑会客厅') {
cloudResourcesFlag.value = false;
showMap.value = false showMap.value = false
dataSource.value = [] dataSource.value = []
dataSource2.value = [] dataSource2.value = []
@ -1503,7 +1517,7 @@
console.log('选中的标签code', mapSearchParam.value) console.log('选中的标签code', mapSearchParam.value)
mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
// let fatherName = ref('视频资源') // let fatherName = ref('视频资源')
// if (name == '视频资源' || name == '云资源' || name == '感知资源') { // if (name == '视频资源' || name == '政务云资源' || name == '感知资源') {
// fatherName.value == name // fatherName.value == name
// } // }
// if (fatherName.value == '视频资源') { // if (fatherName.value == '视频资源') {
@ -1512,7 +1526,7 @@
// dataSource.value = [] // dataSource.value = []
// pagination.value.total = 0 // pagination.value.total = 0
// } // }
if (name == '云资源' || name == '感知资源') { if (name == '政务云资源' || name == '感知资源') {
dataSource.value = [] dataSource.value = []
dataSource2.value = [] dataSource2.value = []
pagination.value.total = 0 pagination.value.total = 0
@ -1679,6 +1693,7 @@
// console.log('添加至购物车') // console.log('添加至购物车')
// } // }
const wrjFlag = ref(false) const wrjFlag = ref(false)
const cloudResourcesFlag = ref(false)
const getCamera = (flag, str) => { const getCamera = (flag, str) => {
if (flag) { if (flag) {
mapSearchParam.value.cameraName = str mapSearchParam.value.cameraName = str
@ -1753,6 +1768,10 @@
message.error('请选择需要添加申购车的数据') message.error('请选择需要添加申购车的数据')
} }
} }
// 申请政务云资源
const applyCloudResources = () => {
window.open("http://15.72.183.88:8760/yzy/login")
}
// 表格 // 表格
const dataSource = ref([]) const dataSource = ref([])
const dataSource2 = ref([]) const dataSource2 = ref([])

6
front/src/views/home/integrationServices.vue
View File

@ -92,7 +92,7 @@
// 分页 // 分页
const loading = ref(true) const loading = ref(true)
const currentPage = ref(1) const currentPage = ref(1)
const currentPageSize = ref(5) const currentPageSize = ref(10)
const pageSizeOptions = ref(['5', '10', '20', '50']) const pageSizeOptions = ref(['5', '10', '20', '50'])
const router = useRouter() const router = useRouter()
const select = router.currentRoute.value.query.select const select = router.currentRoute.value.query.select
@ -146,10 +146,10 @@
searchValue.value = '' searchValue.value = ''
// 分页 // 分页
currentPage.value = 1 currentPage.value = 1
currentPageSize.value = 5 currentPageSize.value = 10
// 重置查询条件 // 重置查询条件
paramsGetResources.pageNum = 1 paramsGetResources.pageNum = 1
paramsGetResources.pageSize = 5 paramsGetResources.pageSize = 10
paramsGetResources.orderField = 'create_date' paramsGetResources.orderField = 'create_date'
paramsGetResources.orderType = 'DESC' paramsGetResources.orderType = 'DESC'
mybus.emit('chongzhi', { mybus.emit('chongzhi', {

14
front/src/views/instructionManual/index.vue
View File

@ -2,18 +2,19 @@
<home-header></home-header> <home-header></home-header>
<div class="menu-container"> <div class="menu-container">
<div id="container" class="content-menu"> <div id="container" class="content-menu">
<div class="left"> <!-- <div class="left">
<div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }" <div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
@click="changeName({ name: '技术文档' })"> @click="changeName({ name: '技术文档' })">
技术文档 技术文档
</div> </div>
<abilityDocTree style="max-height:320px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick" <abilityDocTree style="max-height:320px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick"
:clickData="clickData"></abilityDocTree> :clickData="clickData"></abilityDocTree>
</div> </div> -->
<div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }" <div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
@click="changeName({ name: '使用手册' })"> @click="changeName({ name: '使用手册' })">
<div class="guide-text">使用手册</div> <div class="guide-text">使用手册</div>
<img src="@/assets/developmentGuide/download.png" @click="downloadDoc('/static/doc/userbook.docx', '通用能力服务平台USC用户手册')" alt="" />
</div> </div>
<!-- 技术文档 --> <!-- 技术文档 -->
@ -133,7 +134,12 @@ const getFirstData = (firstObj = {}) => {
clickData.value = firstObj clickData.value = firstObj
} }
} }
const downloadDoc = (path, name) => {
const a = document.createElement('a')
a.href = path
a.download =name
a.click()
}
onMounted(() => { onMounted(() => {
getTreeData() getTreeData()
}) })
@ -192,7 +198,7 @@ onMounted(() => {
top: 300px; top: 300px;
right: 205px; right: 205px;
width: 74px; width: 74px;
height: 136px; height: 150px;
background: url('~@/assets/menu/new-bg.png') no-repeat; background: url('~@/assets/menu/new-bg.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;

9
front/src/views/mynoticeView/components/NoticeList.vue
View File

@ -226,8 +226,13 @@
// }) // })
if (item) { if (item) {
mynoticeRead(item.id).then((res) => { mynoticeRead(item.id).then((res) => {
if (res.data.code == 0) { if (res.data.code == 0 ) {
message.success('操作成功！') message.success('通知已读！')
// if(item.readStatus == 1){
// message.success('通知已读！')
// } if(item.readStatus == 0){
// message.success('通知已设为已读！')
// }
mybus.emit('getMynotice') mybus.emit('getMynotice')
init() init()
} else { } else {

22
front/src/views/newHome/components/CapabilityConvergence.vue
View File

@ -127,23 +127,6 @@
pageSize: paramsGetResources.pageSize, //分页大小 pageSize: paramsGetResources.pageSize, //分页大小
}).then((res) => { }).then((res) => {
console.log('数据资源==================>', res.data.data) console.log('数据资源==================>', res.data.data)
if (whoShow1.value.itShowQingDao) {
res.data.data.data.forEach((val) => {
val.id = val.guid // id
val.name = val.zyname // 名字
val.sjlCount = val.sjcczl // 数据量
val.applyCount = val.syqk // 申请量
val.deptName = val.TGBM // 部门
val.createDate = val.fbrq // 发布时间
val.description = val.xgxt // 描述
})
obj.value = res.data.data.data || []
object.sjNum = res.data.data.rows
// interfaceSuccess.value++
// if (interfaceSuccess.value == 5) {
// mybus.emit('chagneNum', object)
// }
} else if (whoShow1.value.itShowXiHaiAn) {
res.data.data.list.forEach((val) => { res.data.data.list.forEach((val) => {
val.id = val.serviceId // id val.id = val.serviceId // id
val.name = val.serviceName // 名字 val.name = val.serviceName // 名字
@ -159,7 +142,6 @@
// if (interfaceSuccess.value == 5) { // if (interfaceSuccess.value == 5) {
// mybus.emit('chagneNum', object) // mybus.emit('chagneNum', object)
// } // }
}
}) })
} else { } else {
let type = paramsGetResources.type let type = paramsGetResources.type
@ -292,7 +274,7 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.capability-convergence { .capability-convergence {
height: 7.2rem; height: 7.2rem;
background: url('~@/assets/newHome/Convergence-bg.png') no-repeat; background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
background-size: 100%; background-size: 100%;
@ -400,5 +382,5 @@
} }
} }
} }
} }
</style> </style>

22
front/src/views/newHome/components/WorkDynamics.vue
View File

@ -53,6 +53,10 @@
<span class="gengduo"></span> <span class="gengduo"></span>
</div> </div>
<div class="fixedmount"> <div class="fixedmount">
<div @click="applyResource()">
<p></p>
<p>资源申请</p>
</div>
<div @click="toView()"> <div @click="toView()">
<p></p> <p></p>
<p>需求申请</p> <p>需求申请</p>
@ -311,6 +315,15 @@
function handlecancelAbilitySquare() { function handlecancelAbilitySquare() {
abilitySquareFunctionData.value = '智能算法' abilitySquareFunctionData.value = '智能算法'
} }
const applyResource = () => {
console.log('点击===============》')
router.push({
path: '/DetailsPageconetent',
query: {
select: '基础设施',
},
})
}
</script> </script>
<style lang="less"> <style lang="less">
.shangjia-class { .shangjia-class {
@ -579,11 +592,11 @@
} }
.fixedmount { .fixedmount {
height: 1.5rem; height: 2.4rem;
display: flex; display: flex;
position: fixed; position: fixed;
bottom: 2.56rem; bottom: 1.56rem;
right: 1.9rem; right: calc(100% - 19rem);
z-index: 10; z-index: 10;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
@ -618,7 +631,8 @@
.fixedmount div:nth-child(1) p:nth-child(1) { .fixedmount div:nth-child(1) p:nth-child(1) {
height: 0.24rem; height: 0.24rem;
width: 0.24rem; width: 0.24rem;
background: url('~@/assets/home/shenqing.png') no-repeat; //background: url('~@/assets/home/shenqing.png') no-repeat;
background: url('~@/assets/newHome/banner-yy.png') no-repeat;
background-size: contain; background-size: contain;
background-position: center; background-position: center;
} }