Compare commits

..

28 Commits

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
94 changed files with 9044 additions and 10563 deletions

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

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',
@ -23,8 +23,7 @@ var CONFIGITEM = {
// 西海岸大数据局 // 西海岸大数据局
xihaian: { xihaian: {
previewUrl: 'http://10.134.135.9:9796/', previewUrl: 'http://10.134.135.9:9796/',
// apiURL: 'http://10.134.135.9:8888/renren-admin', apiURL: 'http://10.134.135.9:8888/renren-admin',
apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成
websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket' websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
}, },
// 测试 // 测试

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>

View File

@ -714,15 +714,4 @@ img {
.aui-navbar__header { .aui-navbar__header {
width: 268px; width: 268px;
}
// 统一更改弹框高度树形控件高度
.el-dialog__body {
max-height: 600px;
overflow-y: auto;
}
.el-tree {
max-height: 450px;
overflow-y: auto;
} }

View File

@ -1,13 +1,12 @@
/* /*
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-08-23 10:30:11 * @Date: 2022-08-23 10:30:11
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-09-01 16:06:05 * @LastEditTime: 2022-08-25 21:05:18
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
const returnLocationStr = () => { const returnLocationStr = () => {
// return 'qingdao' return 'qingdao1'
return 'xihaian'
} }
export default returnLocationStr export default returnLocationStr

View File

@ -293,7 +293,7 @@ export default {
}) })
this.allData = JSON.parse(JSON.stringify(this.transferData)) this.allData = JSON.parse(JSON.stringify(this.transferData))
}).catch(err => { }).catch(err => {
this.$message.error('未搜索到相关数据资源') this.$message.error(err)
}) })
} }
}, },
@ -316,7 +316,6 @@ export default {
title: this.type, title: this.type,
list: this.selectedArray list: this.selectedArray
}) })
console.log(this.selectedArray, this.displayList, 'this.displayList')
}, },
getDisplay (displayList) { getDisplay (displayList) {
this.displayList = [] this.displayList = []

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
<el-card shadow="never" class="roomBox"> <el-card shadow="never" class="roomBox">
<div class="roomExamineSearch"> <div class="roomExamineSearch">
<el-input <el-input
v-model="roomNameA" v-model="roomName"
style="width: 160px" style="width: 160px"
placeholder="请输入会议室名称" placeholder="请输入会议室名称"
></el-input> ></el-input>
@ -195,17 +195,6 @@
<el-input type="textarea" v-model="desc"></el-input> <el-input type="textarea" v-model="desc"></el-input>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="display: flex; margin-top: 20px">
<el-col :span="2">附件</el-col>
<el-col :span="16">
<el-button
v-if="file != ''"
size="mini"
@click="downloadTemplate(file)"
>下载</el-button
>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="No"> </el-button> <el-button @click="No"> </el-button>
<el-button type="primary" @click="ok"> </el-button> <el-button type="primary" @click="ok"> </el-button>
@ -243,9 +232,6 @@ export default {
id: '', id: '',
num: '', num: '',
file: '', file: '',
name: '',
creator: '',
roomNameA: '',
} }
}, },
mounted() { mounted() {
@ -255,9 +241,10 @@ export default {
getSerach() { getSerach() {
this.$http this.$http
.get( .get(
`/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomNameA}&state=${this.value}` `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomName}&state=${this.value}`
) )
.then(({ data: res }) => { .then(({ data: res }) => {
console.log(res, 7777777)
this.tableData = res.data.list this.tableData = res.data.list
this.total = res.data.total this.total = res.data.total
}) })
@ -281,15 +268,13 @@ export default {
if (num == '1') { if (num == '1') {
this.dialogVisibleChuli = true this.dialogVisibleChuli = true
this.id = item.id this.id = item.id
this.name = item.name
this.roomName = item.roomName
this.creator = item.creator
} else { } else {
this.dialogVisible = true this.dialogVisible = true
this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => {
console.log(55555555)
this.file = res.data.file
})
} }
this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => {
this.file = res.data.file
})
this.lookData = item this.lookData = item
}, },
@ -298,9 +283,6 @@ export default {
auditViem: this.desc, auditViem: this.desc,
state: this.radio, state: this.radio,
id: this.id, id: this.id,
name: this.name,
roomName: this.roomName,
creator: this.creator,
} }
this.$http.put('/bookMeeting', query).then(({ data: res }) => { this.$http.put('/bookMeeting', query).then(({ data: res }) => {
this.dialogVisibleChuli = false this.dialogVisibleChuli = false

View File

@ -1,171 +0,0 @@
<!--
* @Author: hisense.guoyue
* @LastEditors: hisense.guoyue
* @LastEditTime: 2022-09-27 14:23:29
* @Description: 设备审批
-->
<template>
<el-card shadow="never" class="aui-card--fill" style="position:relative">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.deviceName" :placeholder="$t('process.name')" clearable></el-input>
</el-form-item>
<el-select v-model="dataForm.state" placeholder="请选择" style="margin-right: 10px">
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{
$t('query')
}}</el-button>
</el-form-item>
</el-form>
<div class="mod-activiti__process">
<el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%">
<el-table-column prop="title" label="申请标题" header-align="center" align="center"></el-table-column>
<el-table-column prop="name" label="申请人信息" header-align="center" align="center"></el-table-column>
<el-table-column label="设备名称" header-align="center" align="center">
<template slot-scope="scope">
<span class="demand-text">{{
(scope.row && scope.row.tbDeviceDTO && scope.row.tbDeviceDTO.name)
}}</span>
</template>
</el-table-column>
<el-table-column prop="state" label="审批状态" header-align="center" align="center">
<template slot-scope="scope">
<span>{{wrjStateObj[scope.row.state]}}</span>
</template>
</el-table-column>
<el-table-column label="应用领域" header-align="center" align="center">
<template slot-scope="scope" v-if="scope.row.applicationArea">
<span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"
:key="i">{{x}}</span>
</template>
</el-table-column>
<el-table-column label="需求依据" header-align="center" align="center" width="200">
<template slot-scope="scope">
<el-tooltip placement="top-start">
<div class="tooltip-box" slot="content">{{(scope.row && scope.row.demand)}}</div>
<span class="demand-text">{{
(scope.row && scope.row.demand)
}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="showDetail(scope.row)">详情</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</div>
<el-dialog title="审批" :visible.sync="centerDialogVisible" width="30%" center>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="审批意见">
<el-input type="textarea" v-model="form.auditViem" placeholder="请输入审批意见"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="through(3)">不通过</el-button>
<el-button type="primary" @click="through(2)">通过</el-button>
</span>
</el-dialog>
</el-card>
</template>
<script>
import bus from '@/views/bus.js'
import mixinViewModule from '@/mixins/view-module'
import processModule from '@/mixins/process-module'
import { addDynamicRoute } from '@/router'
export default {
mixins: [mixinViewModule, processModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/deviceApply/myDonePage',
getDataListIsPage: true,
activatedIsNeed: true,
deleteIsBatch: true,
deleteIsBatchKey: 'deploymentId'
},
centerDialogVisible: false,
form: {
auditViem: ''
},
dataForm: {
state: '',
deviceName: null
},
wrjStateObj: {
0: '待审批',
1: '未申请',
2: '通过',
3: '未通过'
},
//
detailInfo: {},
//
deviceDetailInfo: {}
}
},
computed: {
stateOptions() {
let arr = []
Object.keys(this.wrjStateObj).map(v => {
arr.push({
label: this.wrjStateObj[v],
value: v,
})
})
return arr
},
},
methods: {
showDetail(row) {
this.forwardDetail(row)
},
//
forwardDetail(data) {
console.log('data------------>', data);
console.log('this.$route------------>', this.$route);
var routeParams = {
routeName: `${this.$route.name}__detail_${data.id}`,
menuId: `${this.$route.meta.menuId}`,
title: `${this.$route.meta.title} - 详情`,
path: 'hasToDoTasks/deviceApprovalDetail',
params: {
params: data,
id: data.id,
}
}
console.log('routeParams------------>', routeParams);
addDynamicRoute(routeParams, this.$router)
},
},
}
</script>
<style scoped>
.demand-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.area-text {
padding: 0 4px;
}
.tooltip-box {
width: 400px;
}
</style>

View File

@ -1,319 +0,0 @@
<!--
* @Author: hisense.guoyue
* @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.guoyue
* @LastEditTime: 2022-09-27 18:08:00
* @Description: 设备审批详情
-->
<!-- 设备审批详情 -->
<template>
<el-card shadow="never" class="aui-card--fill">
<!-- 申请人详情 -->
<div>
<h3>申请人信息</h3>
<div class="big-BOX">
<p>
<span class="text">申请人<span> {{ detailInfo.name || '--' }}</span></span>
<span class="text">电话<span>{{ detailInfo.phone || '--' }}</span></span>
<span class="text">部门<span>{{ detailInfo.dept || '--' }}</span></span>
</p>
<p>
<span class="text">
能力申请标题<span>
{{ detailInfo.title || '--' }}</span></span>
<span class="text" v-if="detailInfo.applicationSystem">应用系统<span>{{
detailInfo.applicationSystem || '--'
}}</span></span>
<span class="text"></span>
</p>
<p>
<span v-if="detailInfo.applicationArea">
应用领域
<span class="area-item" v-for="(area, i) in JSON.parse(detailInfo.applicationArea)" :key="i">{{ area || '--'
}}</span>
</span>
</p>
<p>
<span>
需求依据<span>
{{ detailInfo.demand || '--' }}</span></span>
</p>
</div>
</div>
<!-- 申请能力 -->
<div class="AbilityApply">
<h3>申请能力</h3>
</div>
<el-card shadow="never" class="aui-card--fill">
<h4>{{ $t('process.circulation') }}</h4>
<el-table :data="dataList" border style="width: 100%;">
<!-- 任务名称 -->
<el-table-column prop="activityName" :label="$t('process.taskName')" header-align="center" align="center">
</el-table-column>
<!-- 处理人 -->
<el-table-column prop="assigneeName" :label="$t('process.assignee')" header-align="center" align="center">
</el-table-column>
<!-- 流程开始时间 -->
<el-table-column prop="startTime" :label="$t('task.startTime')" header-align="center" align="center">
</el-table-column>
<!-- 流程结束时间 -->
<el-table-column prop="endTime" :label="$t('task.endTime')" header-align="center" align="center">
</el-table-column>
<!-- 审核意见 -->
<el-table-column prop="comment" :label="$t('process.comment')" header-align="center" align="center">
</el-table-column>
<!-- 任务时长 -->
<el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center"
align="center" width="180"></el-table-column>
</el-table>
</el-card>
</el-card>
</template>
<script>
import * as moment from 'moment';
export default {
data() {
return {
//
detailInfo: {},
dataList: [],
}
},
created() {
this.detailInfo = this.$route.params.params || {};
console.log('this.detailInfo------------>', this.detailInfo);
//
let durationInSeconds = ''
if (this.detailInfo.auditTime && this.detailInfo.auditTime) {
durationInSeconds = moment(this.detailInfo.auditTime).diff(moment(this.detailInfo.createDate), 'seconds')
}
let _obj = {
activityName: this.detailInfo.title || '',
assigneeName: this.detailInfo.auditorName || '',
startTime: this.detailInfo.createDate || '',
endTime: this.detailInfo.auditTime,
comment: this.detailInfo.auditViem,
durationInSeconds: durationInSeconds,
}
this.dataList.push(_obj)
}
}
</script>
<style scoped lang="scss">
::v-deep .big-BOX {
background: rgba(244, 245, 248, 0.8);
padding: 24px;
h3 {
font-size: 16px;
color: #212121;
}
p {
width: 100%;
display: flex;
justify-content: space-between;
color: #212121;
font-size: 14px;
span {
display: inline-block;
margin-left: 8px;
line-height: 32px;
span {
font-weight: bold;
}
}
.text {
width: 500px;
}
}
.lastP {
margin-top: 16px;
width: 100%;
span {
display: flex;
span {
padding: 0 12px;
height: 32px;
background: rgba(232, 234, 239, 1);
border-radius: 2px;
button {
background: unset;
border: 0;
color: #0558e1;
font-size: 14px;
}
}
}
}
}
::v-deep .AbilityApply {
margin-top: 32px;
h3 {
font-size: 16px;
color: #212121;
border-bottom: 1px solid #dddee1;
padding-bottom: 10px;
}
ul {
padding-left: 0px;
li {
list-style: none;
padding: 30px 0;
border-bottom: 1px solid #dddee1;
display: flex;
img {
width: 100px;
height: 100px;
}
div {
margin-left: 16px;
display: flex;
flex-direction: column;
justify-content: center;
h2 {
margin-bottom: 20px;
font-size: 20px;
color: #000;
display: flex;
span {
display: block;
font-size: 14px;
color: #ffffff;
margin-left: 8px;
background: rgba(0, 184, 230, 0.8);
display: flex;
align-items: center;
padding: 0 5px;
border-radius: 4px;
}
}
p {
margin-bottom: 0;
}
}
}
.clearfix:after {
display: block;
content: "";
clear: both;
}
.title {
color: #0558e1;
font-size: 18px;
padding-bottom: 0;
border-bottom: 0;
}
.title:before {
content: "";
width: 6px;
height: 6px;
display: inline-block;
border-radius: 50%;
background: #0558e1;
vertical-align: middle;
margin-right: 10px;
margin-top: 6px;
}
}
}
::v-deep .agreeOr>div {
display: flex;
align-items: center;
.el-input {
margin-right: 10px;
margin-left: 32px;
}
}
::v-deep .agreeOr>div:last-of-type {
margin-top: 15px;
}
.blueAll {
::v-deep .el-radio-button__inner {
width: 80px;
height: 32px;
line-height: 32px;
padding: 0;
border-radius: 2px;
background: #ffffff;
color: #0558e1;
border: 1px solid #0558e1;
}
::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
box-shadow: unset !important;
background: #0558e1;
color: #ffffff;
}
}
.inputBule {
width: 55px;
height: 32px;
line-height: 32px;
padding: 0;
border-radius: 2px;
background: #0558e1;
color: #ffffff;
border: 1px solid #0558e1;
}
.redAll {
margin-left: 10px;
::v-deep .el-radio-button__inner {
width: 80px;
height: 32px;
line-height: 32px;
padding: 0;
border-radius: 2px;
border: 1px solid #e83a48;
background: #ffffff;
color: #e83a48;
margin-left: 10px;
}
::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
box-shadow: unset !important;
color: #ffffff;
background: #e83a48;
}
}
.blueInput {
width: 55px;
}
.area-item {
padding-right: 10px;
}
</style>

View File

@ -208,7 +208,7 @@
<script> <script>
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
export default { export default {
data () { data() {
// let validatorImg = (rule, value, callback) => { // let validatorImg = (rule, value, callback) => {
// console.log(value, 11111111) // console.log(value, 11111111)
// // // //
@ -228,10 +228,10 @@ export default {
ruleForm: { ruleForm: {
name: '', name: '',
num: '', num: '',
area: 0, area: '',
capacity: '', capacity: '',
pic: '', pic: '',
id: '' id: '',
}, },
limit: 10, limit: 10,
page: 1, page: 1,
@ -242,11 +242,11 @@ export default {
rules: { rules: {
name: [ name: [
{ required: true, message: '请输入会议室名称', trigger: 'blur' }, { required: true, message: '请输入会议室名称', trigger: 'blur' },
{ min: 1, trigger: 'blur' } { min: 1, trigger: 'blur' },
], ],
area: [ area: [
{ required: true, message: '请输入会议室面积', trigger: 'blur' } { required: true, message: '请输入会议室面积', trigger: 'blur' },
// { min: 1, message: '', type: 'number', trigger: 'blur' } { min: 1, type: 'number', trigger: 'blur' },
], ],
description: [ description: [
{ required: true, message: '请填写描述内容', trigger: 'blur' }, { required: true, message: '请填写描述内容', trigger: 'blur' },
@ -254,22 +254,22 @@ export default {
min: 1, min: 1,
max: 500, max: 500,
message: '长度在 1 到 500 个字符', message: '长度在 1 到 500 个字符',
trigger: 'blur' trigger: 'blur',
} },
] ],
}, },
formLabelWidth: '120px', formLabelWidth: '120px',
checkImgSuccess: true, checkImgSuccess: true,
dialogVisible: false, dialogVisible: false,
flge: '' flge: '',
} }
}, },
mounted () { mounted() {
this.queryData() this.queryData()
}, },
methods: { methods: {
// //
queryData () { queryData() {
this.$http this.$http
.get(`/meeting/page?limit=${this.limit}&page=${this.page}`) .get(`/meeting/page?limit=${this.limit}&page=${this.page}`)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -278,31 +278,31 @@ export default {
}) })
}, },
// //
handleSizeChange (val) { handleSizeChange(val) {
this.limit = val this.limit = val
this.queryData() this.queryData()
}, },
handleCurrentChange (val) { handleCurrentChange(val) {
this.page = val this.page = val
this.queryData() this.queryData()
}, },
// //
addRooom () { addRooom() {
this.dialogFormVisible = true this.dialogFormVisible = true
this.flge = 'add' this.flge = 'add'
this.ruleForm = {} this.ruleForm = {}
this.fileList = [] this.fileList = []
}, },
handlePictureCardPreview (file) { handlePictureCardPreview(file) {
this.dialogImageUrl = file.url this.dialogImageUrl = file.url
this.dialogVisible = true this.dialogVisible = true
}, },
// //
beforeUpload (file, fileList) { beforeUpload(file, fileList) {
this.$message.error('最多只能上传一张图片!') this.$message.error('最多只能上传一张图片!')
}, },
// //
onSuccess (response, file, fileList) { onSuccess(response, file, fileList) {
const isLt2M = file.size / 1024 / 1024 < 100 const isLt2M = file.size / 1024 / 1024 < 100
if (!isLt2M) { if (!isLt2M) {
this.$message.error('上传图片大小不能超过100MB') this.$message.error('上传图片大小不能超过100MB')
@ -313,17 +313,17 @@ export default {
this.checkImgSuccess = true this.checkImgSuccess = true
} }
}, },
// //
onRemove (file, fileList) { onRemove(file, fileList) {
this.$nextTick(() => { this.$nextTick(() => {
if (fileList.length == 0) { if (fileList.length == 0) {
this.checkImgSuccess = false // this.checkImgSuccess = false //
// this.$refs.ruleForm.validate() //, // this.$refs.ruleForm.validate() //,
} }
}) })
}, },
// //
submitForm (formName, i) { submitForm(formName, i) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
if (i === 'add') { if (i === 'add') {
@ -337,9 +337,9 @@ export default {
}) })
} else if (i === 'edit') { } else if (i === 'edit') {
this.dialogFormVisible = false this.dialogFormVisible = false
this.$http.put('/meeting', this.ruleForm).then(({ data: res }) => { this.$http.put(`/meeting`, this.ruleForm).then(({ data: res }) => {
this.ruleForm = res.data this.ruleForm = res.data
const imgUrl = { name: res.data.name, url: res.data.pic } let imgUrl = { name: res.data.name, url: res.data.pic }
this.fileList.push(imgUrl) this.fileList.push(imgUrl)
}) })
} }
@ -350,7 +350,7 @@ export default {
}) })
}, },
// //
taskDetails (row) { taskDetails(row) {
this.ruleForm = {} this.ruleForm = {}
this.fileList = [] this.fileList = []
this.flge = 'look' this.flge = 'look'
@ -366,45 +366,45 @@ export default {
} }
}) })
}, },
// //
taskUpdate (row) { taskUpdate(row) {
this.dialogFormVisible = true this.dialogFormVisible = true
this.fileList = [] this.fileList = []
this.flge = 'edit' this.flge = 'edit'
this.ruleForm = row this.ruleForm = row
if (row.pic != null) { if (row.pic != null) {
const imgUrl = { name: row.name, url: row.pic } let imgUrl = { name: row.name, url: row.pic }
this.fileList.push(imgUrl) this.fileList.push(imgUrl)
} else { } else {
this.fileList = [] this.fileList = []
} }
}, },
// //
taskDelete (row) { taskDelete(row) {
this.$confirm('此操作将永久删除该会议室, 是否继续?', '提示', { this.$confirm('此操作将永久删除该会议室, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning',
}) })
.then(() => { .then(() => {
this.$http.put('/meeting', { delFlag: 1, id: row.id }).then(() => { this.$http.put(`/meeting`, { delFlag: 1, id: row.id }).then(() => {
this.queryData() this.queryData()
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!',
}) })
}) })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消删除' message: '已取消删除',
}) })
}) })
}, },
// //
outDialog () {} outDialog() {},
} },
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

View File

@ -1,149 +0,0 @@
<!--
* @Author: hisense.guoyue
* @LastEditors: hisense.guoyue
* @LastEditTime: 2022-09-21 10:37:29
* @Description: 设备审批
-->
<template>
<!-- @selection-change="dataListSelectionChangeHandle" -->
<!-- @sort-change="dataListSortChangeHandle" -->
<el-card shadow="never" class="aui-card--fill" style="position:relative">
<div class="mod-activiti__process">
<el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%">
<el-table-column prop="title" label="申请标题" header-align="center" align="center"></el-table-column>
<el-table-column prop="name" label="申请人信息" header-align="center" align="center"></el-table-column>
<el-table-column prop="state" label="审批状态" header-align="center" align="center">
<template slot-scope="scope">
<span>{{wrjStateObj[scope.row.state]}}</span>
</template>
</el-table-column>
<el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="dept" label="单位" header-align="center" align="center"></el-table-column>
<el-table-column prop="applicationSystem" label="应用系统" header-align="center" align="center">
</el-table-column>
<el-table-column label="应用领域" header-align="center" align="center">
<template slot-scope="scope" v-if="scope.row.applicationArea">
<span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"
:key="i">{{x}}</span>
</template>
</el-table-column>
<el-table-column label="需求依据" header-align="center" align="center" width="200">
<template slot-scope="scope">
<el-tooltip placement="top-start">
<div class="tooltip-box" slot="content">{{(scope.row && scope.row.demand)}}</div>
<span class="demand-text">{{
(scope.row && scope.row.demand)
}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="taskHandle(scope.row)">审批</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</div>
<el-dialog title="审批" :visible.sync="centerDialogVisible" width="30%" center>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="审批意见">
<el-input type="textarea" v-model="form.auditViem" placeholder="请输入审批意见"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="through(3)">不通过</el-button>
<el-button type="primary" @click="through(2)">通过</el-button>
</span>
</el-dialog>
</el-card>
</template>
<script>
import bus from '@/views/bus.js'
import mixinViewModule from '@/mixins/view-module'
import processModule from '@/mixins/process-module'
export default {
mixins: [mixinViewModule, processModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/deviceApply/auditPage',
getDataListIsPage: true,
activatedIsNeed: true,
deleteIsBatch: true,
deleteIsBatchKey: 'deploymentId'
},
centerDialogVisible: false,
form: {
auditViem: ''
},
dataForm: {
state: 0
},
rowData: {},
wrjStateObj: {
0: '待审批',
1: '未申请',
2: '通过',
3: '未通过'
}
}
},
methods: {
taskHandle(row) {
this.form.auditViem = '';
this.rowData = row;
this.centerDialogVisible = true
},
through(state) {
// 2- 3-
this.handlePut(state)
},
handlePut(state) {
this.$http.put(`/deviceApply`, {
...this.rowData,
state: state,
...this.form
}).then(({ data: res }) => {
console.log('res------------>', res);
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.centerDialogVisible = false
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.query()
}
})
}).catch((err) => {
console.log('err------------>', err);
})
}
},
}
</script>
<style scoped>
.demand-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.area-text {
padding: 0 4px;
}
.tooltip-box {
width: 400px;
}
</style>

View File

@ -38,15 +38,6 @@
@click="videoAndImg(itemsonson.note1)" @click="videoAndImg(itemsonson.note1)"
> >
浏览 浏览
</div>
<div
class="videoAndImgCss"
v-if="
itemsonson.name === '上传附件'
"
@click="videoAndImg(itemsonson.note1)"
>
下载
</div> </div>
<div <div
v-else-if="itemsonson.type === ' multipleAdditions'" v-else-if="itemsonson.type === ' multipleAdditions'"
@ -519,7 +510,7 @@ export default {
color: #333333; color: #333333;
font-size: 22px; font-size: 22px;
margin-bottom: 20px; margin-bottom: 20px;
background: url("~@/assets/img/sj-jx.png") no-repeat; background: url('~@/assets/img/sj-jx.png') no-repeat;
background-position-x: 15px; background-position-x: 15px;
} }
.multipleAdditionsClass { .multipleAdditionsClass {

View File

@ -36,10 +36,8 @@
tip="支持文件类型大小不超过100M"></upload> tip="支持文件类型大小不超过100M"></upload>
<upload @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="item" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item" <upload @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="item" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
tip="支持视频类型大小不超过100M"></upload> tip="支持视频类型大小不超过100M"></upload>
<upload @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package' &&item.name != '上传附件'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item" <upload @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
tip="支持.zip类型大小不超过100M"></upload> tip="支持.zip类型大小不超过100M"></upload>
<upload @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx,.zip' :list="item" v-else-if="item.name == '上传附件'" type="附件" btnName="上传附件" :maxCount="1" :dataList="item"
tip="支持.doc,.docx,.zip,.ppt,.pdf类型大小不超过100M"></upload>
<input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
<input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
<input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
@ -269,7 +267,7 @@ export default {
} }
.item { .item {
position: relative; position: relative;
.box { .box{
display: flex; display: flex;
align-items: center; align-items: center;
margin: 25px 0; margin: 25px 0;
@ -278,17 +276,17 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.required { .required{
color: #f56c6c; color: #f56c6c;
margin-right: 3px; margin-right: 3px;
} }
} }
.requiredTips { .requiredTips{
font-size: 14px; font-size: 14px;
color: #f56c6c; color: #f56c6c;
position: absolute; position: absolute;
bottom: -20px; bottom:-20px;
left: 110px; left:110px;
} }
} }
</style> </style>

View File

@ -9,31 +9,22 @@
<el-input v-model="dataForm.postName" :placeholder="$t('post.postName')" clearable></el-input> <el-input v-model="dataForm.postName" :placeholder="$t('post.postName')" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<ren-select v-model="dataForm.status" dict-type="post_status" :placeholder="$t('post.status')"></ren-select> <ren-select v-model="dataForm.status" dict-type="post_status" :placeholder="$t('post.status')" ></ren-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('sys:post:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }} <el-button v-if="$hasPermission('sys:post:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('sys:post:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') <el-button v-if="$hasPermission('sys:post:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
}}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:post:reset')" type="primary" @click="resetHandle()">{{ $t('reset') }}
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="postCode" :label="$t('post.postCode')" header-align="center" align="center"> <el-table-column prop="postCode" :label="$t('post.postCode')" header-align="center" align="center"></el-table-column>
</el-table-column> <el-table-column prop="postName" :label="$t('post.postName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="postName" :label="$t('post.postName')" header-align="center" align="center">
</el-table-column>
<el-table-column prop="sort" :label="$t('post.sort')" header-align="center" align="center"></el-table-column> <el-table-column prop="sort" :label="$t('post.sort')" header-align="center" align="center"></el-table-column>
<el-table-column prop="status" :label="$t('post.status')" header-align="center" align="center"> <el-table-column prop="status" :label="$t('post.status')" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -42,15 +33,18 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('sys:post:update')" type="text" size="small" <el-button v-if="$hasPermission('sys:post:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('sys:post:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<el-button v-if="$hasPermission('sys:post:delete')" type="text" size="small"
@click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total" <el-pagination
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle" :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"> @current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
@ -64,7 +58,7 @@ import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './post-add-or-update' import AddOrUpdate from './post-add-or-update'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data() { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/sys/post/page', getDataListURL: '/sys/post/page',
@ -83,14 +77,6 @@ export default {
}, },
components: { components: {
AddOrUpdate AddOrUpdate
},
methods: {
resetHandle() {
Object.keys(this.dataForm).map(v => this.dataForm[v] = '')
this.$nextTick(() => {
this.getDataList()
})
},
} }
} }
</script> </script>

View File

@ -14,9 +14,6 @@
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:role:reset')" type="primary" @click="resetHandle()">{{ $t('reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
<el-table <el-table
v-loading="dataListLoading" v-loading="dataListLoading"
@ -71,14 +68,6 @@ export default {
}, },
components: { components: {
AddOrUpdate AddOrUpdate
},
methods: {
resetHandle() {
this.dataForm.name = '';
this.$nextTick(() => {
this.getDataList()
})
},
} }
} }
</script> </script>

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">

View File

@ -1,17 +1,16 @@
/* /*
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-09-19 09:36:49 * @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: 'zhanTingDev', // dev (2022-09-13:) version: 'test', //
//version: 'test', //
//version: 'frp', // 穿 //version: 'frp', // 穿
vNum: 'v0.8.7.2', vNum: 'v0.8.7.2',
configData: { configData: {
@ -32,25 +31,6 @@ var CONFIGITEM = {
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',
}, },
//
zhanTingDev: {
loginInfo: {
//
loginIp: '10.132.191.3',
loginPort: '8320',
userName: 'ynszdz',
userPwd: 'Admin@123',
},
backUrl: 'http://15.72.183.90:8001',
previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
//apiURL: 'http://15.72.183.90:8000/renren-admin',
// websocketURL: '10.16.5.146:8888/renren-admin', //
websocketURL: '10.18.1.99:8889/renren-admin',
// websocketURL: '10.16.5.35:8888/renren-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
// 西 // 西
xihaian: { xihaian: {
loginInfo: { loginInfo: {
@ -62,10 +42,7 @@ var CONFIGITEM = {
}, },
backUrl: 'http://10.134.135.9:9797', backUrl: 'http://10.134.135.9:9797',
previewUrl: 'http://10.134.135.9:9796/', previewUrl: 'http://10.134.135.9:9796/',
// websocketURL: '10.134.135.9:8888/renren-admin', // websocketURL: '10.134.135.9:8888/renren-admin',
// websocketURL: '10.134.135.92:8888/renren-admin', //
websocketURL: '192.168.124.254:8888/renren-admin', // -
// websocketURL: '10.18.1.99:8889/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',
}, },
@ -81,7 +58,6 @@ var CONFIGITEM = {
backUrl: 'http://localhost:8001', backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.236:9796/', previewUrl: 'http://192.168.124.236:9796/',
websocketURL: '192.168.124.236:8888/renren-admin', websocketURL: '192.168.124.236:8888/renren-admin',
// websocketURL: '10.18.1.99:8889/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',
}, },
@ -96,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',
}, },

View File

@ -37,7 +37,7 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
{ name: '新手指南', key: 'instructionManual' }, { name: '新手指南', key: 'instructionManual' },
{ name: '需求中心', key: 'demandCenter' }, { name: '需求中心', key: 'demandCenter' },
// { name: '', key: 'personalCenter' }, // { name: '', key: 'personalCenter' },
// { name: '', key: 'mapTest' }, { name: '区市站点', key: 'mapTest' },
// { name: '', key: 'houtaiguanli' }, // { name: '', key: 'houtaiguanli' },
// { name: '', key: 'assignCase' }, // { name: '', key: 'assignCase' },
{ name: '融合服务', key: 'integrationServices' }, { name: '融合服务', key: 'integrationServices' },

View File

@ -13,56 +13,62 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import zhCN from 'ant-design-vue/es/locale/zh_CN' import zhCN from 'ant-design-vue/es/locale/zh_CN'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { onBeforeUnmount } from 'vue' import { onBeforeUnmount } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const router = useRouter() const router = useRouter()
const locale = zhCN // export default {
const token = Cookies.get('ucsToken') // name: 'App',
console.log('token=================>', token) // data() {
let ws = new WebSocket( // return {
`ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}` // ,
) // }
// ws.send() // },
// onmessage // }
ws.onmessage = function (e) { const locale = zhCN
console.log('WebSocket服务器返回的信息: ' + e.data) const token = Cookies.get('ucsToken')
mybus.emit('getMynotice') console.log('token=================>', token)
// let ws = new WebSocket(
if (router.currentRoute.value.name === 'mynoticeView') {
mybus.emit('noticeListInit')
}
}
ws.onerror = function (e) {
console.log('WebSocket连接异常============================>', e)
ws = new WebSocket(
`ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}` `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
) )
} // ws.send()
ws.onclose = function (e) { // onmessage
console.log('WebSocket连接断开============================>', e) ws.onmessage = function (e) {
} console.log('WebSocket服务器返回的信息: ' + e.data)
onBeforeUnmount(() => { mybus.emit('getMynotice')
// 4., //
ws.close() if (router.currentRoute.value.name === 'mynoticeView') {
}) mybus.emit('noticeListInit')
}
}
ws.onerror = function (e) {
console.log('WebSocket连接异常============================>', e)
ws = new WebSocket(
`ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
)
}
ws.onclose = function (e) {
console.log('WebSocket连接断开============================>', e)
}
onBeforeUnmount(() => {
// 4.,
ws.close()
})
</script> </script>
<style lang="less"> <style lang="less">
@import '~@/vab/styles/vab.less'; @import '~@/vab/styles/vab.less';
#vue-admin-beautiful {
#vue-admin-beautiful { max-width: 1920px;
max-width: 1920px; // max-height: 1080px;
// max-height: 1080px; margin: auto;
margin: auto; height: 100%;
height: 100%; position: relative;
position: relative; background-color: #fff;
background-color: #fff; }
} body {
font-size: 0.14rem;
body { }
font-size: 0.14rem;
}
</style> </style>

View File

@ -99,11 +99,17 @@ export function getHls(params) {
} }
//- //-
export function getCameraInfoByAreaId(params) { export function getCameraInfoByAreaId(params) {
return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, return axios.get(
'http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=' +
params.areaId,
config2 config2
) )
} }
//- //-
export function getCameraByCondition(params) { export function getCameraByCondition(params) {
return axios.post('http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition', params, config2) return axios.get(
'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' +
params,
config2
)
} }

View File

@ -74,8 +74,7 @@ export function getHls(params) {
// //
export function sgcInsert(data) { export function sgcInsert(data) {
return request({ return request({
// url: '/resourcecar/insert', url: '/resourcecar/insert',
url: '/resourcecar/batchInsert', // 西-
method: 'post', method: 'post',
data, data,
}) })
@ -369,16 +368,6 @@ export function getIntegrationServicesList(params) {
params, params,
}) })
} }
// --
export function updateIntegrationServices(data) {
return request({
url: '/fuse',
method: 'put',
data,
})
}
// //
export function getCountByFuzzyQuery(params) { export function getCountByFuzzyQuery(params) {
return request({ return request({
@ -445,26 +434,3 @@ export function selectAppList(params) {
params, params,
}) })
} }
// 西-
export function getSoldierList(params) {
return request({
url: '/device/page',
method: 'get',
params,
})
}
// 西-
export function soldierApply(data) {
return request({
url: '/deviceApply',
method: 'post',
data,
})
}
// 西--
export function getMaxApplyNum(number) {
return request({
url: '/processForm/tabilityapplication/canApply/' + number,
method: 'get',
})
}

View File

@ -284,20 +284,3 @@ export function endProcess(params) {
params, params,
}) })
} }
// 西--
export function deviceApplylist(params) {
return request({
url: '/deviceApply/page',
method: 'get',
params,
})
}
// 西----
export function getDeviceDetail(deviceId) {
return request({
url: `/device/${deviceId}`,
method: 'get',
})
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 931 B

View File

@ -505,7 +505,3 @@ export const RECOURCE_G_ICON = {
resourceProtection: resourceProtection:
'/src/assets/resourceManageMap/pic/point-resettlement-circle.png', '/src/assets/resourceManageMap/pic/point-resettlement-circle.png',
} }
// -tab
// 西-
export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = whoShow.itShowXiHaiAn ? '基础设施' : '应用资源'

View File

@ -85,7 +85,7 @@ export const constantRoutes = [
{ {
path: '/', path: '/',
component: Layout, component: Layout,
redirect: whoShow.itShowXiHaiAn ? '/DetailsPageconetent' : '/home', redirect: '/home',
meta: { meta: {
title: '能力管理平台编目', title: '能力管理平台编目',
icon: 'apps-line', icon: 'apps-line',

View File

@ -60,7 +60,7 @@ export function MapFun(mapObj) {
/** /**
* 定义地物编辑服务 * 定义地物编辑服务
*/ */
const featureService = L.supermap && L.supermap.featureService && L.supermap.featureService( const featureService = L.supermap.featureService(
_mapConfig.config.EDITORDATA_URL _mapConfig.config.EDITORDATA_URL
) )
@ -1657,16 +1657,14 @@ export function MapFun(mapObj) {
features, features,
url, url,
layerName, layerName,
createPopupFun, createPopupFun
url2
) { ) {
console.log( console.log(
'_addResourceOnMapWithoutSuperMapCluster===============>', '_addResourceOnMapWithoutSuperMapCluster===============>',
features, features,
url, url,
layerName, layerName,
createPopupFun, createPopupFun
url2
) )
// 0 // 0
// if (features.length < 1) { // if (features.length < 1) {
@ -1687,19 +1685,14 @@ export function MapFun(mapObj) {
let layers = null let layers = null
// //
layers = createMarkerClusterLayer() layers = createMarkerClusterLayer()
const icon1 = createDefaultFeatureStyle({ const icon = createDefaultFeatureStyle({
img: url, img: url,
iconSize: [33, 33], iconSize: [36, 36],
})
const icon2 = createDefaultFeatureStyle({
img: url2,
iconSize: [33, 33],
}) })
features.map((feature) => { features.map((feature) => {
var bounds = map.getBounds() var bounds = map.getBounds()
// console.log("",feature.latLng); // console.log("",feature.latLng);
if ( feature.hasOwnProperty('latLng')) { if ( feature.hasOwnProperty('latLng')) {
let icon = feature.active?icon2:icon1
const marker = L.marker(feature.latLng, { icon }) const marker = L.marker(feature.latLng, { icon })
if (createPopupFun !== null) { if (createPopupFun !== null) {
marker.uuid = feature.uuid || '' marker.uuid = feature.uuid || ''
@ -1735,8 +1728,6 @@ export function MapFun(mapObj) {
} }
marker.on('click', e=>{ marker.on('click', e=>{
console.log('点位数据', e) console.log('点位数据', e)
mybus.emit('pointMarkerClick', feature)
}) })
layers.addLayer(marker) layers.addLayer(marker)
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -123,7 +123,7 @@ export function HieimpMap() {
// debugger; // debugger;
// //
L.supermap && L.supermap.layerInfoService && L.supermap L.supermap
.layerInfoService(_mapConfig.config.QUERY_URL) .layerInfoService(_mapConfig.config.QUERY_URL)
.getLayersInfo(function (result) { .getLayersInfo(function (result) {
// doSomething // doSomething

View File

@ -1,14 +1,14 @@
/* /*
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-08-22 18:22:16 * @Date: 2022-08-22 18:22:16
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-09-01 16:05:31 * @LastEditTime: 2022-08-25 21:05:32
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
const returnLocationStr = () => { const returnLocationStr = () => {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao' return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao1'
} }
export default returnLocationStr export default returnLocationStr

View File

@ -11,14 +11,8 @@ import store from '@/store'
import qs from 'qs' import qs from 'qs'
import router from '@/router' import router from '@/router'
// import { isArray } from '@/utils/validate' // import { isArray } from '@/utils/validate'
import { import { message } from 'ant-design-vue'
message import { getAccessToken, setAccessToken } from '@/utils/accessToken'
} from 'ant-design-vue'
import {
getAccessToken,
setAccessToken
} from '@/utils/accessToken'
let loadingInstance let loadingInstance
@ -32,20 +26,14 @@ const handleCode = (code, msg, res) => {
// debugger // debugger
switch (code) { switch (code) {
case 401: case 401:
debugger store.dispatch('user/resetAll').catch(() => {})
store.dispatch('user/resetAll').catch(() => { })
break break
case 403: case 403:
router.push({ router.push({ path: '/401' }).catch(() => {})
path: '/401'
}).catch(() => { })
break break
case 500: case 500:
message.error(msg || '接口异常') message.error(msg || '接口异常')
break break
case 505:
message.error(msg || '该时段已被预约')
break
case 302: case 302:
// window.location.href = redirect // window.location.href = redirect
break break
@ -76,7 +64,7 @@ instance.interceptors.request.use(
if ( if (
config.data && config.data &&
config.headers['Content-Type'] === config.headers['Content-Type'] ===
'application/x-www-form-urlencoded;charset=UTF-8' 'application/x-www-form-urlencoded;charset=UTF-8'
) )
config.data = qs.stringify(config.data) config.data = qs.stringify(config.data)
if (debounce.some((item) => config.url.includes(item))) { if (debounce.some((item) => config.url.includes(item))) {
@ -103,28 +91,22 @@ instance.interceptors.response.use(
console.log('接口返回headers', response.headers) console.log('接口返回headers', response.headers)
console.log('接口返回REDIRECT', response.headers.redirect) console.log('接口返回REDIRECT', response.headers.redirect)
response['Access-Control-Expose-Headers'] = 'redirect' response['Access-Control-Expose-Headers'] = 'redirect'
const { const { code, message } = response.data
code,
message
} = response.data
if (response.headers.token) { if (response.headers.token) {
setAccessToken(response.headers.token) setAccessToken(response.headers.token)
} }
if (response.headers.redirect) { if (response.headers.redirect) {
const _old_href = window.location.href.split('#')[0];
const _new_href = response.headers.redirect.split('#')[0];
window.location.replace(response.headers.redirect) window.location.replace(response.headers.redirect)
// url // setTimeout(() => {
if (_old_href === _new_href) { location.reload()
location.reload() // }, 1000)
}
return response return response
} }
if (response.headers.redirect === '/#/login') { if (response.headers.redirect === '/#/login') {
var keys = document.cookie.match(/[^ =;]+(?=\=)/g) var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
if (keys) { if (keys) {
for (var i = keys.length; i--;) { for (var i = keys.length; i--; ) {
document.cookie = document.cookie =
keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //,m.kevis.com keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //,m.kevis.com
document.cookie = document.cookie =
@ -144,7 +126,7 @@ instance.interceptors.response.use(
location.reload() location.reload()
}, 1000) }, 1000)
} }
handleCode(code, message || response.data.msg, response.headers) handleCode(code, message, response.headers)
if (loadingInstance) loadingInstance.close() if (loadingInstance) loadingInstance.close()
// const { data, config } = response // const { data, config } = response
// const { code, msg } = data // const { code, msg } = data
@ -164,14 +146,11 @@ instance.interceptors.response.use(
// } // }
}, },
(error) => { (error) => {
// debugger debugger
console.log('接口error', error) console.log('接口error', error)
if (loadingInstance) loadingInstance.close() if (loadingInstance) loadingInstance.close()
const { const { response, message } = error
response,
message
} = error
if (error.response) { if (error.response) {
console.log('接口返回', response) console.log('接口返回', response)
console.log('接口返回headers', response.headers) console.log('接口返回headers', response.headers)
@ -180,20 +159,23 @@ 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()
} }
const { const { status, data } = response
status,
data
} = response
handleCode(status, data.msg || message, response.headers.redirect) handleCode(status, data.msg || message, response.headers.redirect)
return Promise.reject(error) return Promise.reject(error)
} else { } else {
let { let { message } = error
message
} = error
if (message === 'Network Error') { if (message === 'Network Error') {
message = '后端接口连接异常' message = '后端接口连接异常'
} }

View File

@ -11,18 +11,28 @@
<span class="title">基础设施</span> <span class="title">基础设施</span>
</div> </div>
<div class="infrastructure-content"> <div class="infrastructure-content">
<div class="infrastructure-content-son" v-for="(item, index) in myDataList" :key="index"> <div
<div class="num-class" class="infrastructure-content-son"
:style="`background:url(${item.img}) no-repeat;background-position:top left;background-size:40%`"> v-for="(item, index) in myDataList"
:key="index"
>
<div
class="num-class"
:style="`background:url(${item.img}) no-repeat;background-position:top left;background-size:40%`"
>
<div>{{ item.title }}</div> <div>{{ item.title }}</div>
<div>{{ item.snum }}</div> <div>{{ item.snum }}</div>
</div> </div>
<div class="health-degree"> <div class="health-degree">
<div class="health-degree-title">健康度</div> <div class="health-degree-title">健康度</div>
<a-progress :stroke-color="{ <a-progress
'0%': '#108ee9', :stroke-color="{
'100%': '#87d068', '0%': '#108ee9',
}" :percent="item.percentage" :show-info="false" /> '100%': '#87d068',
}"
:percent="item.percentage"
:show-info="false"
/>
</div> </div>
<div class="percentage" :style="fontFormat(item.title)"> <div class="percentage" :style="fontFormat(item.title)">
{{ item.percentage }}% {{ item.percentage }}%
@ -32,194 +42,172 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref } from 'vue' import { ref } from 'vue'
import { infrastructureInfo } from '@/api/capabilityCloud' import { infrastructureInfo } from '@/api/capabilityCloud'
const itShowXiHaiAn = whoShow.itShowXiHaiAn let myDataList = ref([
{
let myDataList = ref([ title: '视频资源数量',
{ snum: '0',
title: '视频资源数量', percentage: '100',
snum: '0', img: require('../../../assets/capabilityCloud/infrastructure_sz.png'),
percentage: '100', },
img: require('../../../assets/capabilityCloud/infrastructure_sz.png'), {
}, title: '云资源',
{ snum: '0',
title: itShowXiHaiAn ? '单兵设备' : '云资源', percentage: '0',
snum: itShowXiHaiAn ? '2' : 0, img: require('../../../assets/capabilityCloud/infrastructure_yz.png'),
percentage: itShowXiHaiAn ? '100' : '0', },
img: require('../../../assets/capabilityCloud/infrastructure_yz.png'), {
}, title: '感知资源',
{ snum: '0',
title: itShowXiHaiAn ? '无人机' : '感知资源', percentage: '0',
snum: itShowXiHaiAn ? '2' : 0, img: require('../../../assets/capabilityCloud/infrastructure_gz.png'),
percentage: itShowXiHaiAn ? '100' : '0', },
img: require('../../../assets/capabilityCloud/infrastructure_gz.png'), ])
}, function fontFormat(name) {
]) switch (name) {
function fontFormat(name) { case '视频资源数量':
switch (name) { return 'color: #32ff91;'
case '视频资源数量': break
return 'color: #32ff91;' case '云资源':
break return 'color: #f4fd25;'
case itShowXiHaiAn ? '单兵设备' : '云资源': break
return 'color: #f4fd25;' case '感知资源':
break return 'color: #ff1d18;'
case itShowXiHaiAn ? '无人机' : '感知资源': break
return 'color: #ff1d18;'
break
}
}
const params = {
name: '',
pageNo: 1,
pageSize: 10,
}
infrastructureInfo().then((res) => {
console.log('基础设施==================>', res.data.data)
myDataList.value.forEach((val) => {
const obj = res.data.data.filter((item) => item.type === val.title)[0]
if (obj) {
if (obj.type == '视频资源数量') {
if (uavAndIndividualSoldier.num) {
obj.amount = obj.amount - 0 + uavAndIndividualSoldier.num
}
}
val.snum = obj.amount
} }
}
const params = {
name: '',
pageNo: 1,
pageSize: 10,
}
infrastructureInfo().then((res) => {
console.log('基础设施==================>', res.data.data)
myDataList.value.forEach((val) => {
const obj = res.data.data.filter((item) => item.type === val.title)[0]
if (obj) {
if (obj.type == '视频资源数量') {
if (uavAndIndividualSoldier.num) {
obj.amount = obj.amount - 0 + uavAndIndividualSoldier.num
}
}
val.snum = obj.amount
}
})
}) })
}).catch(err => {
console.log('err------------>', err);
})
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.infrastructure { .infrastructure {
width: 4.4rem;
height: 4.63rem;
position: relative;
background: rgba(0, 108, 188, 0.1);
border: 0.01rem rgba(0, 108, 188, 0.7) solid;
border-radius: 0.03rem;
padding: 0.2rem;
padding-top: 0;
text-decoration: none;
outline: none;
-webkit-transition: all 100ms ease-out;
-moz-transition: all 100ms ease-out;
transition: all 100ms ease-out;
.infrastructure-top {
width: 4.4rem; width: 4.4rem;
height: 0.44rem; height: 4.63rem;
position: absolute; position: relative;
top: 0; background: rgba(0, 108, 188, 0.1);
background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat; border: 0.01rem rgba(0, 108, 188, 0.7) solid;
background-size: cover; border-radius: 0.03rem;
background-position: center; padding: 0.2rem;
line-height: 0.44rem; padding-top: 0;
text-align: center; text-decoration: none;
outline: none;
.title { -webkit-transition: all 100ms ease-out;
font-size: 0.24rem; -moz-transition: all 100ms ease-out;
} transition: all 100ms ease-out;
} .infrastructure-top {
width: 4.4rem;
.infrastructure-content { height: 0.44rem;
width: 4rem; position: absolute;
margin-top: 0.62rem; top: 0;
background: url('~@/assets/capabilityCloud/infrastructure_title.png')
.infrastructure-content-son { no-repeat;
display: flex; background-size: cover;
width: 4rem; background-position: center;
height: 1.17rem; line-height: 0.44rem;
background: linear-gradient(to right, #214677, rgba(2, 20, 103, 0));
align-items: center;
margin-bottom: 0.14rem;
padding-left: 0.1rem;
}
.num-class {
width: 1.5rem;
height: 1rem;
text-align: center; text-align: center;
margin-right: 0.2rem; .title {
font-size: 0.24rem;
&>div:first-child {
font-size: 0.18rem;
color: #ffffff;
margin-bottom: 0.1rem;
line-height: 0.18rem;
margin-top: 0.3rem;
}
&>div:last-child {
font-size: 0.36rem;
line-height: 0.36rem;
color: #1ce2e5;
} }
} }
.infrastructure-content {
.health-degree { width: 4rem;
width: 1.35rem; margin-top: 0.62rem;
.infrastructure-content-son {
.health-degree-title { display: flex;
font-size: 0.14rem; width: 4rem;
color: rgba(255, 255, 255, 0.6); height: 1.17rem;
margin-bottom: 0.08rem; background: linear-gradient(to right, #214677, rgba(2, 20, 103, 0));
align-items: center;
margin-bottom: 0.14rem;
padding-left: 0.1rem;
} }
.num-class {
:deep(.ant-progress-outer) { width: 1.5rem;
height: 0.27rem; height: 1rem;
} text-align: center;
margin-right: 0.2rem;
:deep(.ant-progress-inner) { & > div:first-child {
height: 0.27rem; font-size: 0.18rem;
border-radius: 0.14rem; color: #ffffff;
border: 0.01rem solid rgba(8, 153, 231, 0.6); margin-bottom: 0.1rem;
background: rgba(21, 65, 123, 0.6); line-height: 0.18rem;
margin-top: 0.3rem;
div { }
height: 0.27rem !important; & > div:last-child {
font-size: 0.36rem;
line-height: 0.36rem;
color: #1ce2e5;
} }
} }
} .health-degree {
width: 1.35rem;
// .health-degree: .health-degree-title {
.percentage { font-size: 0.14rem;
height: 0.57rem; color: rgba(255, 255, 255, 0.6);
font-size: 0.24rem; margin-bottom: 0.08rem;
line-height: 0.24rem; }
font-family: 'DIN-Bold'; :deep(.ant-progress-outer) {
margin-left: 0.1rem; height: 0.27rem;
display: flex; }
align-items: flex-end; :deep(.ant-progress-inner) {
height: 0.27rem;
border-radius: 0.14rem;
border: 0.01rem solid rgba(8, 153, 231, 0.6);
background: rgba(21, 65, 123, 0.6);
div {
height: 0.27rem !important;
}
}
}
// .health-degree:
.percentage {
height: 0.57rem;
font-size: 0.24rem;
line-height: 0.24rem;
font-family: 'DIN-Bold';
margin-left: 0.1rem;
display: flex;
align-items: flex-end;
}
} }
} }
} .infrastructure:hover {
border: 2px solid;
.infrastructure:hover { animation: turn 5s linear infinite;
border: 2px solid;
animation: turn 5s linear infinite;
}
@keyframes turn {
0% {
border-image: linear-gradient(to right, #003194, #00ffea) 1;
} }
@keyframes turn {
25% { 0% {
border-image: linear-gradient(to bottom, #003194, #00ffea) 1; border-image: linear-gradient(to right, #003194, #00ffea) 1;
}
25% {
border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
}
50% {
border-image: linear-gradient(to left, #003194, #00ffea) 1;
}
75% {
border-image: linear-gradient(to top, #003194, #00ffea) 1;
}
100% {
border-image: linear-gradient(to right, #003194, #00ffea) 1;
}
} }
50% {
border-image: linear-gradient(to left, #003194, #00ffea) 1;
}
75% {
border-image: linear-gradient(to top, #003194, #00ffea) 1;
}
100% {
border-image: linear-gradient(to right, #003194, #00ffea) 1;
}
}
</style> </style>

View File

@ -1,34 +0,0 @@
<template>
<div class="detail-back" @click="previousPage" :style="{ color: textColor }">
返回
</div>
</template>
<script setup>
import { reactive, ref, watch, defineProps } from 'vue'
import { useRouter } from 'vue-router'
const router = useRouter()
const props = defineProps({
textColor: { type: String, default: '' },
})
const previousPage = () => {
window.history.go(-1)
}
</script>
<style scoped lang="less">
.detail-back {
position: absolute;
opacity: 0.7;
top: 0.5rem;
left: 100px;
font-size: 0.20rem;
cursor: pointer;
background: -webkit-linear-gradient(90deg, #99a8d0, #fff);
font-weight: 600;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
</style>

View File

@ -7,7 +7,6 @@
--> -->
<template> <template>
<div class="capability-cloud"> <div class="capability-cloud">
<capability-cloud-back></capability-cloud-back>
<div class="header"> <div class="header">
<span class="title" @click="goHome">数字能力超市</span> <span class="title" @click="goHome">数字能力超市</span>
</div> </div>
@ -30,7 +29,6 @@
import Infrastructure from '@/views/capabilityCloud/components/Infrastructure.vue' import Infrastructure from '@/views/capabilityCloud/components/Infrastructure.vue'
import DataResources from '@/views/capabilityCloud/components/DataResources.vue' import DataResources from '@/views/capabilityCloud/components/DataResources.vue'
import KnowledgeBase from '@/views/capabilityCloud/components/KnowledgeBase.vue' import KnowledgeBase from '@/views/capabilityCloud/components/KnowledgeBase.vue'
import capabilityCloudBack from '@/views/capabilityCloud/components/capabilityCloudBack.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
const router = useRouter() const router = useRouter()
const goHome = () => { const goHome = () => {

View File

@ -69,7 +69,6 @@
:dataFrom="dataFrom" :dataFrom="dataFrom"
:fileList="fileList" :fileList="fileList"
:packageList="packageList" :packageList="packageList"
:accessoryList="accessoryList"
:imgList="imgList" :imgList="imgList"
:externalField="['接口服务', '接口请求方式']" :externalField="['接口服务', '接口请求方式']"
:configure="bs" :configure="bs"
@ -371,7 +370,6 @@
const navList2 = ref([]) const navList2 = ref([])
const fileList = ref({}) const fileList = ref({})
const packageList = ref({}) const packageList = ref({})
const accessoryList = ref({})
const imgList = ref({}) const imgList = ref({})
const videoList = ref({}) const videoList = ref({})
const data = ref({}) const data = ref({})
@ -789,9 +787,6 @@
mybus.on('chagePackageList', (obj) => { mybus.on('chagePackageList', (obj) => {
packageList.value = obj packageList.value = obj
}) })
mybus.on('chageAccessory', (obj) => {
accessoryList.value = obj
})
mybus.on('chageImgList', (obj) => { mybus.on('chageImgList', (obj) => {
imgList.value = obj imgList.value = obj
}) })
@ -841,7 +836,6 @@
mybus.off('chageDataFromDwon') mybus.off('chageDataFromDwon')
mybus.off('chageVideoList') mybus.off('chageVideoList')
mybus.off('chagePackageList') mybus.off('chagePackageList')
mybus.off('chageAccessory')
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

View File

@ -69,7 +69,6 @@
:dataFrom="dataFrom" :dataFrom="dataFrom"
:fileList="fileList" :fileList="fileList"
:fileList2="fileList2" :fileList2="fileList2"
:accessoryList="accessoryList"
:imgList="imgList" :imgList="imgList"
:configure="bs" :configure="bs"
@submit="submit()" @submit="submit()"
@ -340,7 +339,6 @@
const navList2 = ref([]) const navList2 = ref([])
const fileList = ref({}) const fileList = ref({})
const fileList2 = ref({}) const fileList2 = ref({})
const accessoryList = ref({})
const imgList = ref({}) const imgList = ref({})
const videoList = ref({}) const videoList = ref({})
const data = ref({}) const data = ref({})
@ -753,9 +751,6 @@
mybus.on('chageVideoList', (obj) => { mybus.on('chageVideoList', (obj) => {
videoList.value = obj videoList.value = obj
}) })
mybus.on('chageAccessory', (obj) => {
accessoryList.value = obj
})
//datafrom //datafrom
mybus.on('chageDataFromDwon', (obj) => { mybus.on('chageDataFromDwon', (obj) => {
switch (obj.attrType) { switch (obj.attrType) {
@ -798,7 +793,6 @@
mybus.off('chageFileList2') mybus.off('chageFileList2')
mybus.off('chageImgList') mybus.off('chageImgList')
mybus.off('chageDataFromDwon') mybus.off('chageDataFromDwon')
mybus.off('chageAccessory')
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

View File

@ -69,7 +69,6 @@
:dataFrom="dataFrom" :dataFrom="dataFrom"
:fileList="fileList" :fileList="fileList"
:fileList2="fileList2" :fileList2="fileList2"
:accessoryList="accessoryList"
:configure="bs" :configure="bs"
@submit="submit()" @submit="submit()"
@back="back()" @back="back()"
@ -339,7 +338,6 @@
const navList2 = ref([]) const navList2 = ref([])
const fileList = ref({}) const fileList = ref({})
const fileList2 = ref({}) const fileList2 = ref({})
const accessoryList = ref({})
const imgList = ref({}) const imgList = ref({})
const videoList = ref({}) const videoList = ref({})
const data = ref({}) const data = ref({})
@ -750,9 +748,6 @@
mybus.on('chageVideoList', (obj) => { mybus.on('chageVideoList', (obj) => {
videoList.value = obj videoList.value = obj
}) })
mybus.on('chageAccessory', (obj) => {
accessoryList.value = obj
})
//datafrom //datafrom
mybus.on('chageDataFromDwon', (obj) => { mybus.on('chageDataFromDwon', (obj) => {
switch (obj.attrType) { switch (obj.attrType) {
@ -795,7 +790,6 @@
mybus.off('chageFileList2') mybus.off('chageFileList2')
mybus.off('chageImgList') mybus.off('chageImgList')
mybus.off('chageDataFromDwon') mybus.off('chageDataFromDwon')
mybus.off('chageAccessory')
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

View File

@ -66,7 +66,6 @@
:dataFrom="dataFrom" :dataFrom="dataFrom"
:fileList="fileList" :fileList="fileList"
:fileList2="fileList2" :fileList2="fileList2"
:accessoryList="accessoryList"
:configure="bs" :configure="bs"
@submit="submit()" @submit="submit()"
@back="back()" @back="back()"
@ -238,7 +237,6 @@
const navList2 = ref([]) const navList2 = ref([])
const fileList = ref({}) const fileList = ref({})
const fileList2 = ref({}) const fileList2 = ref({})
const accessoryList = ref({})
const imgList = ref({}) const imgList = ref({})
const videoList = ref({}) const videoList = ref({})
const data = ref({}) const data = ref({})
@ -620,9 +618,6 @@
mybus.on('chageVideoList', (obj) => { mybus.on('chageVideoList', (obj) => {
videoList.value = obj videoList.value = obj
}) })
mybus.on('chageAccessory', (obj) => {
accessoryList.value = obj
})
//datafrom //datafrom
mybus.on('chageDataFromDwon', (obj) => { mybus.on('chageDataFromDwon', (obj) => {
switch (obj.attrType) { switch (obj.attrType) {
@ -665,7 +660,6 @@
mybus.off('chageFileList2') mybus.off('chageFileList2')
mybus.off('chageImgList') mybus.off('chageImgList')
mybus.off('chageDataFromDwon') mybus.off('chageDataFromDwon')
mybus.off('chageAccessory')
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

View File

@ -301,16 +301,6 @@
:list="props.fileList2" :list="props.fileList2"
tip="支持文件类型大小不超过100M" tip="支持文件类型大小不超过100M"
></upload> ></upload>
<upload
v-else-if="item.type == 'package' && item.name == '上传附件'"
type="附件"
btnName="上传附件"
:maxCount="1"
:data="item"
:busType="2"
:list="props.fileList2"
tip="支持.doc,.docx,.zip,.ppt,.pdf类型大小不超过100M"
></upload>
<upload <upload
v-else-if="item.type == 'package'" v-else-if="item.type == 'package'"
type="压缩包" type="压缩包"
@ -692,29 +682,27 @@
data.value.list.push(item) data.value.list.push(item)
} }
}) })
} } else if (item.name === '部门联系人') {
// else if (item.name === '') { if (!item.note1) {
// if (!item.note1) { getUserInfo().then(({ data: res1 }) => {
// getUserInfo().then(({ data: res1 }) => { console.log(res1.data)
// console.log(res1.data) item.note1 = res1.data.realName || ''
// item.note1 = res1.data.realName || '' })
// }) data.value.list.push(item)
// data.value.list.push(item) } else {
// } else { data.value.list.push(item)
// data.value.list.push(item) }
// } } else if (item.name === '部门联系人电话') {
// } else if (item.name === '') { if (!item.note1) {
// if (!item.note1) { getUserInfo().then(({ data: res1 }) => {
// getUserInfo().then(({ data: res1 }) => { console.log(res1.data)
// console.log(res1.data) item.note1 = res1.data.mobile || ''
// item.note1 = res1.data.mobile || '' })
// }) data.value.list.push(item)
// data.value.list.push(item) } else {
// } else { data.value.list.push(item)
// data.value.list.push(item) }
// } } else if (item.name === '来源应用') {
// }
else if (item.name === '来源应用') {
queryApplicationRelByResourceId({ queryApplicationRelByResourceId({
referenceId: 0, referenceId: 0,
}).then((res) => { }).then((res) => {
@ -1121,290 +1109,290 @@
</script> </script>
<style></style> <style></style>
<style lang="less" scoped> <style lang="less" scoped>
.put-on-the-shelf { .put-on-the-shelf {
height: 6.8rem; height: 6.8rem;
overflow: scroll; overflow: scroll;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 0.5rem 1rem 0.25rem; padding: 0.5rem 1rem 0.25rem;
.Technical-text { .Technical-text {
height: 0.3rem; height: 0.3rem;
width: 1rem; width: 1rem;
border: 0.01rem solid #bbd3ef; border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem; border-radius: 0.06rem;
background: #edf4fc; background: #edf4fc;
color: #0087ff; color: #0087ff;
font-size: 0.14rem; font-size: 0.14rem;
text-align: center; text-align: center;
line-height: 0.3rem; line-height: 0.3rem;
} }
.Technical-text:hover { .Technical-text:hover {
cursor: pointer; cursor: pointer;
}
& > div {
width: 100%;
margin-top: 0.6rem;
.top {
color: #333333;
font-size: 0.22rem;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 0.25rem;
div:first-child,
div:last-child {
width: 2.45rem;
height: 0.01rem;
background: #f0f0f0;
}
div:nth-child(2) {
margin: 0 0.3rem;
}
} }
.bottom { & > div {
margin-top: 0.25rem; width: 100%;
margin-top: 0.6rem;
.items { .top {
background: #fafafa; color: #333333;
padding: 0.1rem; font-size: 0.22rem;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 0.25rem;
p { div:first-child,
display: flex; div:last-child {
justify-content: space-between; width: 2.45rem;
height: 0.01rem;
background: #f0f0f0;
}
span:nth-of-type(1) { div:nth-child(2) {
width: 2rem; margin: 0 0.3rem;
}
}
.bottom {
margin-top: 0.25rem;
.items {
background: #fafafa;
padding: 0.1rem;
p {
display: flex;
justify-content: space-between;
span:nth-of-type(1) {
width: 2rem;
}
span:nth-of-type(2) {
width: 100%;
font-weight: 600;
}
} }
span:nth-of-type(2) { p:nth-of-type(1) > span:nth-of-type(1) {
width: 100%; font-size: 0.18rem;
font-weight: 600; font-weight: 600;
} }
} }
p:nth-of-type(1) > span:nth-of-type(1) { .add {
font-size: 0.18rem; cursor: pointer;
font-weight: 600; margin-top: 0.1rem;
} font-size: 0.16rem;
} color: #007efb;
.add {
cursor: pointer;
margin-top: 0.1rem;
font-size: 0.16rem;
color: #007efb;
}
.form {
margin-top: 0.2rem;
display: flex;
justify-content: flex-start;
align-items: center;
span:first-child {
width: 1.2rem;
} }
:deep(.ant-input-textarea) { .form {
width: 5.2rem; margin-top: 0.2rem;
display: flex;
justify-content: flex-start;
align-items: center;
span:first-child {
width: 1.2rem;
}
:deep(.ant-input-textarea) {
width: 5.2rem;
}
:deep(.ant-radio-group) {
width: 5.2rem;
}
:deep(.ant-input-number) {
width: 2rem;
}
:deep(.ant-input) {
resize: none;
width: 5.2rem;
}
.ant-btn {
width: 1.6rem;
height: 0.32rem;
text-align: center;
background: #edf4fc;
color: #0087ff;
border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem;
}
} }
:deep(.ant-radio-group) { .submit {
width: 5.2rem; margin-top: 0.4rem;
} font-size: 0.14rem;
display: flex;
justify-content: flex-end;
:deep(.ant-input-number) { .ant-btn {
width: 2rem; width: 1.8rem;
} height: 0.3rem;
text-align: center;
:deep(.ant-input) { background: #d9ebff;
resize: none; color: #0087ff;
width: 5.2rem; border: 0.01rem solid #0087ff;
} border-radius: 0.06rem;
}
.ant-btn {
width: 1.6rem;
height: 0.32rem;
text-align: center;
background: #edf4fc;
color: #0087ff;
border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem;
}
}
.submit {
margin-top: 0.4rem;
font-size: 0.14rem;
display: flex;
justify-content: flex-end;
.ant-btn {
width: 1.8rem;
height: 0.3rem;
text-align: center;
background: #d9ebff;
color: #0087ff;
border: 0.01rem solid #0087ff;
border-radius: 0.06rem;
} }
} }
} }
}
& > div:nth-of-type(1) {
margin-top: 0;
}
}
.application-Area {
width: 5.2rem;
display: grid;
margin-top: -0.05rem;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
.application-Area-son {
cursor: pointer;
font-size: 0.14rem;
width: 0.9rem;
height: 0.26rem;
border-radius: 0.13rem;
color: #333333;
background: #f5f5f5;
border: 0.01rem #cccccc solid;
display: flex;
justify-content: center;
align-items: center;
margin-top: 0.1rem;
font-weight: 500;
}
.application-Area-down {
background: #0087ff;
color: #fff;
}
}
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
:deep(.ant-modal) {
width: 9.6rem;
}
:deep(.ant-transfer-list) {
width: 39.5%;
height: 5.2rem;
}
:deep(.ant-transfer-operation) {
flex-direction: row-reverse;
margin: 0 0.3rem;
}
:deep(.ant-btn) {
width: 0.56rem;
height: 0.4rem;
border-radius: 0.04rem;
}
:deep(.ant-btn:first-child) {
margin-left: 0.04rem;
}
:deep(.ant-modal-footer) {
border: 0;
}
:deep(.ant-modal-header) {
border: 0;
}
:deep(.ant-modal-title) {
line-height: 0.24rem;
font-size: 0.18rem;
color: #303133;
}
:deep(.ant-transfer-list-header) {
background: #f5f7fa;
}
:deep(.ant-transfer-list-header-selected) {
display: flex;
width: 90%;
flex-direction: row-reverse;
justify-content: space-between;
align-items: center;
}
:deep(.ant-transfer-list-header-title) {
font-size: 0.16rem;
color: #303133;
font-weight: 400;
text-align: left;
}
:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
display: none !important;
}
:deep(.ant-upload-list-item-name) {
width: 1rem;
}
.del {
display: flex;
justify-content: flex-start;
align-items: center;
font-size: 0.14rem;
margin-left: 0.2rem;
.delImg {
cursor: pointer;
display: inline-block;
width: 0.16rem;
height: 0.18rem;
background: url(~@/assets/home/sf_del.png) no-repeat;
margin-right: 0.05rem;
}
div {
cursor: pointer;
}
}
.item {
position: relative;
span:first-child {
width: unset;
}
.box {
display: flex;
align-items: center;
// margin: 15px 0;
& > div:nth-of-type(1) { & > div:nth-of-type(1) {
width: 105px; margin-top: 0;
}
}
.application-Area {
width: 5.2rem;
display: grid;
margin-top: -0.05rem;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
.application-Area-son {
cursor: pointer;
font-size: 0.14rem;
width: 0.9rem;
height: 0.26rem;
border-radius: 0.13rem;
color: #333333;
background: #f5f5f5;
border: 0.01rem #cccccc solid;
display: flex;
justify-content: center;
align-items: center;
margin-top: 0.1rem;
font-weight: 500;
}
.application-Area-down {
background: #0087ff;
color: #fff;
}
}
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
:deep(.ant-modal) {
width: 9.6rem;
}
:deep(.ant-transfer-list) {
width: 39.5%;
height: 5.2rem;
}
:deep(.ant-transfer-operation) {
flex-direction: row-reverse;
margin: 0 0.3rem;
}
:deep(.ant-btn) {
width: 0.56rem;
height: 0.4rem;
border-radius: 0.04rem;
}
:deep(.ant-btn:first-child) {
margin-left: 0.04rem;
}
:deep(.ant-modal-footer) {
border: 0;
}
:deep(.ant-modal-header) {
border: 0;
}
:deep(.ant-modal-title) {
line-height: 0.24rem;
font-size: 0.18rem;
color: #303133;
}
:deep(.ant-transfer-list-header) {
background: #f5f7fa;
}
:deep(.ant-transfer-list-header-selected) {
display: flex;
width: 90%;
flex-direction: row-reverse;
justify-content: space-between;
align-items: center;
}
:deep(.ant-transfer-list-header-title) {
font-size: 0.16rem;
color: #303133;
font-weight: 400;
text-align: left;
}
:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
display: none !important;
}
:deep(.ant-upload-list-item-name) {
width: 1rem;
}
.del {
display: flex;
justify-content: flex-start;
align-items: center;
font-size: 0.14rem;
margin-left: 0.2rem;
.delImg {
cursor: pointer;
display: inline-block;
width: 0.16rem;
height: 0.18rem;
background: url(~@/assets/home/sf_del.png) no-repeat;
margin-right: 0.05rem;
}
div {
cursor: pointer;
}
}
.item {
position: relative;
span:first-child {
width: unset;
}
.box {
display: flex; display: flex;
align-items: center; align-items: center;
// margin: 15px 0;
& > div:nth-of-type(1) {
width: 105px;
display: flex;
align-items: center;
}
.required {
color: #f56c6c;
margin-right: 3px;
}
} }
.required { .requiredTips {
font-size: 14px;
color: #f56c6c; color: #f56c6c;
margin-right: 3px; position: absolute;
bottom: -20px;
left: 110px;
} }
} }
.requiredTips {
font-size: 14px;
color: #f56c6c;
position: absolute;
bottom: -20px;
left: 110px;
}
}
</style> </style>

View File

@ -1,18 +1,6 @@
<!-- 智能算法 --> <!-- 智能算法 -->
<template> <template>
<div class="algorithm"> <div class="algorithm">
<div class="select">
<div class="top" @click="selectFlag2 = true">
{{ typeName2 }}
<div class="light"></div>
</div>
<div class="bottom" v-show="selectFlag2">
<span class="light"></span>
<div v-for="val in dictList" :key="val" @click="getList2(val)">
{{ val }}
</div>
</div>
</div>
<div class="algorithm-class"> <div class="algorithm-class">
<div <div
v-for="(item, index) in dataList" v-for="(item, index) in dataList"
@ -39,25 +27,9 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { getCategoryTreePage } from '@/api/personalCenter'
import { pageWithAttrs } from '@/api/abilityStatistics' import { pageWithAttrs } from '@/api/abilityStatistics'
import { ref, onMounted, onBeforeUnmount } from 'vue' import { ref, onMounted, onBeforeUnmount } from 'vue'
const typeName2 = ref('全部')
const dictList = ref([])
const dataList = ref([]) const dataList = ref([])
const selectFlag2 = ref(false)
getCategoryTreePage({
page: 1,
limit: 99,
dictTypeId: '1513712507692818433',
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
}
})
})
const params = { const params = {
deptIds: [], deptIds: [],
districtId: '', districtId: '',
@ -68,19 +40,6 @@
pageSize: 9, pageSize: 9,
type: '组件服务', type: '组件服务',
} }
const getList2 = (val) => {
typeName2.value = val
if (val == '全部') {
params.infoList = [{ attrType: '组件类型', attrValue: '智能算法' }]
} else {
params.infoList = [
{ attrType: '组件类型', attrValue: '智能算法' },
{ attrType: '应用领域', attrValue: val },
]
}
selectFlag2.value = false
pageWithAttrsFunction()
}
let algorithmclass = null let algorithmclass = null
const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg')) const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
const dataLength = ref(true) const dataLength = ref(true)
@ -150,67 +109,9 @@
<style lang="less" scoped> <style lang="less" scoped>
.algorithm { .algorithm {
.select {
margin: 0.1rem 0 0.1rem 0.2rem;
color: #fff;
font-size: 0.2rem;
font-family: webfont;
position: relative;
.top {
cursor: pointer;
width: 3.61rem;
height: 0.85rem;
font-weight: 600;
text-align: center;
padding-top: 0.1rem;
background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
background-size: 100%;
position: relative;
.light {
width: 0.56rem;
height: 3px;
position: absolute;
top: 0.4rem;
left: 1.52rem;
background: url('~@/assets/capacitySquare/select-light1.png')
no-repeat;
background-size: 100%;
}
}
.bottom {
cursor: pointer;
position: absolute;
top: 0.5rem;
left: 0.9rem;
z-index: 1000;
background: rgba(57, 134, 239, 0.68);
border: 1px solid #aed5ff;
.light {
display: inline-block;
width: 2.39rem;
height: 5px;
position: absolute;
top: -0.08rem;
left: -0.3rem;
background: url('~@/assets/capacitySquare/select-light2.png')
no-repeat;
background-size: 100%;
}
& > div {
width: 1.8rem;
height: 0.4rem;
line-height: 0.4rem;
text-align: center;
border-top: 1px solid #aed5ff;
}
& > div:nth-of-type(1) {
border: none;
}
}
}
.algorithm-class { .algorithm-class {
// margin-top: 0.6rem; margin-top: 0.6rem;
margin-bottom: 0.18rem; margin-bottom: 0.59rem;
display: grid; display: grid;
grid-template-columns: repeat(3, 33%); grid-template-columns: repeat(3, 33%);
height: 8.8rem; height: 8.8rem;

View File

@ -2,36 +2,22 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-08-09 09:31:25 * @Date: 2022-08-09 09:31:25
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-09-19 10:19:02 * @LastEditTime: 2022-08-10 14:29:05
* @Description: 应用资源 * @Description: 应用资源
--> -->
<template> <template>
<div class="application"> <div class="application">
<div style="display: flex"> <div class="select">
<div class="select"> <div class="top" @click="selectFlag = true">
<div class="top" @click="selectFlag = true"> {{ typeName }}
{{ typeName }} <div class="light"></div>
<div class="light"></div>
</div>
<div class="bottom" v-show="selectFlag">
<span class="light"></span>
<div @click="getList('全市')">全市</div>
<div @click="getList('市级')">市级</div>
<div @click="getList('区级')">区级</div>
<div @click="getList('企业')">企业</div>
</div>
</div> </div>
<div class="select"> <div class="bottom" v-show="selectFlag">
<div class="top" @click="selectFlag2 = true"> <span class="light"></span>
{{ typeName2 }} <div @click="getList('全市')">全市</div>
<div class="light"></div> <div @click="getList('市级')">市级</div>
</div> <div @click="getList('区级')">区级</div>
<div class="bottom" v-show="selectFlag2"> <div @click="getList('企业')">企业</div>
<span class="light"></span>
<div v-for="val in dictList" :key="val" @click="getList2(val)">
{{ val }}
</div>
</div>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
@ -52,7 +38,6 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { getCategoryTreePage } from '@/api/personalCenter'
import { onMounted, reactive, onBeforeUnmount, ref, nextTick } from 'vue' import { onMounted, reactive, onBeforeUnmount, ref, nextTick } from 'vue'
import { selectAppList } from '@/api/home' import { selectAppList } from '@/api/home'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
@ -60,25 +45,9 @@
const pageNum = ref(1) const pageNum = ref(1)
const flag = ref(true) const flag = ref(true)
const type = ref(null) const type = ref(null)
const area = ref(null)
const typeName = ref('全市') const typeName = ref('全市')
const typeName2 = ref('全部')
const dictList = ref([])
const data = reactive({ list: [] }) const data = reactive({ list: [] })
const selectFlag = ref(false) const selectFlag = ref(false)
const selectFlag2 = ref(false)
getCategoryTreePage({
page: 1,
limit: 99,
dictTypeId: '1513712507692818433',
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
}
})
})
let dom = null let dom = null
const goToView = (id) => { const goToView = (id) => {
const newpage = router.resolve({ const newpage = router.resolve({
@ -113,14 +82,7 @@
pageNum.value = 1 pageNum.value = 1
data.list = [] data.list = []
} }
getData(str) selectAppList({ pageNum: pageNum.value, type: type.value }).then((res) => {
}
const getData = (str) => {
selectAppList({
pageNum: pageNum.value,
type: type.value,
area: area.value,
}).then((res) => {
if (res.data.data.length < 9) { if (res.data.data.length < 9) {
dom.removeEventListener('scroll', viewMonitor, true) dom.removeEventListener('scroll', viewMonitor, true)
} }
@ -160,20 +122,6 @@
} }
} }
} }
const getList2 = (val) => {
dom.scrollTop = 0
typeName2.value = val
pageNum.value = 1
data.list = []
if (val == '全部') {
area.value = null
getData()
} else {
area.value = val
getData()
}
selectFlag2.value = false
}
onMounted(() => { onMounted(() => {
dom = document.querySelector('.item-box') dom = document.querySelector('.item-box')
console.log('box============', dom) console.log('box============', dom)

View File

@ -1,18 +1,6 @@
<!-- 图层服务 --> <!-- 图层服务 -->
<template> <template>
<div class="algorithm"> <div class="algorithm">
<div class="select">
<div class="top" @click="selectFlag2 = true">
{{ typeName2 }}
<div class="light"></div>
</div>
<div class="bottom" v-show="selectFlag2">
<span class="light"></span>
<div v-for="val in dictList" :key="val" @click="getList2(val)">
{{ val }}
</div>
</div>
</div>
<div class="algorithm-class"> <div class="algorithm-class">
<div <div
v-for="(item, index) in dataList" v-for="(item, index) in dataList"
@ -39,25 +27,10 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { getCategoryTreePage } from '@/api/personalCenter'
import { pageWithAttrs } from '@/api/abilityStatistics' import { pageWithAttrs } from '@/api/abilityStatistics'
import { ref, onMounted, onBeforeUnmount } from 'vue' import { ref, onMounted, onBeforeUnmount } from 'vue'
const typeName2 = ref('全部')
const dictList = ref([])
const dataList = ref([]) const dataList = ref([])
const selectFlag2 = ref(false) let algorithmclass = null
getCategoryTreePage({
page: 1,
limit: 99,
dictTypeId: '1513712507692818433',
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
if (val.dictLabel !== '其他') {
dictList.value.push(val.dictLabel)
}
})
})
const params = { const params = {
deptIds: [], deptIds: [],
districtId: '', districtId: '',
@ -68,20 +41,6 @@
pageSize: 9, pageSize: 9,
type: '组件服务', type: '组件服务',
} }
const getList2 = (val) => {
typeName2.value = val
if (val == '全部') {
params.infoList = [{ attrType: '组件类型', attrValue: '图层服务' }]
} else {
params.infoList = [
{ attrType: '组件类型', attrValue: '图层服务' },
{ attrType: '应用领域', attrValue: val },
]
}
selectFlag2.value = false
pageWithAttrsFunction()
}
let algorithmclass = null
const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo2.jpg')) const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo2.jpg'))
const dataLength = ref(true) const dataLength = ref(true)
const isNoMore = ref(false) const isNoMore = ref(false)
@ -144,67 +103,9 @@
<style lang="less" scoped> <style lang="less" scoped>
.algorithm { .algorithm {
.select {
margin: 0.1rem 0 0.1rem 0.2rem;
color: #fff;
font-size: 0.2rem;
font-family: webfont;
position: relative;
.top {
cursor: pointer;
width: 3.61rem;
height: 0.85rem;
font-weight: 600;
text-align: center;
padding-top: 0.1rem;
background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
background-size: 100%;
position: relative;
.light {
width: 0.56rem;
height: 3px;
position: absolute;
top: 0.4rem;
left: 1.52rem;
background: url('~@/assets/capacitySquare/select-light1.png')
no-repeat;
background-size: 100%;
}
}
.bottom {
cursor: pointer;
position: absolute;
top: 0.5rem;
left: 0.9rem;
z-index: 1000;
background: rgba(57, 134, 239, 0.68);
border: 1px solid #aed5ff;
.light {
display: inline-block;
width: 2.39rem;
height: 5px;
position: absolute;
top: -0.08rem;
left: -0.3rem;
background: url('~@/assets/capacitySquare/select-light2.png')
no-repeat;
background-size: 100%;
}
& > div {
width: 1.8rem;
height: 0.4rem;
line-height: 0.4rem;
text-align: center;
border-top: 1px solid #aed5ff;
}
& > div:nth-of-type(1) {
border: none;
}
}
}
.algorithm-class { .algorithm-class {
// margin-top: 0.6rem; margin-top: 0.6rem;
margin-bottom: 0.18rem; margin-bottom: 0.59rem;
display: grid; display: grid;
grid-template-columns: repeat(3, 33%); grid-template-columns: repeat(3, 33%);
height: 8.8rem; height: 8.8rem;

View File

@ -26,8 +26,6 @@
import layer from './components/layer.vue' import layer from './components/layer.vue'
import application from './components/application.vue' import application from './components/application.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
const router = useRouter() const router = useRouter()
const abilityToType = router.currentRoute.value.query.abilityToType const abilityToType = router.currentRoute.value.query.abilityToType
const show = ref('algorithm') const show = ref('algorithm')
@ -49,8 +47,7 @@
const newpage = router.resolve({ const newpage = router.resolve({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
// select: '', select: '组件服务',
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
}, },
}) })
window.location.href = newpage.href window.location.href = newpage.href

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: '' },
@ -78,13 +79,6 @@
'application/vnd.openxmlformats-officedocument.wordprocessingml.document' 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
} else if (props.type === '压缩包') { } else if (props.type === '压缩包') {
flag = file.type === 'application/x-zip-compressed' flag = file.type === 'application/x-zip-compressed'
} else if (props.type === '附件') {
flag =
file.type === 'application/pdf' ||
file.type === 'application/msword' ||
file.type ===
'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ||
file.type === 'application/x-zip-compressed'
} }
console.log(flag) console.log(flag)
if (!flag) { if (!flag) {
@ -138,8 +132,6 @@
} }
} else if (props.type === '压缩包') { } else if (props.type === '压缩包') {
mybus.emit('chagePackageList', fileList.value) mybus.emit('chagePackageList', fileList.value)
} else if (props.type === '附件') {
mybus.emit('chageAccessory', fileList.value)
} else if (props.type === '视频') { } else if (props.type === '视频') {
console.log(fileList.value) console.log(fileList.value)
mybus.emit('chageVideoList', fileList.value) mybus.emit('chageVideoList', fileList.value)

View File

@ -8,7 +8,9 @@
></DetalsTitle> ></DetalsTitle>
</div> </div>
<!-- 青岛市局 --> <!-- 青岛市局 -->
<div style="width: 100%; display: flex; justify-content: center" <div
v-if="whoShow1 && whoShow1.itShowQingDao"
style="width: 100%; display: flex; justify-content: center"
> >
<div class="content" v-for="item in dataFrom.content" :key="item.title"> <div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left" v-if="item.titleType === '调用接口'"> <div class="content-left" v-if="item.titleType === '调用接口'">
@ -160,6 +162,127 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<!-- 其他 -->
<div v-else>
<div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left" v-if="item.titleType === '调用接口'">
<div class="left">
<div class="content-left-title">
<span>{{ item.title }}{{ item.titleType }}</span>
</div>
<div class="content-left-content">
<p>
<span>{{ item.link.name }}</span>
<a-tooltip>
<template #title>{{ item.link.value }}</template>
<span>{{ item.link.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.postMethod.name }}</span>
<span>{{ item.postMethod.value }}</span>
</p>
</div>
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<!-- <div @click="technicalNew()">新手指引</div> -->
<!-- <div @click="SDKClick()">SDK安装包</div> -->
</div>
</div>
<div class="content-left" v-else-if="item.titleType === '平台对接'">
<div class="left">
<div class="content-left-title">
<span>{{ item.title }}{{ item.titleType }}</span>
</div>
<div class="content-left-content">
<p>
<span>{{ item.linkPlatform.name }}</span>
<a-tooltip v-if="approveStatus == '通过'">
<template #title>{{ item.linkPlatform.value }}</template>
<span>{{ item.linkPlatform.value }}</span>
</a-tooltip>
<a-tooltip v-else>
<template #title>请申请后查看平台地址</template>
<span>****************</span>
</a-tooltip>
</p>
</div>
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<!-- <div @click="technicalNew()">新手指引</div> -->
<!-- <div @click="SDKClick()">SDK安装包</div> -->
</div>
</div>
<div class="content-left" v-else-if="item.titleType === 'SDK'">
<div class="left">
<div class="content-left-title">
<span>{{ item.title }}{{ item.titleType }}</span>
</div>
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<!-- <div @click="technicalNew()">新手指引</div> -->
<div @click="SDKClick()">SDK安装包</div>
</div>
</div>
<div class="content-right">
<div class="content-right-left">
<div class="content-right-title">{{ item.contact }}</div>
<div class="content-right-content">
<p>
<span>{{ item.facilitator.name }}</span>
<a-tooltip>
<template #title>{{ item.facilitator.value }}</template>
<span>{{ item.facilitator.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.people.name }}</span>
<a-tooltip>
<template #title>{{ item.people.value }}</template>
<span>{{ item.people.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.phone.name }}</span>
<a-tooltip>
<template #title>{{ item.phone.value }}</template>
<span>{{ item.phone.value }}</span>
</a-tooltip>
</p>
</div>
</div>
<div class="content-right-right">
<div class="content-right-title">{{ item.contact2 }}</div>
<div class="content-right-content">
<p>
<span>{{ item.facilitator2.name }}</span>
<a-tooltip>
<template #title>{{ item.facilitator2.value }}</template>
<span>{{ item.facilitator2.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.people2.name }}</span>
<a-tooltip>
<template #title>{{ item.people2.value }}</template>
<span>{{ item.people2.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.phone2.name }}</span>
<a-tooltip>
<template #title>{{ item.phone2.value }}</template>
<span>{{ item.phone2.value }}</span>
</a-tooltip>
</p>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</template> </template>

View File

@ -11,38 +11,51 @@
<div class="main"> <div class="main">
<div class="main-left"> <div class="main-left">
<p>{{ dataFrom.linkName }}</p> <p>{{ dataFrom.linkName }}</p>
<a-tooltip> <a-tooltip v-if="flag">
<template #title>{{ dataFrom.link }}</template>
<p style="cursor: pointer" @click="clickLink(dataFrom.link)">
{{ dataFrom.link || '暂无' }}
</p>
</a-tooltip>
<a-tooltip v-else>
<template #title>请申请后查看</template> <template #title>请申请后查看</template>
<!-- <p style="cursor: pointer; filter: blur(4px)"> <p style="cursor: pointer; filter: blur(4px)">
{{ dataFrom.link }}
</p> -->
<p style="cursor: pointer;"
:class="{ 'blur-word': approveStatus == '通过' && whoShow1.itShowXiHaiAn ? false : true}">
{{ dataFrom.link }} {{ dataFrom.link }}
</p> </p>
</a-tooltip> </a-tooltip>
</div> </div>
<div class="main-center"> <div class="main-center">
<p>{{ dataFrom.numberName }}</p> <p>{{ dataFrom.numberName }}</p>
<a-tooltip> <a-tooltip v-if="flag">
<template #title>请申请后查看</template> <template #title>{{ dataFrom.number }}</template>
<!-- <p style="filter: blur(4px)">{{ dataFrom.number }}</p> --> <p>{{ dataFrom.number || '暂无' }}</p>
<p :class="{ 'blur-word': approveStatus == '通过' && whoShow1.itShowXiHaiAn ? false : true}">{{ dataFrom.number
}}</p>
</a-tooltip> </a-tooltip>
<div @click="copyFunction(dataFrom.number, '复制账号')" v-if="dataFrom.number != '' && flag"> <a-tooltip v-else>
<template #title>请申请后查看</template>
<p style="filter: blur(4px)">{{ dataFrom.number }}</p>
</a-tooltip>
<div
@click="copyFunction(dataFrom.number, '复制账号')"
v-if="dataFrom.number != '' && flag"
>
复制账号 复制账号
</div> </div>
<!-- <div v-else id="zanwu">暂无</div> --> <!-- <div v-else id="zanwu">暂无</div> -->
</div> </div>
<div class="main-right"> <div class="main-right">
<p>{{ dataFrom.passwordName }}</p> <p>{{ dataFrom.passwordName }}</p>
<a-tooltip> <a-tooltip v-if="flag">
<template #title>{{ dataFrom.password }}</template>
<p>{{ dataFrom.password || '暂无' }}</p>
</a-tooltip>
<a-tooltip v-else>
<template #title>请申请后查看</template> <template #title>请申请后查看</template>
<p style="filter: blur(4px)">{{ dataFrom.password }}</p> <p style="filter: blur(4px)">{{ dataFrom.password }}</p>
<p style="filter: blur(4px)" :class="{ 'blur-word': approveStatus == '通过' && whoShow1.itShowXiHaiAn ? false : true}">{{ dataFrom.password }}</p>
</a-tooltip> </a-tooltip>
<div @click="copyFunction(dataFrom.password2, '复制密码')" v-if="dataFrom.password2 != '' && flag"> <div
@click="copyFunction(dataFrom.password2, '复制密码')"
v-if="dataFrom.password2 != '' && flag"
>
复制密码 复制密码
</div> </div>
<!-- <div v-else id="zanwu">暂无</div> --> <!-- <div v-else id="zanwu">暂无</div> -->
@ -51,185 +64,166 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue' import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
import { ref, defineProps, watch } from 'vue' import { ref, defineProps, watch } from 'vue'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
let flag = ref(true) let flag = ref(true)
const whoShow1 = ref(whoShow) const whoShow1 = ref(whoShow)
console.log('whoShow1', whoShow1.value.itShowQingDao) console.log('whoShow1', whoShow1.value.itShowQingDao)
const props = defineProps({ const props = defineProps({
dataList: { type: Object, default: null }, dataList: { type: Object, default: null },
})
const dataFrom = ref({
linkName: '访问地址',
link: '',
numberName: '试用账号',
number: '',
passwordName: '试用密码',
password: '**************************',
password2: '',
})
console.log('props.dataList------------>', props.dataList);
const approveStatus = ref('')
if (props.dataList.infoList) {
let obj = props.dataList.approveStatus;
approveStatus.value = props.dataList.approveStatus
if (obj !== '通过' && whoShow1.value.itShowQingDao) {
flag.value = false
}
dataFrom.value.link = props.dataList.link
props.dataList.infoList.map((item) => {
if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
dataFrom.value.number = item.attrValue
} else if (item.attrType == '试用密码') {
dataFrom.value.password2 = item.attrValue
}
}) })
if (dataFrom.value.password2 === '') { const dataFrom = ref({
dataFrom.value.password = '' linkName: '访问地址',
} link: '',
// } numberName: '试用账号',
} number: '',
const clickLink = (link) => { passwordName: '试用密码',
window.open(link) password: '**************************',
} password2: '',
// })
const copyFunction = (data, name) => { if (props.dataList.infoList) {
if (data !== '') { let obj = props.dataList.approveStatus
let url = data if (obj !== '通过' && whoShow1.value.itShowQingDao) {
let oInput = document.createElement('input') flag.value = false
oInput.value = url }
document.body.appendChild(oInput) dataFrom.value.link = props.dataList.link
oInput.select() // ; props.dataList.infoList.map((item) => {
console.log(oInput.value) if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
document.execCommand('Copy') // dataFrom.value.number = item.attrValue
oInput.remove() // } else if (item.attrType == '试用密码') {
message.success(name + '成功') dataFrom.value.password2 = item.attrValue
} else {
message.error('复制为空')
}
}
message.config({
top: '100px', //
})
// const success = () => {
// message.success({
// // content: 'This is a prompt message with custom className and style',
// className: 'custom-class',
// style: {},
// })
// }
watch(
() => props.dataList,
(val) => {
if (val) {
let obj = props.dataList.approveStatus
approveStatus.value = props.dataList.approveStatus
if (obj !== '通过' && whoShow1.value.itShowQingDao) {
flag.value = false
}
dataFrom.value.link = props.dataList.link
props.dataList.infoList.map((item) => {
if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
dataFrom.value.number = item.attrValue
} else if (item.attrType == '试用密码') {
dataFrom.value.password2 = item.attrValue
}
})
if (dataFrom.value.password2 === '') {
dataFrom.value.password = ''
} }
})
if (dataFrom.value.password2 === '') {
dataFrom.value.password = ''
}
// }
}
const clickLink = (link) => {
window.open(link)
}
//
const copyFunction = (data, name) => {
if (data !== '') {
let url = data
let oInput = document.createElement('input')
oInput.value = url
document.body.appendChild(oInput)
oInput.select() // ;
console.log(oInput.value)
document.execCommand('Copy') //
oInput.remove() //
message.success(name + '成功')
} else {
message.error('复制为空')
} }
} }
) message.config({
top: '100px', //
})
// const success = () => {
// message.success({
// // content: 'This is a prompt message with custom className and style',
// className: 'custom-class',
// style: {},
// })
// }
watch(
() => props.dataList,
(val) => {
if (val) {
let obj = props.dataList.approveStatus
if (obj !== '通过' && whoShow1.value.itShowQingDao) {
flag.value = false
}
dataFrom.value.link = props.dataList.link
props.dataList.infoList.map((item) => {
if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
dataFrom.value.number = item.attrValue
} else if (item.attrType == '试用密码') {
dataFrom.value.password2 = item.attrValue
}
})
if (dataFrom.value.password2 === '') {
dataFrom.value.password = ''
}
}
}
)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.algorithm-on-trial { .algorithm-on-trial {
padding: 0.8rem 0px 0.8rem; padding: 0.8rem 0px 0.8rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center;
.main {
margin-top: 0.3rem;
width: 13rem;
height: 2.5rem;
background: url('~@/assets/detailsAll/kfzj_sybg.png') no-repeat;
display: grid;
grid-template-columns: 33.33% 33.33% 33.33%;
align-items: center; align-items: center;
.main {
.main-left { margin-top: 0.3rem;
border-right: 0.01rem #ffffff solid; width: 13rem;
padding-left: 0.7rem; height: 2.5rem;
padding-right: 1rem; background: url('~@/assets/detailsAll/kfzj_sybg.png') no-repeat;
display: grid;
&>p { grid-template-columns: 33.33% 33.33% 33.33%;
overflow: hidden; align-items: center;
text-overflow: ellipsis; .main-left {
display: -webkit-box; border-right: 0.01rem #ffffff solid;
-webkit-line-clamp: 2; padding-left: 0.7rem;
word-break: break-all; padding-right: 1rem;
-webkit-box-orient: vertical; & > p {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
word-break: break-all;
-webkit-box-orient: vertical;
}
}
.main-center {
padding-left: 1rem;
padding-right: 1rem;
}
.main-right {
padding-right: 0.7rem;
}
& > div > p:first-child {
font-size: 0.26rem;
color: #ffffff;
font-weight: bold;
}
& > div > p:nth-child(2) {
font-size: 0.22rem;
color: #ffffff;
line-height: 0.34rem;
}
& > div:first-child > p:last-child {
text-decoration: underline;
word-wrap: break-word;
word-break: normal;
}
& > div > div:last-child {
height: 0.34rem;
width: 1.1rem;
border: 0.01rem solid #ffffff;
border-radius: 0.06rem;
font-size: 0.18rem;
color: #ffffff;
cursor: pointer;
text-align: center;
line-height: 0.34rem;
} }
} }
#zanwu {
.main-center {
padding-left: 1rem;
padding-right: 1rem;
}
.main-right {
padding-right: 0.7rem;
}
&>div>p:first-child {
font-size: 0.26rem;
color: #ffffff;
font-weight: bold;
}
&>div>p:nth-child(2) {
font-size: 0.22rem;
color: #ffffff;
line-height: 0.34rem;
}
&>div:first-child>p:last-child {
text-decoration: underline;
word-wrap: break-word;
word-break: normal;
}
&>div>div:last-child {
height: 0.34rem; height: 0.34rem;
width: 1.1rem; width: 1.1rem;
border: 0.01rem solid #ffffff; font-size: 0.24rem;
border-radius: 0.06rem;
font-size: 0.18rem;
color: #ffffff; color: #ffffff;
cursor: pointer; border: 0;
text-align: center;
line-height: 0.34rem;
} }
} }
#zanwu {
height: 0.34rem;
width: 1.1rem;
font-size: 0.24rem;
color: #ffffff;
border: 0;
}
}
.blur-word {
filter: blur(4px);
}
</style> </style>
<style> <style>
.custom-class { .custom-class {
/* top: 100px; */ /* top: 100px; */
} }
</style> </style>

View File

@ -41,8 +41,6 @@
<script setup> <script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle' import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { ref, defineProps, watch } from 'vue' import { ref, defineProps, watch } from 'vue'
const itShowXiHaiAn = whoShow.itShowXiHaiAn
console.log('2222', itShowXiHaiAn)
let dataFrom = ref({ let dataFrom = ref({
title: '部署与安全', title: '部署与安全',
@ -64,7 +62,7 @@
dataList: { type: Object, default: null }, dataList: { type: Object, default: null },
}) })
if (props.dataList.infoList) { if (props.dataList.infoList) {
if (!whoShow1.value.itShowQingDao && !whoShow1.value.itShowXiHaiAn) { if (!whoShow1.value.itShowQingDao) {
let obj = { let obj = {
attrType: '访问地址', attrType: '访问地址',
attrValue: props.dataList.link || '------', attrValue: props.dataList.link || '------',
@ -121,7 +119,7 @@
if (val) { if (val) {
dataFrom.value.content[0].childrenContent = [] dataFrom.value.content[0].childrenContent = []
dataFrom.value.content[1].childrenContent = [] dataFrom.value.content[1].childrenContent = []
if (!whoShow1.value.itShowQingDao && !itShowXiHaiAn) { if (!whoShow1.value.itShowQingDao) {
let obj = { let obj = {
attrType: '访问地址', attrType: '访问地址',
attrValue: props.dataList.link || '------', attrValue: props.dataList.link || '------',

View File

@ -8,7 +8,9 @@
></DetalsTitle> ></DetalsTitle>
</div> </div>
<!-- 青岛市局 --> <!-- 青岛市局 -->
<div style="width: 100%; display: flex; justify-content: center" <div
v-if="whoShow1 && whoShow1.itShowQingDao"
style="width: 100%; display: flex; justify-content: center"
> >
<div class="content"> <div class="content">
<div <div
@ -48,6 +50,29 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<!-- 其他 -->
<div v-else>
<div class="content">
<div
v-for="(item, index) in dataFrom.content"
:key="index"
class="content-card"
>
<div class="card-title">{{ item.childrenTitle }}</div>
<div class="card-content">
<div v-for="carditem in item.childrenContent" :key="carditem">
<div style="display: flex">
<span>{{ carditem.attrType }}</span>
<a-tooltip>
<template #title>{{ carditem.attrValue }}</template>
<span>{{ carditem.attrValue }}</span>
</a-tooltip>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</template> </template>

View File

@ -7,7 +7,9 @@
:type="dataFrom.englishTitle" :type="dataFrom.englishTitle"
></DetalsTitle> ></DetalsTitle>
</div> </div>
<div style="width: 100%; display: flex; justify-content: center" <div
v-if="whoShow1 && whoShow1.itShowQingDao"
style="width: 100%; display: flex; justify-content: center"
> >
<div class="content" v-for="item in dataFrom.content" :key="item.title"> <div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left"> <div class="content-left">
@ -115,6 +117,84 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div v-else>
<div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left">
<div class="left">
<div class="content-left-title">
<span>{{ item.title }}</span>
</div>
<div class="content-left-content">
<p>
<span>{{ item.link.name }}</span>
<a-tooltip>
<template #title>{{ item.linkValue }}</template>
<span>{{ item.linkValue }}</span>
</a-tooltip>
</p>
</div>
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<div @click="technicalNew()">新手指引</div>
</div>
</div>
<div class="content-right">
<div class="content-right-left">
<div class="content-right-title">{{ item.contact }}</div>
<div class="content-right-content">
<p>
<span>{{ item.facilitator.name }}</span>
<a-tooltip>
<template #title>{{ item.facilitator.value }}</template>
<span>{{ item.facilitator.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.people.name }}</span>
<a-tooltip>
<template #title>{{ item.people.value }}</template>
<span>{{ item.people.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.phone.name }}</span>
<a-tooltip>
<template #title>{{ item.phone.value }}</template>
<span>{{ item.phone.value }}</span>
</a-tooltip>
</p>
</div>
</div>
<div class="content-right-right">
<div class="content-right-title">{{ item.contact2 }}</div>
<div class="content-right-content">
<p>
<span>{{ item.facilitator2.name }}</span>
<a-tooltip>
<template #title>{{ item.facilitator2.value }}</template>
<span>{{ item.facilitator2.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.people2.name }}</span>
<a-tooltip>
<template #title>{{ item.people2.value }}</template>
<span>{{ item.people2.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.phone2.name }}</span>
<a-tooltip>
<template #title>{{ item.phone2.value }}</template>
<span>{{ item.phone2.value }}</span>
</a-tooltip>
</p>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</template> </template>

View File

@ -7,7 +7,9 @@
:type="dataFrom.englishTitle" :type="dataFrom.englishTitle"
></DetalsTitle> ></DetalsTitle>
</div> </div>
<div style="width: 100%; display: flex; justify-content: center" <div
v-if="whoShow1 && whoShow1.itShowQingDao"
style="width: 100%; display: flex; justify-content: center"
> >
<div class="content"> <div class="content">
<div class="content-card"> <div class="content-card">
@ -71,6 +73,41 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div v-else>
<div class="content">
<div class="content-card">
<div class="left">
<p>{{ dataFrom.linkName }}</p>
<a-tooltip>
<template #title>{{ dataFrom.link }}</template>
<p>{{ dataFrom.link }}</p>
</a-tooltip>
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<div @click="technicaltow()">新手指引</div>
</div>
</div>
<div class="content-card">
<div v-for="(item, index) in dataFrom.content" :key="index">
<div class="card-title">
{{ item.childrenTitle }}
</div>
<div class="card-content">
<div v-for="carditem in item.childrenContent" :key="carditem">
<div>
<span>{{ carditem.attrType }}</span>
<a-tooltip>
<template #title>{{ carditem.attrValue }}</template>
<span>{{ carditem.attrValue }}</span>
</a-tooltip>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</template> </template>

View File

@ -44,227 +44,214 @@
</template> </template>
<script setup> <script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle' import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { ref, defineProps, watch } from 'vue' import { ref, defineProps, watch } from 'vue'
const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png') const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
const dataFromLeft = ref({ const dataFromLeft = ref({
content: [ content: [
{ {
type: '服务类型', type: '服务类型',
values: '', values: '',
}, },
{ {
type: '覆盖区域', type: '覆盖区域',
values: '', values: '',
}, },
{ {
type: '切片策略', type: '切片策略',
values: '', values: '',
}, },
], ],
}) })
const dataFromCenter = ref({ const dataFromCenter = ref({
content: [ content: [
{ {
type: '坐标系', type: '坐标系',
values: '', values: '',
}, },
{ {
type: '切片尺寸', type: '切片尺寸',
values: '', values: '',
}, },
{ {
type: '最小级别', type: '最小级别',
values: '', values: '',
}, },
], ],
}) })
const dataFromRight = ref({ const dataFromRight = ref({
content: [ content: [
{ {
type: '图层名称', type: '图层名称',
values: '', values: '',
}, },
{ {
type: '最大级别', type: '最大级别',
values: '', values: '',
}, },
], ],
}) })
// //
const props = defineProps({ const props = defineProps({
dataList: { type: Object, default: null }, dataList: { type: Object, default: null },
}) })
const flag = ref(true) const flag = ref(true)
if (props.dataList.infoList) { if (props.dataList.infoList) {
let obj = props.dataList.infoList.filter( let obj = props.dataList.infoList.filter(
(item) => (item) =>
item.attrType === '服务类型' || item.attrType === '服务类型' ||
item.attrType === '覆盖区域' || item.attrType === '覆盖区域' ||
item.attrType === '切片策略' || item.attrType === '切片策略' ||
item.attrType === '坐标系' || item.attrType === '坐标系' ||
item.attrType === '切片尺寸' || item.attrType === '切片尺寸' ||
item.attrType === '最小级别' || item.attrType === '最小级别' ||
item.attrType === '数据范围' || item.attrType === '数据范围' ||
item.attrType === '图层类型' || item.attrType === '图层类型' ||
item.attrType === '最大级别' item.attrType === '最大级别'
)[0] )[0]
if (!obj) { if (!obj) {
flag.value = false flag.value = false
} else { } else {
// dataFrom.value.content[0].link.value = props.dataList.apiUrl // dataFrom.value.content[0].link.value = props.dataList.apiUrl
// dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts // dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
console.log('dataList', props.dataList) console.log('dataList', props.dataList)
props.dataList.infoList.map((item) => { props.dataList.infoList.map((item) => {
handleInfoList(item) if (item.attrType === '服务类型') {
}) dataFromLeft.value.content[0].values = item.attrValue || '123'
} } else if (item.attrType === '覆盖区域') {
} dataFromLeft.value.content[1].values = item.attrValue || '--'
const handleInfoList = (item) => { } else if (item.attrType === '切片策略') {
if (item.attrType === '服务类型') { dataFromLeft.value.content[2].values = item.attrValue || '--'
dataFromLeft.value.content[0].values = item.attrValue || '123' } else if (item.attrType === '坐标系') {
} else if (item.attrType === '覆盖区域') { dataFromCenter.value.content[0].values = item.attrValue || '--'
dataFromLeft.value.content[1].values = item.attrValue || '--' } else if (item.attrType === '切片尺寸') {
} else if (item.attrType === '切片策略') { dataFromCenter.value.content[1].values = item.attrValue || '--'
dataFromLeft.value.content[2].values = item.attrValue || '--' } else if (item.attrType === '最小级别') {
} else if (item.attrType === '坐标系') { dataFromCenter.value.content[2].values = item.attrValue || '--'
dataFromCenter.value.content[0].values = item.attrValue || '--' } else if (item.attrType === '数据范围') {
} else if (item.attrType === '切片尺寸') { dataFromRight.value.content[0].values = item.attrValue || '--'
dataFromCenter.value.content[1].values = item.attrValue || '--' } else if (item.attrType === '图层类型') {
} else if (item.attrType === '最小级别') { dataFromRight.value.content[1].values = item.attrValue || '--'
dataFromCenter.value.content[2].values = item.attrValue || '--' } else if (item.attrType === '最大级别') {
} else if (item.attrType === '数据范围') { dataFromRight.value.content[2].values = item.attrValue || '--'
dataFromRight.value.content[0].values = item.attrValue || '--' }
} else if (item.attrType === '图层类型') { })
dataFromRight.value.content[1].values = item.attrValue || '--'
} else if (item.attrType === '最大级别') {
if (dataFromRight.value.content && dataFromRight.value.content[2]) {
dataFromRight.value.content[2].values = item.attrValue || '--'
} }
} }
} watch(
watch( () => props.dataList,
() => props.dataList, (val) => {
(val) => { if (val) {
if (val) { let obj = val.infoList.filter(
let obj = val.infoList.filter( (item) =>
(item) => item.attrType === '服务类型' ||
item.attrType === '服务类型' || item.attrType === '覆盖区域' ||
item.attrType === '覆盖区域' || item.attrType === '切片策略' ||
item.attrType === '切片策略' || item.attrType === '坐标系' ||
item.attrType === '坐标系' || item.attrType === '切片尺寸' ||
item.attrType === '切片尺寸' || item.attrType === '最小级别' ||
item.attrType === '最小级别' || item.attrType === '数据范围' ||
item.attrType === '数据范围' || item.attrType === '图层类型' ||
item.attrType === '图层类型' || item.attrType === '最大级别'
item.attrType === '最大级别' )[0]
)[0] if (!obj) {
if (!obj) { flag.value = false
flag.value = false } else {
} else { // dataFrom.value.content[0].link.value = val.apiUrl
console.log('dataList', val) // dataFrom.value.content[0].facilitator.value = val.deptContacts
val.infoList.map((item) => { console.log('dataList', val)
handleInfoList(item) val.infoList.map((item) => {
// if (item.attrType === '') { if (item.attrType === '服务类型') {
// dataFromLeft.value.content[0].values = item.attrValue || '123' dataFromLeft.value.content[0].values = item.attrValue || '123'
// } else if (item.attrType === '') { } else if (item.attrType === '覆盖区域') {
// dataFromLeft.value.content[1].values = item.attrValue || '--' dataFromLeft.value.content[1].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '切片策略') {
// dataFromLeft.value.content[2].values = item.attrValue || '--' dataFromLeft.value.content[2].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '坐标系') {
// dataFromCenter.value.content[0].values = item.attrValue || '--' dataFromCenter.value.content[0].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '切片尺寸') {
// dataFromCenter.value.content[1].values = item.attrValue || '--' dataFromCenter.value.content[1].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '最小级别') {
// dataFromCenter.value.content[2].values = item.attrValue || '--' dataFromCenter.value.content[2].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '数据范围') {
// dataFromRight.value.content[0].values = item.attrValue || '--' dataFromRight.value.content[0].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '图层类型') {
// dataFromRight.value.content[1].values = item.attrValue || '--' dataFromRight.value.content[1].values = item.attrValue || '--'
// } else if (item.attrType === '') { } else if (item.attrType === '最大级别') {
// if (dataFromRight.value.content && dataFromRight.value.content[2]) { dataFromRight.value.content[2].values = item.attrValue || '--'
// dataFromRight.value.content[2].values = item.attrValue || '--' }
// } })
// } }
})
} }
} }
} )
)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.usage-mode { .usage-mode {
display: flex;
flex-direction: column;
align-items: center;
padding: 0.8rem 0;
.content {
margin-top: 0.3rem;
display: flex; display: flex;
flex-direction: column;
.content-left { align-items: center;
height: 2.8rem; padding: 0.8rem 0;
width: 13rem; .content {
background: url('~@/assets/detailsAll/layer-service/layer-bg.png'); margin-top: 0.3rem;
background-size: 100% 100%;
background-repeat: no-repeat;
border-radius: 0.1rem;
box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
display: flex; display: flex;
align-items: center; .content-left {
padding: 0 0.35rem; height: 2.8rem;
width: 13rem;
.content-left-content { background: url('~@/assets/detailsAll/layer-service/layer-bg.png');
width: 100%; background-size: 100% 100%;
font-size: 0.2rem; background-repeat: no-repeat;
color: rgba(33, 41, 86, 0.8); border-radius: 0.1rem;
line-height: 0.2rem; box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
padding: 0 0.35rem;
ul { .content-left-content {
padding: 0; width: 100%;
margin: 0; font-size: 0.2rem;
} color: rgba(33, 41, 86, 0.8);
line-height: 0.2rem;
ul li {
list-style: none;
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 0.3rem; ul {
line-height: 0.25rem; padding: 0;
} margin: 0;
}
img { ul li {
margin: 0 0.2rem 0 0; list-style: none;
width: 0.15rem; display: flex;
height: 0.15rem; align-items: center;
} margin-bottom: 0.3rem;
line-height: 0.25rem;
span { }
font-size: 0.2rem; img {
color: #666666; margin: 0 0.2rem 0 0;
display: block; width: 0.15rem;
margin-right: 0.5rem; height: 0.15rem;
width: 120px; }
} span {
font-size: 0.2rem;
p { color: #666666;
width: 2rem; display: block;
margin-bottom: 0; margin-right: 0.5rem;
font-size: 0.2rem; width: 120px;
color: #333333; }
display: -webkit-box; p {
overflow: hidden; width: 2rem;
-webkit-line-clamp: 1; margin-bottom: 0;
-webkit-box-orient: vertical; font-size: 0.2rem;
word-break: break-all; color: #333333;
display: -webkit-box;
overflow: hidden;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
} }
} }
} }
} }
}
</style> </style>

View File

@ -7,7 +7,9 @@
:type="dataFrom.englishTitle" :type="dataFrom.englishTitle"
></DetalsTitle> ></DetalsTitle>
</div> </div>
<div style="width: 100%; display: flex; justify-content: center" <div
v-if="whoShow1 && whoShow1.itShowQingDao"
style="width: 100%; display: flex; justify-content: center"
> >
<div class="content" v-for="item in dataFrom.content" :key="item.title"> <div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left"> <div class="content-left">
@ -126,6 +128,86 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div v-else>
<div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left">
<div class="left">
<a-tooltip>
<template #title>{{ item.linkValue }}</template>
<p @click="ServiceAddressFunction(item.linkValue)">
服务地址
{{ item.linkValue }}
</p>
</a-tooltip>
<a-tooltip>
<template #title>{{ item.csslinkValue }}</template>
<p @click="ServiceAddressFunction(item.csslinkValue)">
样式服务地址
{{ item.csslinkValue }}
</p>
</a-tooltip>
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<div @click="technicalNew()">新手指引</div>
</div>
</div>
<div class="content-right">
<div class="content-right-left">
<div class="content-right-title">{{ item.contact }}</div>
<div class="content-right-content">
<p>
<span>{{ item.facilitator.name }}</span>
<a-tooltip>
<template #title>{{ item.facilitator.value }}</template>
<span>{{ item.facilitator.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.people.name }}</span>
<a-tooltip>
<template #title>{{ item.people.value }}</template>
<span>{{ item.people.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.phone.name }}</span>
<a-tooltip>
<template #title>{{ item.phone.value }}</template>
<span>{{ item.phone.value }}</span>
</a-tooltip>
</p>
</div>
</div>
<div class="content-right-right">
<div class="content-right-title">{{ item.contact2 }}</div>
<div class="content-right-content">
<p>
<span>{{ item.facilitator2.name }}</span>
<a-tooltip>
<template #title>{{ item.facilitator2.value }}</template>
<span>{{ item.facilitator2.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.people2.name }}</span>
<a-tooltip>
<template #title>{{ item.people2.value }}</template>
<span>{{ item.people2.value }}</span>
</a-tooltip>
</p>
<p>
<span>{{ item.phone2.name }}</span>
<a-tooltip>
<template #title>{{ item.phone2.value }}</template>
<span>{{ item.phone2.value }}</span>
</a-tooltip>
</p>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</template> </template>

View File

@ -89,15 +89,11 @@
</span> </span>
<span>{{ val.type }}</span> <span>{{ val.type }}</span>
</div> </div>
<!-- (item.note1 && JSON.parse(item.note1) &&
JSON.parse(item.note1)[0] &&
JSON.parse(item.note1)[0].channelName -->
<div class="description"> <div class="description">
{{ {{
val.description || val.description ||
((val.note1 || '') && ((val.note1 || '') &&
(JSON.parse(val.note1) && JSON.parse(val.note1)[0] && JSON.parse(val.note1)[0].channelName || '--') + (JSON.parse(val.note1)[0].channelName || '--') +
'等' + '等' +
JSON.parse(val.note1).length + JSON.parse(val.note1).length +
'个摄像头') || '个摄像头') ||

File diff suppressed because it is too large Load Diff

View File

@ -156,11 +156,8 @@
class="modal-box" class="modal-box"
title="请选择" title="请选择"
:visible="showAddModal" :visible="showAddModal"
ok-text="确认" :onOk="handleOk"
cancel-text="取消" :onCancel="handleCancel"
@ok="handleOk"
@cancel="handleCancel"
> >
<a-table <a-table
:columns="columns" :columns="columns"
@ -655,14 +652,7 @@
} }
</script> </script>
<style>
.ant-modal-footer {
display: block;
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
.bg { .bg {
background: #fff; background: #fff;
height: 100vh; height: 100vh;

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,19 @@
<template> <template>
<div class="box"> <div class="box">
<div class="CanCase"> <div class="CanCase">
<div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)"> <div
<a-image :preview="false" :src=" class="caseBox"
item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0] v-for="(item, index) in caseList"
.attrValue :key="index"
" /> @click="toView(item)"
>
<a-image
:preview="false"
:src="
item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
.attrValue
"
/>
<h3>{{ item.name }}</h3> <h3>{{ item.name }}</h3>
<p>发布时间 {{ item.updateDate }}</p> <p>发布时间 {{ item.updateDate }}</p>
</div> </div>
@ -13,83 +21,68 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue' import { ref, onMounted, onBeforeUnmount } from 'vue'
import { defineProps } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
const router = useRouter() const router = useRouter()
const props = defineProps({ const props = defineProps({
resourceList: { resourceList: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
selectCardsname: { selectCardsname: {
type: String, type: String,
default: '组件服务', default: '组件服务',
},
})
const emits = defineEmits(['saveSearchCodition'])
const caseList = ref([])
onMounted(() => {
caseList.value = props.resourceList.data
console.log('caseList.value------------>', caseList.value);
})
onBeforeUnmount(() => { })
function toView(item) {
emits('saveSearchCodition', 1)
router.push({
path: '/integrationServicesDetails',
query: {
id: item.id,
}, },
}) })
} const caseList = ref([])
watch( onMounted(() => {
() => props.resourceList.data, caseList.value = props.resourceList.data
(val) => { console.log(caseList.value, 'caseList.value')
if (val) { })
caseList.value = val onBeforeUnmount(() => {})
} function toView(item) {
router.push({
path: '/integrationServicesDetails',
query: {
id: item.id,
},
})
} }
)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.box { .box {
.CanCase { .CanCase {
margin-top: 0.2rem; margin-top: 0.2rem;
display: grid; display: grid;
grid-template-columns: 33.33% 33.33% 33.33%; grid-template-columns: 33.33% 33.33% 33.33%;
align-items: center; align-items: center;
justify-items: center; justify-items: center;
.caseBox {
.caseBox { width: 3.5rem;
width: 3.5rem; height: 3rem;
height: 3rem; box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152); background: #ffffff;
background: #ffffff; border-radius: 0.05rem;
border-radius: 0.05rem; padding: 0.2rem;
padding: 0.2rem; margin-bottom: 0.2rem;
margin-bottom: 0.2rem; cursor: pointer;
cursor: pointer; img {
width: 3rem;
img { height: 1.8rem;
width: 3rem; }
height: 1.8rem; h3 {
} font-size: 0.18rem;
font-weight: bold;
h3 { margin-top: 0.1rem;
font-size: 0.18rem; }
font-weight: bold; p {
margin-top: 0.1rem; font-size: 0.16rem;
} color: #797979;
}
p {
font-size: 0.16rem;
color: #797979;
} }
} }
} }
}
</style> </style>

View File

@ -1,46 +0,0 @@
<template>
<div class="tag-box">
<div class="tag-item" v-for="(item, index) in tagList" :key="index">
{{item}}
</div>
</div>
</template>
<script setup>
import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
import { useRouter } from 'vue-router'
const router = useRouter()
const props = defineProps({
componentServiceTagList: {
type: Object,
default: () => { },
},
})
const tagList = ref([])
onMounted(() => {
tagList.value = props.componentServiceTagList
})
watch(
() => props.componentServiceTagList,
(val) => {
if (val) {
tagList.value = val
}
}
)
</script>
<style lang="less" scoped>
.tag-item {
font-family: 'Alibaba PuHuiTi';
font-weight: 400;
border-radius: 0.12rem;
margin: 0 10px;
padding: 2px 8px;
font-size: 12px;
color: #0087ff;
background: rgba(0, 88, 225, 0.1);
}
</style>

View File

@ -23,8 +23,8 @@
> >
{{ item.name }} {{ item.name }}
</div> </div>
<!-- 购物车 --> <a-badge :count="sgcNum">
<!-- <a-badge :count="sgcNum"> <!-- 购物车 -->
<svg <svg
t="1650455446850" t="1650455446850"
class="icon" class="icon"
@ -42,7 +42,8 @@
p-id="2070" p-id="2070"
></path> ></path>
</svg> </svg>
</a-badge> --> <!-- <a-avatar shape="square" size="large" /> -->
</a-badge>
<a-badge :count="mynoticeNum" style="margin-left: 0.2rem"> <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
<!-- 消息提醒 --> <!-- 消息提醒 -->
<svg <svg
@ -130,13 +131,21 @@
import { getSgcTotal } from '@/api/home' import { getSgcTotal } from '@/api/home'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
import { message } from 'ant-design-vue'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
// const navListManagement = ref([
// { name: '', key: 'home' },
// { name: '', key: 'DetailsPageconetent' },
// { name: '', key: 'capabilityCloud' },
// { name: '', key: 'abilityStatistics' },
// { name: '', key: 'developmentGuide' },
// { name: '', key: 'demandCenter' },
// // { name: '', key: 'personalCenter' },
// { name: '', key: 'mapTest' },
// // { name: '', key: 'houtaiguanli' },
// { name: '', key: 'assignCase' },
// ])
const whoShow1 = whoShow const whoShow1 = whoShow
const user = ref({ const user = ref({
username: store.getters['user/username'], username: store.getters['user/username'],
@ -181,10 +190,6 @@
} }
// //
const jumpPage = (item) => { const jumpPage = (item) => {
let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
if(_arr.includes(item.name)) {
return message.warn('正在建设中!')
}
// console.log(item) // console.log(item)
select.value = item.key select.value = item.key
switch (item.name) { switch (item.name) {
@ -203,7 +208,7 @@
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB select: '组件服务',
}, },
}) })
break break
@ -250,6 +255,10 @@
case '融合服务': case '融合服务':
router.push({ router.push({
path: '/integrationServices', path: '/integrationServices',
// path: '/DetailsPageconetent',
query: {
select: '融合服务',
},
}) })
break break
case 'CIM专区': case 'CIM专区':

View File

@ -1,100 +0,0 @@
<template>
<ul class="integrationServiceOrder">
<li v-for="(item, i) in integrationOrderList" :key="i" @click="
changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
">
{{ item.name }}
<span class="arrow" :class="
integrationOrder.orderType == 'ASC' &&
integrationOrder.orderField == item.value
? 'down'
: ''
"></span>
</li>
</ul>
</template>
<script setup>
import { ref, reactive, nextTick, defineExpose } from 'vue'
import mybus from '@/myplugins/mybus'
const orderList = [
{
value: 'apply_count',
name: '申请量',
orderType: 'DESC',
},
{
value: 'collectCount',
name: '收藏量',
orderType: 'DESC',
},
{
value: 'create_date',
name: '发布时间',
orderType: 'DESC',
},
{
value: 'update_date',
name: '更新时间',
orderType: 'DESC',
},
]
const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
const integrationOrder = reactive({
orderField: '',
orderType: '',
})
// --
const changeOrder = (i, val, type) => {
console.log('i, val, type------------>', i, val, type);
integrationOrder.orderField = val
integrationOrder.orderType = type;
// 0 apply_count ASC
let _index = integrationOrderList.value.findIndex(x => x.value = val)
if (_index > -1) {
integrationOrderList.value[_index].orderType = type
}
mybus.emit('changeCondition', {
orderField: val,
orderType: type,
})
}
const reset = () => {
integrationOrderList.value = JSON.parse(JSON.stringify(orderList))
integrationOrder.orderField = ''
integrationOrder.orderType = ''
}
defineExpose({
reset,
})
</script>
<style lang="less" scoped>
.integrationServiceOrder {
display: flex;
li {
width: 90px;
height: 12px;
text-align: center;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
.arrow {
display: inline-block;
width: 12px;
height: 12px;
background: url('~@/assets/newHome/arrow.png');
margin-left: 10px;
}
.down {
background: url('~@/assets/newHome/down.png');
margin-top: 6px;
}
}
}
</style>

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +1,12 @@
export const titleNameArray = [ export const titleNameArray = [
{
photo: require('@/assets/newHome/banner-yy.png'),
name: '应用资源',
},
{ {
photo: require('@/assets/newHome/banner-zj.png'), photo: require('@/assets/newHome/banner-zj.png'),
name: '组件服务', name: '组件服务',
}, },
{
photo: require('@/assets/newHome/banner-yy.png'),
name: '应用资源',
},
{ {
photo: require('@/assets/newHome/banner-jc.png'), photo: require('@/assets/newHome/banner-jc.png'),
name: '基础设施', name: '基础设施',

View File

@ -1,34 +0,0 @@
<template>
<div class="detail-back" @click="previousPage" :style="{ color: textColor }">
</div>
</template>
<script setup>
import { reactive, ref, watch, defineProps } from 'vue'
import { useRouter } from 'vue-router'
const router = useRouter()
console.log('router------------>', router)
const props = defineProps({
textColor: { type: String, default: '' },
})
const previousPage = () => {
window.history.go(-1)
}
</script>
<style scoped lang="less">
.detail-back {
position: absolute;
top: 0.85rem;
left: 100px;
font-size: 0.18rem;
color: #fff;
cursor: pointer;
width: 50px;
height: 50px;
background-image: url('~@/assets/detailsAll/back.png');
background-size: 100% 100%;
}
</style>

View File

@ -9,7 +9,6 @@
<div> <div>
<div id="apply-container"> <div id="apply-container">
<home-header :showView="showView"></home-header> <home-header :showView="showView"></home-header>
<detail-back></detail-back>
<details-view v-if="showView === 'details-view'"></details-view> <details-view v-if="showView === 'details-view'"></details-view>
<algorithm-details <algorithm-details
v-else-if="showView === 'algorithm-details'" v-else-if="showView === 'algorithm-details'"
@ -39,7 +38,6 @@
import DeveloperComponents from '@/views/detailsAll/DeveloperComponents' import DeveloperComponents from '@/views/detailsAll/DeveloperComponents'
import BusinessDetails from '@/views/detailsAll/BusinessDetails' import BusinessDetails from '@/views/detailsAll/BusinessDetails'
import LayerService from '@/views/detailsAll/LayerService' import LayerService from '@/views/detailsAll/LayerService'
import detailBack from '@/views/home/detailBack.vue'
import { selectOne } from '@/api/home' import { selectOne } from '@/api/home'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
export default defineComponent({ export default defineComponent({
@ -54,7 +52,6 @@
DeveloperComponents, DeveloperComponents,
BusinessDetails, BusinessDetails,
LayerService, LayerService,
detailBack
}, },
setup() { setup() {
const formState = reactive({ const formState = reactive({
@ -166,7 +163,6 @@
} }
} }
init() init()
return { return {
formState, formState,
options, options,

View File

@ -100,8 +100,6 @@
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { UpOutlined, DownOutlined } from '@ant-design/icons-vue' import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
export default defineComponent({ export default defineComponent({
setup() { setup() {
const selectedKeys = ref([]) const selectedKeys = ref([])
@ -120,7 +118,7 @@
'router.currentRoute.value.query.select', 'router.currentRoute.value.query.select',
router.currentRoute.value.query.select router.currentRoute.value.query.select
) )
let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB let select = router.currentRoute.value.query.select
if (select === '123') { if (select === '123') {
select = '' select = ''
} }

File diff suppressed because it is too large Load Diff

View File

@ -5,8 +5,13 @@
<div class="top"> <div class="top">
<div class="top-title"> <div class="top-title">
全部 全部
<div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)" <div
:class="{ sel: index == number }"> v-for="(item, index) in titleName"
:key="index"
class="tabAll"
@click="changeCards(index)"
:class="{ sel: index == number }"
>
<span> <span>
{{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }} {{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
</span> </span>
@ -15,26 +20,54 @@
<div class="resultListSearchInput-father" v-if="number === 0"> <div class="resultListSearchInput-father" v-if="number === 0">
<div class="resultListSearchInput-son"> <div class="resultListSearchInput-son">
模糊搜索 模糊搜索
<a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large" <a-input-search
@search="getIntegrationList" @change="onSearch" class="resultListSearchInput" /> v-model:value="searchValue"
<button class="button-reset" @click="resetAction()">重置</button> placeholder="请输入关键词"
enter-button="搜索"
size="large"
@search="getAppResources"
@change="onSearch"
class="resultListSearchInput"
/>
<button class="button-reset" @click="chongzhi()">重置</button>
<div class="hengxian"></div> <div class="hengxian"></div>
</div> </div>
</div> </div>
<div v-loading="loadingData"> <div v-loading="loadingData">
<searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0" <searchResultList
:resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition" v-if="number === 0"
ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" /> v-show="resourceList.data && resourceList.data.length > 0"
<CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList" :key="listKey2"
@saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal" :resourceList="resourceList"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'" /> :resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
/>
<CanAssignCase
v-else
v-show="resourceList.data && resourceList.data.length > 0"
:key="listKey2"
:resourceList="resourceList"
:resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
/>
<div class="pagination"> <div class="pagination">
<a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage" <a-pagination
v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper v-if="resourceList.data && resourceList.data.length > 0"
:total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange" v-model:current="currentPage"
@showSizeChange="onShowSizeChange" /> v-model:pageSize="currentPageSize"
show-size-changer
show-less-items
show-quick-jumper
:total="resourceTotal"
:page-size-options="pageSizeOptions"
@change="pageChange"
@showSizeChange="onShowSizeChange"
/>
</div> </div>
<div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem"> <div
v-if="resourceList.data && resourceList.data.length <= 0"
style="margin-top: 2rem"
>
<a-empty /> <a-empty />
</div> </div>
</div> </div>
@ -43,357 +76,342 @@
<home-footer></home-footer> <home-footer></home-footer>
</template> </template>
<script> <script>
import HomeFooter from '@/views/newHome/components/Footer' import HomeFooter from '@/views/newHome/components/Footer'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue' import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
import { getIntegrationServicesList } from '@/api/home.js'
import { useRouter } from 'vue-router'
import HomeHeader from '@/views/home/components/header'
import searchResultList from '@/views/home/components/searchResultList.vue'
import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
import { message } from 'ant-design-vue'
export default defineComponent({ import { getIntegrationServicesList } from '@/api/home.js'
beforeRouteLeave(to, from, next) { import { useRouter } from 'vue-router'
console.log('to---integrationServices--beforeRouteLeave------->', to) import HomeHeader from '@/views/home/components/header'
console.log('from---integrationServices--beforeRouteLeave------->', from) import searchResultList from '@/views/home/components/searchResultList.vue'
console.log('next---integrationServices--beforeRouteLeave------->', next) import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') { import { message } from 'ant-design-vue'
localStorage.removeItem('integrationServices')
}
next()
},
setup() {
//
const loading = ref(true)
const currentPage = ref(1)
const currentPageSize = ref(5)
const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
const router = useRouter()
const select = router.currentRoute.value.query.select
const searchValue = ref('')
const Cardsname = ref(select)
const resourceList = reactive({ data: [] })
const resourceTotal = ref(0)
const loadingData = ref(false)
//
const titleName = ref([
{
name: '打包模式',
},
{
name: '赋能场景',
},
])
const number = ref(0)
//
const paramsGetResources = {
page: currentPage.value,
limit: currentPageSize.value,
type: titleName.value[number.value].name,
name: searchValue.value,
orderField: 'create_date',
orderType: 'DESC', // ASC DESC
}
const searchResultListDom = ref(null)
const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
//
const handleSetSearchData = () => {
if (storageSearchInfo) {
number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
//
searchValue.value = storageSearchInfo.name;
currentPage.value = storageSearchInfo.page;
currentPageSize.value = storageSearchInfo.limit;
paramsGetResources.limit = storageSearchInfo.limit;
paramsGetResources.page = storageSearchInfo.page;
paramsGetResources.type = storageSearchInfo.type;
// 使
nextTick(() => {
searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
value: storageSearchInfo.orderField,
orderType: storageSearchInfo.orderType,
}, true)
})
getIntegrationList()
}
}
const changeCards = (val) => { export default defineComponent({
// setup() {
number.value = val;
paramsGetResources.type = titleName.value[number.value].name;
resetAction()
}
//
const onSearch = () => {
currentPage.value = 1
getIntegrationList()
}
//
const resetAction = () => {
//
searchValue.value = ''
// //
currentPage.value = 1 const loading = ref(true)
currentPageSize.value = 5 const currentPage = ref(1)
// const currentPageSize = ref(10)
paramsGetResources.page = 1 const pageSizeOptions = ref(['5', '10', '20', '50'])
paramsGetResources.limit = 5 const router = useRouter()
paramsGetResources.orderField = 'create_date' const select = router.currentRoute.value.query.select
paramsGetResources.orderType = 'DESC' const searchValue = ref('')
const Cardsname = ref(select)
mybus.emit('resetAction', { const resourceList = reactive({ data: [] })
type: titleName.value[number.value].name, const resourceTotal = ref(0)
}) const current = ref(1)
getIntegrationList() const loadingData = ref(false)
} //
const titleName = ref([
// {
const getIntegrationList = () => { name: '打包模式',
loadingData.value = true
paramsGetResources.name = searchValue.value;
console.log('paramsGetResources------参数下发------>', paramsGetResources);
getIntegrationServicesList(paramsGetResources).then(
(res) => {
loadingData.value = false
if (res.data.code !== 0) {
return message.error(res.data.msg)
}
resourceList.data = res.data.data.list || []
resourceTotal.value = res.data.data.total || 0
}, },
(err) => { {
loadingData.value = false name: '赋能场景',
message.error(err) },
} ])
)
}
mybus.on('paramsGetResources', (ids) => { const number = ref(0)
if (ids && ids.length > 0) { //
paramsGetResources.deptIds = ids let listKey = ref(0)
} else { //
delete paramsGetResources.deptIds const listKey2 = ref(0)
//
const paramsGetResources = {
pageNum: 1,
pageSize: currentPageSize.value,
type: titleName.value[number.value].name,
name: '',
orderField: 'create_date', // total visits 访 applyCount score collectCount
orderType: 'DESC', // ASC DESC
} }
getIntegrationList()
})
mybus.on('changePage', (page) => { const changeCards = (val) => {
paramsGetResources.page = page console.log(val)
getIntegrationList() number.value = val
}) chongzhi()
}
mybus.on('changeSelcted', () => { //
getIntegrationList() const onSearch = () => {
}) loading.value = true
currentPage.value = 1
}
//
const chongzhi = () => {
loading.value = true
//
searchValue.value = ''
//
currentPage.value = 1
currentPageSize.value = 10
//
paramsGetResources.pageNum = 1
paramsGetResources.pageSize = 10
paramsGetResources.orderField = 'create_date'
paramsGetResources.orderType = 'DESC'
mybus.emit('chongzhi', {
type: titleName.value[number.value].name,
})
getAppResources()
}
mybus.on('refresh', () => { const getAppResources = () => {
paramsGetResources.page = 1
currentPage.value = 1
getIntegrationList()
})
mybus.on('changeCondition', (condition) => {
paramsGetResources.orderField = condition.orderField
paramsGetResources.orderType = condition.orderType
getIntegrationList()
})
const pageChange = (val) => {
currentPage.value = val
paramsGetResources.page = val
getIntegrationList() //
}
//
const onShowSizeChange = (current, pageSize) => {
currentPage.value = current
currentPageSize.value = pageSize
paramsGetResources.page = current
paramsGetResources.limit = pageSize
getIntegrationList()
}
//
const saveSearchCodition = (n) => {
console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
localStorage.setItem(
'integrationServices',
JSON.stringify(paramsGetResources)
)
}
onMounted(() => {
if (storageSearchInfo) {
handleSetSearchData()
} else {
getIntegrationList() getIntegrationList()
} }
})
return { //
searchValue, const getIntegrationList = () => {
currentPage, loadingData.value = true
resourceList, console.log('获取融合服务列表------------>')
resourceTotal, let postData = {
pageChange, limit: currentPageSize.value,
Cardsname, page: currentPage.value,
getIntegrationList, orderField: paramsGetResources.orderField,
resetAction, orderType: paramsGetResources.orderType,
onSearch, name: searchValue.value,
currentPageSize, type: titleName.value[number.value].name,
pageSizeOptions, }
loading, getIntegrationServicesList(postData).then(
titleName, (res) => {
changeCards, loadingData.value = false
number, if (res.data.code !== 0) {
loadingData, return message.error(res.data.msg)
onShowSizeChange, }
saveSearchCodition, console.log('res.data------------>', res.data)
searchResultListDom,
} resourceList.data = res.data.data.list || []
}, resourceTotal.value = res.data.data.total || 0
components: { listKey2.value++
HomeHeader, },
HomeFooter, (err) => {
searchResultList, loadingData.value = false
CanAssignCase, message.error(err)
}, }
beforeUnmount() { )
mybus.off('paramsGetResources') }
mybus.off('changeCondition')
mybus.off('refresh') mybus.on('paramsGetResources', (ids) => {
mybus.off('changePage') if (ids && ids.length > 0) {
}, paramsGetResources.deptIds = ids
}) } else {
delete paramsGetResources.deptIds
}
getAppResources()
console.log('paramsGetResources', paramsGetResources)
})
mybus.on('changePage', (page) => {
paramsGetResources.pageNum = page
getAppResources('分页查询')
})
mybus.on('changeSelcted', () => {
getAppResources()
})
mybus.on('refresh', () => {
paramsGetResources.pageNum = 1
currentPage.value = 1
getAppResources()
})
mybus.on('changeCondition', (condition) => {
paramsGetResources.orderField = condition.orderField
paramsGetResources.orderType = condition.orderType
getAppResources()
})
const pageChange = (val) => {
console.log(val)
loading.value = true
currentPage.value = val
paramsGetResources.pageNum = val
let params = '分页查询' //
getAppResources(params)
}
onMounted(() => {
console.log('222----onMounted-------->', 222)
listKey2.value++
getAppResources()
})
//
const onShowSizeChange = (current, pageSize) => {
currentPage.value = current
currentPageSize.value = pageSize
paramsGetResources.pageNum = current
paramsGetResources.pageSize = pageSize
getAppResources()
}
watch(currentPageSize, () => {
console.log('pageSize', currentPageSize.value)
})
return {
listKey,
searchValue,
currentPage,
resourceList,
resourceTotal,
pageChange,
listKey2,
Cardsname,
getAppResources,
chongzhi,
onSearch,
currentPageSize,
pageSizeOptions,
current,
loading,
titleName,
changeCards,
number,
loadingData,
}
},
components: {
HomeHeader,
HomeFooter,
searchResultList,
CanAssignCase,
},
beforeUnmount() {
mybus.off('paramsGetResources')
mybus.off('changeCondition')
mybus.off('refresh')
mybus.off('changePage')
},
})
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.resultListSearchInput-father { .resultListSearchInput-father {
background: #f3f5f9; background: #f3f5f9;
padding: 0.2rem; padding: 0.2rem;
.resultListSearchInput-son { // padding-left: 0.2rem;
background: #fff; // padding-top: 0.2rem;
padding: 0.2rem 0.2rem 0rem 0.3rem; .resultListSearchInput-son {
background: #fff;
padding: 0.2rem 0.2rem 0rem 0.3rem;
.hengxian { .hengxian {
width: 100%; width: 100%;
height: 0.01rem; height: 0.01rem;
background: rgba(150, 144, 144, 0.3); background: rgba(150, 144, 144, 0.3);
margin-top: 0.2rem; margin-top: 0.2rem;
}
} }
} }
}
.resultListSearchInput { .resultListSearchInput {
margin-left: 0.1rem; margin-left: 0.1rem;
:deep(.ant-input) { :deep(.ant-input) {
width: 4rem; width: 4rem;
height: 0.36rem; height: 0.36rem;
background: #fff; background: #fff;
border-radius: 0.04rem; border-radius: 0.04rem;
}
:deep(.ant-input-search-button) {
width: 0.8rem;
height: 0.36rem;
background: #0087ff;
border-radius: 0.04rem !important;
font-size: 0.14rem;
font-weight: 400;
color: #fff;
line-height: 0.34rem;
margin-left: 0.1rem;
}
:deep(.ant-input-group-addon) {
left: 0 !important;
}
} }
:deep(.ant-input-search-button) { .button-reset {
border: 0;
outline: none;
width: 0.8rem; width: 0.8rem;
height: 0.36rem; height: 0.36rem;
background: #0087ff; background: #e1edfa;
border-radius: 0.04rem !important; border-radius: 0.04rem;
font-size: 0.14rem; font-size: 0.14rem;
font-weight: 400; font-weight: 400;
color: #fff; color: #0087ff;
line-height: 0.34rem; line-height: 0.34rem;
margin-left: 0.1rem; margin-left: 2.5rem;
cursor: pointer;
} }
:deep(.ant-input-group-addon) { .details-pageconetent {
left: 0 !important; height: 100%;
} width: 100%;
}
.button-reset {
border: 0;
outline: none;
width: 0.8rem;
height: 0.36rem;
background: #e1edfa;
border-radius: 0.04rem;
font-size: 0.14rem;
font-weight: 400;
color: #0087ff;
line-height: 0.34rem;
margin-left: 2.5rem;
cursor: pointer;
}
.details-pageconetent {
height: 100%;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
margin-top: 0.67rem;
position: relative;
background: rgba(245, 243, 243, 0.3);
.details-pageconetent-left {
max-height: 6.9rem;
position: absolute;
width: 2.5rem;
top: 0.17rem;
left: 2.5rem;
margin-right: 0.17rem;
overflow: auto;
}
.top {
min-height: 7.2rem;
position: relative;
width: 11.5rem;
display: flex; display: flex;
padding-top: 0.2rem; justify-content: center;
flex-direction: column; align-items: center;
font-size: 0.16rem; margin-top: 0.67rem;
justify-content: left; position: relative;
background: #f3f5f9; background: rgba(245, 243, 243, 0.3);
.pagination { .details-pageconetent-left {
background: #f3f5f9; max-height: 6.9rem;
padding-bottom: 0.6rem; position: absolute;
width: 2.5rem;
top: 0.17rem;
left: 2.5rem;
margin-right: 0.17rem;
overflow: auto;
} }
.top-title { .top {
padding: 0.2rem; min-height: 7.2rem;
position: relative;
width: 11.5rem;
display: flex; display: flex;
font-size: 18px; padding-top: 0.2rem;
flex-direction: column;
font-size: 0.16rem;
justify-content: left;
background: #f3f5f9;
.tabAll { .pagination {
background: #f3f5f9;
padding-bottom: 0.6rem;
}
.top-title {
padding: 0.2rem;
display: flex;
font-size: 18px; font-size: 18px;
color: #000000;
margin-right: 35px;
cursor: pointer;
}
.tabAll:nth-child(1) { .tabAll {
margin-left: 20px; font-size: 18px;
} color: #000000;
margin-right: 35px;
cursor: pointer;
}
.sel { .tabAll:nth-child(1) {
font-weight: 600; margin-left: 20px;
color: #0087ff; }
border-bottom: 0.02rem solid #0087ff;
.sel {
font-weight: 600;
color: #0087ff;
border-bottom: 0.02rem solid #0087ff;
}
} }
} }
} }
}
:deep(.ant-card-grid) { :deep(.ant-card-grid) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
word-break: break-all; word-break: break-all;
} }
</style> </style>

File diff suppressed because it is too large Load Diff

View File

@ -35,8 +35,6 @@
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { ref } from 'vue' import { ref } from 'vue'
import { selectNewest } from '@/api/home' import { selectNewest } from '@/api/home'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
export default { export default {
name: 'latestAbility', name: 'latestAbility',
components: {}, components: {},
@ -47,8 +45,7 @@
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
// select: '', select: '组件服务',
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
}, },
}) })
} }

View File

@ -2,7 +2,6 @@
<!-- 青岛 --> <!-- 青岛 -->
<div class="details-pageconetent"> <div class="details-pageconetent">
<home-header></home-header> <home-header></home-header>
<detail-back></detail-back>
<div class="content-box" v-loading="loadingPage"> <div class="content-box" v-loading="loadingPage">
<div class="package-title">打包模式</div> <div class="package-title">打包模式</div>
<div class="basic-info"> <div class="basic-info">
@ -71,7 +70,6 @@ import { message } from 'ant-design-vue'
import { getIntegrationDetail } from '@/api/home' import { getIntegrationDetail } from '@/api/home'
import HomeHeader from '@/views/home/components/header' import HomeHeader from '@/views/home/components/header'
import { scInsert, scDel } from '@/api/personalCenter' import { scInsert, scDel } from '@/api/personalCenter'
import detailBack from '@/views/home/detailBack.vue'
const router = useRouter() const router = useRouter()
const id = router.currentRoute.value.query.id const id = router.currentRoute.value.query.id
@ -112,6 +110,7 @@ const getIntegrationServicesDeatil = (id) => {
} }
detailInfoObj.value = res.data.data || {} detailInfoObj.value = res.data.data || {}
console.log('detailInfoObj------------>', detailInfoObj); console.log('detailInfoObj------------>', detailInfoObj);
let fuseResourceList = detailInfoObj.value.fuseResourceList || [] let fuseResourceList = detailInfoObj.value.fuseResourceList || []
abilityList.value.map(v => { abilityList.value.map(v => {
let list = fuseResourceList.filter(x => x.type == v.name) || []; let list = fuseResourceList.filter(x => x.type == v.name) || [];
@ -198,6 +197,7 @@ const addCollect = () => {
} }
}) })
.catch(err => { .catch(err => {
console.log('err------------>', err);
message.success(err) message.success(err)
}) })
} else { } else {
@ -216,13 +216,16 @@ const addCollect = () => {
} }
}) })
.catch(err => { .catch(err => {
console.log('err------------>', err);
message.success(err) message.success(err)
}) })
} }
} }
} }
getIntegrationServicesDeatil(id) getIntegrationServicesDeatil(id)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.flex-row-start { .flex-row-start {

View File

@ -65,8 +65,6 @@
data-spm-anchor-id="a313x.7781069.0.i0" data-spm-anchor-id="a313x.7781069.0.i0"
></path> ></path>
</svg> </svg>
<img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
</div> </div>
<video-play <video-play
v-if="openVideo" v-if="openVideo"
@ -94,7 +92,6 @@
} from '@/api/videoSurveillance' } from '@/api/videoSurveillance'
import { getCameraByCondition } from '@/api/file' import { getCameraByCondition } from '@/api/file'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import * as turf from '@turf/turf';
export default { export default {
data() { data() {
@ -115,7 +112,6 @@
openVideo: false, openVideo: false,
channelCode: [], channelCode: [],
circleModeFlag: false, circleModeFlag: false,
areaModeFlag: false,
addressMatchUrl: '', addressMatchUrl: '',
address: '', address: '',
whoShow1: whoShow, whoShow1: whoShow,
@ -128,10 +124,7 @@
gpsX: '', gpsX: '',
gpsY: '', gpsY: '',
radius: '', radius: '',
borderPolygonList: [],
type: 0, //012
}, },
pointAllData:[],
} }
}, },
components: { components: {
@ -165,20 +158,6 @@
this.mapSearchParam.parentId = parentId this.mapSearchParam.parentId = parentId
this.getCameraByParentId() this.getCameraByParentId()
}) })
//
mybus.off('selectTablePoint')
mybus.on('selectTablePoint', (pointlist) => {
console.log("mounted -> pointlist", pointlist);
for(let i=0;i<this.pointAllData.length;i++){
this.pointAllData[i].active = false
for(let j=0;j<pointlist.length;j++){
if(this.pointAllData[i].channelCode == pointlist[j].channelCode){
this.pointAllData[i].active = true
}
}
}
this.addResourceTomap('videoMap', this.pointAllData);
})
}, },
methods: { methods: {
selectedAddress(item, index) { selectedAddress(item, index) {
@ -190,46 +169,6 @@
} }
this.hiMapFun.mapFlyTo(latLng) this.hiMapFun.mapFlyTo(latLng)
}, },
//
areaSelectResource(){
//
L.drawLocal.draw.handlers.polygon.tooltip.start = '单击开始绘制形状'
L.drawLocal.draw.handlers.polygon.tooltip.cont = '单击继续绘制形状'
L.drawLocal.draw.handlers.polygon.tooltip.end =
'单击继续绘制形状,双击结束绘制'
this.hiMap.mapObj.map.off('draw:created')
this.hiMap.mapObj.drawPolygon.enable()
this.hiMap.mapObj.map.once('draw:created', (e) => {
const type = e.layerType
const circleLayer = e.layer
console.log('查询图层draw:created', e)
if (type === 'polygon') {
const polygonLayer = e.layer;
this.hiMap.mapObj.featureGroup.addLayer(polygonLayer);
this.hiMap.mapObj.layerGroup.set('rectangleSelectLayer', polygonLayer);
const arr = [];
const latlngs = []; //
polygonLayer._latlngs[0].map(item => {
// const bdLonLat = wgs84LL2bdLL();
arr.push(turf.point([item.lng, item.lat]));
latlngs.push([item.lat,item.lng])
});
const points = turf.featureCollection(arr);
const rect = turf.convex(points);
this.mapSearchParam.borderPolygonList = latlngs
this.mapSearchParam.type = 2
const params = {
borderPolygonList: latlngs,
type: this.mapSearchParam.type,
}
// mybus.emit('getListByMap', params);
this.getCameraByParentId('map');
console.log("areaSelectResource -> latlngs", latlngs)
}
})
},
// //
circleSelectResource() { circleSelectResource() {
L.drawLocal.draw.handlers.circle.tooltip.start = '请圈选区域' L.drawLocal.draw.handlers.circle.tooltip.start = '请圈选区域'
@ -257,20 +196,18 @@
this.mapSearchParam.gpsX = e.layer._latlng.lng this.mapSearchParam.gpsX = e.layer._latlng.lng
this.mapSearchParam.gpsY = e.layer._latlng.lat this.mapSearchParam.gpsY = e.layer._latlng.lat
this.mapSearchParam.radius = radius this.mapSearchParam.radius = radius
this.mapSearchParam.type = 1
const params = { const params = {
gpsX: this.mapSearchParam.gpsX, gpsX: this.mapSearchParam.gpsX,
gpsY: this.mapSearchParam.gpsY, gpsY: this.mapSearchParam.gpsY,
radius: radius, radius: radius,
type: this.mapSearchParam.type,
} }
// mybus.emit('getListByMap', params) mybus.emit('getListByMap', params)
this.getCameraByParentId('map') this.getCameraByParentId()
} }
} }
}) })
}, },
getCameraByParentId(type) { getCameraByParentId() {
if (!this.whoShow1.itShowXiHaiAn) { if (!this.whoShow1.itShowXiHaiAn) {
debugger debugger
getCameraByParentId(this.mapSearchParam).then((res) => { getCameraByParentId(this.mapSearchParam).then((res) => {
@ -284,13 +221,12 @@
this.mapSearchParam.parentId || this.mapSearchParam.parentId ||
'70be8c5b664f4bcf869d82f2e8335051', '70be8c5b664f4bcf869d82f2e8335051',
pageNum: this.mapSearchParam.pageNum, pageNum: this.mapSearchParam.pageNum,
pageSize: this.mapSearchParam.type!=0?this.mapSearchParam.pageSize:10, pageSize: this.mapSearchParam.pageSize,
name: this.mapSearchParam.cameraName || '', name: this.mapSearchParam.cameraName || '',
longitude: this.mapSearchParam.gpsX || '', longitude: this.mapSearchParam.gpsX || '',
latitude: this.mapSearchParam.gpsY || '', latitude: this.mapSearchParam.gpsY || '',
radius: this.mapSearchParam.radius || '', radius: this.mapSearchParam.radius || '',
type: this.mapSearchParam.type, status: 1,
borderPolygonList: this.mapSearchParam.borderPolygonList || [],
} }
let paramsFather = '' let paramsFather = ''
let i = 1 let i = 1
@ -307,19 +243,9 @@
} }
} }
} }
getCameraByCondition(params).then((res) => { getCameraByCondition(paramsFather).then((res) => {
console.log('根据parent查询摄像头', res.data.data) console.log('根据parent查询摄像头', res.data.data)
if(type=='map'){ this.addResourceTomap('videoMap', res.data.data)
let params = this.mapSearchParam;
params.dataSource = res.data.data||0;
params.total = res.data.count||0;
mybus.emit('getListByMap', params);
}
this.pointAllData = res.data.data;
if(this.mapSearchParam.type!=0)
this.addResourceTomap('videoMap', res.data.data)
else
this.addResourceTomap('videoMap', []) //
}) })
} }
}, },
@ -330,66 +256,28 @@
this.addressMatchUrl this.addressMatchUrl
) )
}, },
areaMode(){
//
if(this.circleModeFlag){
this.resetCircle();
this.circleModeFlag = false;
}
this.areaModeFlag = !this.areaModeFlag;
if (this.areaModeFlag) {
//
this.areaSelectResource()
} else {
this.resetArea();
}
},
circleMode() { circleMode() {
if(this.areaModeFlag){
this.resetArea();
this.areaModeFlag = false;
}
// //
this.circleModeFlag = !this.circleModeFlag this.circleModeFlag = !this.circleModeFlag
if (this.circleModeFlag) { if (this.circleModeFlag) {
// //
this.circleSelectResource() this.circleSelectResource()
} else { } else {
this.resetCircle(); //
this.hiMapFun.removeLayerByLayerName('circlePloygonLayer')
//
this.mapSearchParam.gpsX = ''
this.mapSearchParam.gpsY = ''
this.mapSearchParam.radius = ''
this.getCameraByParentId()
const params = {
gpsX: this.mapSearchParam.gpsX,
gpsY: this.mapSearchParam.gpsY,
radius: this.mapSearchParam.radius,
}
mybus.emit('getListByMap', params)
} }
}, },
resetCircle(){
//
this.hiMapFun.removeLayerByLayerName('circlePloygonLayer')
//
this.mapSearchParam.gpsX = ''
this.mapSearchParam.gpsY = ''
this.mapSearchParam.radius = ''
this.mapSearchParam.type = 0;
const params = {
gpsX: this.mapSearchParam.gpsX,
gpsY: this.mapSearchParam.gpsY,
radius: this.mapSearchParam.radius,
type: this.mapSearchParam.type
}
this.getCameraByParentId('map')
// mybus.emit('getListByMap', params);
},
resetArea(){
//
this.hiMapFun.removeLayerByLayerName('rectangleSelectLayer');
//
this.mapSearchParam.borderPolygonList = [];
this.mapSearchParam.type = 0;
const params = {
borderPolygonList: this.mapSearchParam.borderPolygonList,
type: this.mapSearchParam.type
}
this.getCameraByParentId('map')
// mybus.emit('getListByMap', params);
},
// //
async searchAddressByKeyWord(queryString, cb, indexX) { async searchAddressByKeyWord(queryString, cb, indexX) {
this.disasterPointIndex = indexX this.disasterPointIndex = indexX
@ -464,21 +352,18 @@
addResourceTomap(type, data) { addResourceTomap(type, data) {
const dataEvent = [] const dataEvent = []
if(data&&data.length>0){ data.forEach((item) => {
data.forEach((item) => { const arr = [0, 0.0, '', '0', '0.0']
const arr = [0, 0.0, '', '0', '0.0'] if (arr.indexOf(item.gpsX) == -1) {
if (arr.indexOf(item.gpsX) == -1) { dataEvent.push({
dataEvent.push({ latLng: { lat: Number(item.gpsY), lng: Number(item.gpsX) },
latLng: { lat: Number(item.gpsY), lng: Number(item.gpsX) }, data: item,
data: item, type: 'videoSurveillance',
active: item.active, })
type: 'videoSurveillance', }
}) })
}
})
}
console.log('上图数据', dataEvent) console.log('上图数据', dataEvent)
this.getMapPoint(dataEvent, 'icon_camare.png', type) this.getMapPoint(dataEvent, 'videoSurveillance.png', type)
}, },
getMapPoint(data, img, type) { getMapPoint(data, img, type) {
// this.hiMapFun.clearAllLayers(); // this.hiMapFun.clearAllLayers();
@ -488,8 +373,7 @@
features, features,
img, img,
type, type,
createCameraDetailsPop, createCameraDetailsPop
'icon_camare_active.png'
) )
}, },
@ -659,17 +543,13 @@
.leaflet-control-attribution { .leaflet-control-attribution {
display: none; display: none;
} }
svg,.icon-poylon { svg {
position: absolute; position: absolute;
bottom: 0.1rem; bottom: 0.1rem;
right: 0.1rem; right: 0.1rem;
z-index: 988; z-index: 1001;
cursor: pointer; cursor: pointer;
} }
.icon-poylon {
width: 0.46rem;
bottom: 0.6rem;
}
.address-auto-complete-input { .address-auto-complete-input {
width: 2.4rem; width: 2.4rem;
} }

View File

@ -26,7 +26,7 @@ import {
ref, ref,
watch, watch,
defineProps, defineProps,
defineEmits, nextTick,
} from 'vue' } from 'vue'
import { getDevelopDocTree } from '@/api/home' import { getDevelopDocTree } from '@/api/home'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'

View File

@ -118,7 +118,6 @@
import TheOverallProcess from './TheOverallProcess.vue' import TheOverallProcess from './TheOverallProcess.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
const router = useRouter() const router = useRouter()
const seviceList = ref([ const seviceList = ref([
{ {
@ -256,8 +255,7 @@
const newpage = router.resolve({ const newpage = router.resolve({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
// select: '', select: '组件服务',
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
}, },
}) })
window.location.href = newpage.href window.location.href = newpage.href

View File

@ -15,16 +15,22 @@
</a-input> </a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<a-input v-model:value="form.password" type="password" placeholder="Password"> <a-input
v-model:value="form.password"
type="password"
placeholder="Password"
>
<template v-slot:prefix> <template v-slot:prefix>
<LockOutlined style="color: rgba(0, 0, 0, 0.25)" /> <LockOutlined style="color: rgba(0, 0, 0, 0.25)" />
</template> </template>
</a-input> </a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<!-- IE Chrome || judgeAgent() !== 'Chrome'--> <a-button
<a-button type="primary" html-type="submit" type="primary"
:disabled="form.username === '' || form.password === '' || !canOpen.includes(judgeAgent())"> html-type="submit"
:disabled="form.username === '' || form.password === ''"
>
登录 登录
</a-button> </a-button>
</a-form-item> </a-form-item>
@ -36,191 +42,128 @@
</div> </div>
</template> </template>
<script> <script>
import { dependencies, devDependencies } from '*/package.json' import { dependencies, devDependencies } from '*/package.json'
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
import { Encrypt } from '@/utils/crypto' import { Encrypt } from '@/utils/crypto'
import { UserOutlined, LockOutlined } from '@ant-design/icons-vue' import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
import { message, Modal } from 'ant-design-vue' import { message } from 'ant-design-vue'
// 西 export default {
const isXiHaiAn = whoShow.itShowXiHaiAn name: 'Login',
components: {
export default { UserOutlined,
name: 'Login', LockOutlined,
components: { },
UserOutlined, data() {
LockOutlined, return {
}, form: {
data() { username: '',
return { password: '',
form: { },
username: '', redirect: undefined,
password: '', dependencies: dependencies,
devDependencies: devDependencies,
}
},
computed: {
...mapGetters({
logo: 'settings/logo',
title: 'settings/title',
}),
},
watch: {
$route: {
handler(route) {
this.redirect = (route.query && route.query.redirect) || '/'
},
immediate: true,
}, },
redirect: undefined, },
dependencies: dependencies, mounted() {
devDependencies: devDependencies, this.form.username = ''
is360: false, this.form.password = ''
isIE: false, /* setTimeout(() => {
canOpen: ['FF', 'Chrome'] this.handleSubmit()
} }, 3000) */
}, },
computed: { methods: {
...mapGetters({ ...mapActions({
logo: 'settings/logo', login: 'user/login',
title: 'settings/title', }),
}), handleRoute() {
}, return this.redirect === '/404' || this.redirect === '/403'
watch: { ? '/home'
$route: { : this.redirect
handler(route) {
this.redirect = (route.query && route.query.redirect) || '/'
}, },
immediate: true, async handleSubmit() {
}, // debugger
}, try {
mounted() { // console.log('', Decrypt(Encrypt(this.form.password)))
this.form.username = '' if (this.form.password !== this.form.password.trim()) {
this.form.password = '' message.error('登陆失败,用户名或密码错误!')
return
if (!this.canOpen.includes(this.judgeAgent())) { }
Modal.warning({ await this.login({
title: '提示', password: Encrypt(this.form.password),
content: '请使用谷歌或火狐浏览器!', username: this.form.username,
});
}
},
methods: {
...mapActions({
login: 'user/login',
}),
//
judgeAgent() {
let userAgent = navigator.userAgent // userAgent
console.log('userAgent------------>', userAgent);
let isOpera = userAgent.indexOf('Opera') > -1
//Opera
if (isOpera) {
return 'Opera'
}
//Firefox
if (userAgent.indexOf('Firefox') > -1) {
return 'FF'
}
//chorme
if (userAgent.indexOf('Chrome') > -1) {
return 'Chrome'
}
//Safari
if (userAgent.indexOf('Safari') > -1) {
return 'Safari'
}
//IE
if (
userAgent.indexOf('compatible') > -1 &&
userAgent.indexOf('MSIE') > -1 &&
!isOpera
) {
return 'IE'
}
//Edge
if (userAgent.indexOf('Trident') > -1) {
return 'Edge'
}
},
handleRoute() {
return this.redirect === '/404' || this.redirect === '/403'
? '/home'
: this.redirect
},
async handleSubmit() {
// debugger
try {
// console.log('', Decrypt(Encrypt(this.form.password)))
if (this.form.password !== this.form.password.trim()) {
message.error('登陆失败,用户名或密码错误!')
return
}
await this.login({
password: Encrypt(this.form.password),
username: this.form.username,
})
window.sessionStorage.setItem('visits', JSON.stringify([]))
console.log('添加visits========================================>')
// console.log(this.handleRoute())
// 西
if (isXiHaiAn) {
await this.$router.push({
path: '/DetailsPageconetent',
query: {
select: '基础设施',
tecHnosphere: '',
appLiCation: ''
}
}) })
} else { window.sessionStorage.setItem('visits', JSON.stringify([]))
console.log('添加visits========================================>')
// console.log(this.handleRoute())
await this.$router.push('/home') await this.$router.push('/home')
} catch (error) {
message.error('登陆失败,用户名或密码错误!')
} }
} catch (error) { },
message.error('登陆失败,用户名或密码错误!')
}
}, },
}, }
}
</script> </script>
<style lang="less"> <style lang="less">
.login-container { .login-container {
width: 100%;
height: 100vh;
background: url('~@/assets/login_images/login_background.png');
background-size: cover;
&-form {
width: calc(100% - 40px);
height: 380px;
padding: 4vh;
margin-top: calc((100vh - 380px) / 2);
margin-right: 20px;
margin-left: 20px;
background: url('~@/assets/login_images/login_form.png');
background-size: 100% 100%;
border-radius: 10px;
box-shadow: 0 2px 8px 0 rgba(7, 17, 27, 0.06);
}
&-hello {
font-size: 32px;
color: #fff;
}
&-title {
margin-bottom: 30px;
font-size: 20px;
color: #fff;
}
&-tips {
position: fixed;
bottom: @vab-margin;
width: 100%; width: 100%;
height: 40px; height: 100vh;
color: rgba(255, 255, 255, 0.856); background: url('~@/assets/login_images/login_background.png');
text-align: center; background-size: cover;
&-form {
width: calc(100% - 40px);
height: 380px;
padding: 4vh;
margin-top: calc((100vh - 380px) / 2);
margin-right: 20px;
margin-left: 20px;
background: url('~@/assets/login_images/login_form.png');
background-size: 100% 100%;
border-radius: 10px;
box-shadow: 0 2px 8px 0 rgba(7, 17, 27, 0.06);
}
&-hello {
font-size: 32px;
color: #fff;
}
&-title {
margin-bottom: 30px;
font-size: 20px;
color: #fff;
}
&-tips {
position: fixed;
bottom: @vab-margin;
width: 100%;
height: 40px;
color: rgba(255, 255, 255, 0.856);
text-align: center;
}
.ant-col {
width: 100%;
padding: 0 10px 0 10px;
}
.ant-input {
height: 35px;
}
.ant-btn {
width: 100%;
height: 45px;
border-radius: 99px;
}
} }
.ant-col {
width: 100%;
padding: 0 10px 0 10px;
}
.ant-input {
height: 35px;
}
.ant-btn {
width: 100%;
height: 45px;
border-radius: 99px;
}
}
</style> </style>

View File

@ -2,7 +2,7 @@
<div class="capability-convergence"> <div class="capability-convergence">
<div class="main"> <div class="main">
<div class="top"> <div class="top">
能力分类 能力汇聚
<span class="line"></span> <span class="line"></span>
</div> </div>
<div class="bottom"> <div class="bottom">
@ -84,8 +84,7 @@
import { ref, reactive } from 'vue' import { ref, reactive } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { updateVisits, browsingInsert, getSoldierList } from '@/api/home' import { updateVisits, browsingInsert } from '@/api/home'
import { message, Upload } from 'ant-design-vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
@ -128,85 +127,42 @@
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.list.forEach((val) => {
res.data.data.data.forEach((val) => { val.id = val.serviceId // id
val.id = val.guid // id val.name = val.serviceName //
val.name = val.zyname // val.sjlCount = val.requestQuantity //
val.sjlCount = val.sjcczl // val.applyCount = val.requestCount //
val.applyCount = val.syqk // val.deptName = val.departmentName //
val.deptName = val.TGBM // val.createTime = val.createTime.split('.')[0]
val.createDate = val.fbrq // val.createDate = val.createTime //
val.description = val.xgxt // })
}) obj.value = res.data.data.list || []
obj.value = res.data.data.data || [] object.sjNum = res.data.data.total
object.sjNum = res.data.data.rows // interfaceSuccess.value++
// interfaceSuccess.value++ // if (interfaceSuccess.value == 5) {
// if (interfaceSuccess.value == 5) { // mybus.emit('chagneNum', object)
// mybus.emit('chagneNum', object) // }
// }
} else if (whoShow1.value.itShowXiHaiAn) {
res.data.data.list.forEach((val) => {
val.id = val.serviceId // id
val.name = val.serviceName //
val.sjlCount = val.requestQuantity //
val.applyCount = val.requestCount //
val.deptName = val.departmentName //
val.createTime = val.createTime.split('.')[0]
val.createDate = val.createTime //
})
obj.value = res.data.data.list || []
object.sjNum = res.data.data.total
// interfaceSuccess.value++
// if (interfaceSuccess.value == 5) {
// mybus.emit('chagneNum', object)
// }
}
}) })
} else { } else {
let type = paramsGetResources.type let type = paramsGetResources.type
if (type == '基础设施') { if (type == '基础设施') {
jcList.value = []
selectInfrastructureList().then((res) => { selectInfrastructureList().then((res) => {
console.log('基础设施==========>', res.data.data) console.log('基础设施==========>', res.data.data)
for (const key in res.data.data) { for (const key in res.data.data) {
if (whoShow1.value.itShowXiHaiAn) { jcList.value.push({
if (key === '视频资源') { name: key,
jcList.value.push({ num: res.data.data[key],
name: key, })
num: res.data.data[key],
})
}
} else {
jcList.value.push({
name: key,
num: res.data.data[key],
})
}
} }
// 西- if (uavAndIndividualSoldier.num) {
if (whoShow1.value.itShowXiHaiAn) { jcList.value.push({
getSoldierData('无人机') name: '无人机',
.then((res) => { num: uavAndIndividualSoldier.uavList.length,
let { total = 0 } = res.data.data })
jcList.value.push({ jcList.value.push({
name: '无人机', name: '单兵设备',
num: total, num: uavAndIndividualSoldier.individualSoldier.length,
}) })
})
.catch((err) => {
console.log('err--无人机---------->', err)
})
getSoldierData('单兵设备')
.then((res) => {
let { total = 0 } = res.data.data
jcList.value.push({
name: '单兵设备',
num: total,
})
})
.catch((err) => {
console.log('err--单兵设备---------->', err)
})
} }
}) })
} else { } else {
@ -232,28 +188,6 @@
} }
} }
// todo
const getSoldierData = (name) => {
let _params = {
type: name,
page: 1,
limit: 10,
}
return new Promise((resolve, reject) => {
getSoldierList(_params)
.then((res) => {
resolve(res)
console.log('res---获取无人机、单兵设备--------->', res)
if (res.data.code !== 0) {
return message.error(res.data.msg)
}
})
.catch((err) => {
reject(err)
})
})
}
const openHref = (item) => { const openHref = (item) => {
console.log(item.id, 'wowowo') console.log(item.id, 'wowowo')
console.log(item.visits, 'wowowo') console.log(item.visits, 'wowowo')
@ -346,14 +280,12 @@
background-size: 100%; background-size: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
.main { .main {
width: 13rem; width: 13rem;
margin-top: 1.8rem; margin-top: 1.8rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
.top { .top {
font-size: 0.3rem; font-size: 0.3rem;
color: #212121; color: #212121;
@ -363,7 +295,6 @@
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.line { .line {
width: 0.34rem; width: 0.34rem;
height: 0.03rem; height: 0.03rem;
@ -371,12 +302,10 @@
margin-top: 0.08rem; margin-top: 0.08rem;
} }
} }
.bottom { .bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 0.4rem; margin-top: 0.4rem;
.item { .item {
width: 2.44rem; width: 2.44rem;
height: 3.91rem; height: 3.91rem;
@ -385,7 +314,6 @@
border-radius: 0.02rem; border-radius: 0.02rem;
box-shadow: 0 0.05rem 0.2rem #ccc; box-shadow: 0 0.05rem 0.2rem #ccc;
position: relative; position: relative;
div:nth-of-type(1) { div:nth-of-type(1) {
height: 1.02rem; height: 1.02rem;
line-height: 1.02rem; line-height: 1.02rem;
@ -394,27 +322,21 @@
padding-left: 0.15rem; padding-left: 0.15rem;
background-size: 100%; background-size: 100%;
} }
.jc { .jc {
background: url('~@/assets/newHome/Convergence-jc.png') no-repeat; background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
} }
.sj { .sj {
background: url('~@/assets/newHome/Convergence-sj.png') no-repeat; background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
} }
.zj { .zj {
background: url('~@/assets/newHome/Convergence-zj.png') no-repeat; background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
} }
.yy { .yy {
background: url('~@/assets/newHome/Convergence-yy.png') no-repeat; background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
} }
.zs { .zs {
background: url('~@/assets/newHome/Convergence-zs.png') no-repeat; background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
} }
.name { .name {
height: 0.47rem; height: 0.47rem;
line-height: 0.47rem; line-height: 0.47rem;
@ -427,16 +349,13 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
word-break: break-all; word-break: break-all;
} }
.name:hover { .name:hover {
color: #0058e1; color: #0058e1;
cursor: pointer; cursor: pointer;
} }
.name-last { .name-last {
border-bottom: none; border-bottom: none;
} }
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 0.8rem; width: 0.8rem;
@ -451,13 +370,11 @@
position: absolute; position: absolute;
bottom: 0.2rem; bottom: 0.2rem;
} }
.btn:hover { .btn:hover {
background: rgba(0, 88, 225, 0.3); background: rgba(0, 88, 225, 0.3);
color: #000; color: #000;
} }
} }
.item:hover { .item:hover {
border-radius: 0.02rem; border-radius: 0.02rem;
border: 0.01rem solid #0058e1; border: 0.01rem solid #0058e1;

View File

@ -32,7 +32,6 @@
import { ref } from 'vue' import { ref } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const productServiceData = ref([]) const productServiceData = ref([])
@ -77,8 +76,7 @@
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
// select: '', select: '组件服务',
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
}, },
}) })
} }

View File

@ -1,60 +1,45 @@
<template> <template>
<div class="navigation2"> <div class="navigation2">
<a-tooltip> <div class="item" @click="jumpPage('组件服务')">
<template #title>点击进入组件服务</template> <div class="img zj"></div>
<div class="item" @click="jumpPage('组件服务')"> <div class="name">组件服务</div>
<div class="img zj"></div> <div class="sl">
<div class="name">组件服务</div> <span class="num">{{ zjNum || 0 }}</span>
<div class="sl">
<span class="num">{{ zjNum || 0 }}</span>
</div>
</div> </div>
</a-tooltip> </div>
<a-tooltip> <div class="item" @click="jumpPage('应用资源')">
<template #title>点击进入应用资源</template> <div class="img yy"></div>
<div class="item" @click="jumpPage('应用资源')"> <div class="name">应用资源</div>
<div class="img yy"></div> <div class="sl">
<div class="name">应用资源</div> <span class="num">{{ yyNum || 0 }}</span>
<div class="sl">
<span class="num">{{ yyNum || 0 }}</span>
</div>
</div> </div>
</a-tooltip> </div>
<a-tooltip> <div class="item" @click="jumpPage('基础设施')">
<template #title>点击进入基础设施</template> <div class="img jc"></div>
<div class="item" @click="jumpPage('基础设施')"> <div class="name">基础设施</div>
<div class="img jc"></div> <div class="sl">
<div class="name">基础设施</div> <span class="num">{{ jcNum || 0 }}</span>
<div class="sl">
<span class="num">{{ jcNum || 0 }}</span>
</div>
</div> </div>
</a-tooltip> </div>
<a-tooltip> <div class="item" @click="jumpPage('数据资源')">
<template #title>点击进入数据资源</template> <div class="img sj"></div>
<div class="item" @click="jumpPage('数据资源')"> <div class="name">数据资源</div>
<div class="img sj"></div> <div class="sl">
<div class="name">数据资源</div> <span class="num">{{ sjNum || 0 }}</span>
<div class="sl">
<span class="num">{{ sjNum || 0 }}</span>
</div>
</div> </div>
</a-tooltip> </div>
<a-tooltip> <div class="item" @click="jumpPage('知识库')">
<template #title>点击进入知识库</template> <div class="img zs"></div>
<div class="item" @click="jumpPage('知识库')"> <div class="name">知识库</div>
<div class="img zs"></div> <div class="sl">
<div class="name">知识库</div> <span class="num">{{ zsNum || 0 }}</span>
<div class="sl">
<span class="num">{{ zsNum || 0 }}</span>
</div>
</div> </div>
</a-tooltip> </div>
</div> </div>
</template> </template>
<script setup> <script setup>

View File

@ -61,7 +61,6 @@
import { pageWithAttrs } from '@/api/home.js' import { pageWithAttrs } from '@/api/home.js'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const select = ref('浏览量') const select = ref('浏览量')
@ -135,11 +134,11 @@
'选中===================>', '选中===================>',
store.getters['home/selectCardsnum'] store.getters['home/selectCardsnum']
) )
// router.push({ path: '/DetailsPageconetent' })
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
// select: '', select: '组件服务',
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
}, },
}) })
} }

View File

@ -47,7 +47,6 @@
import { selectRecommend } from '@/api/home.js' import { selectRecommend } from '@/api/home.js'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
let dataList = ref([]) let dataList = ref([])
@ -95,7 +94,7 @@
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB select: '组件服务',
}, },
}) })
} }

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="work-dynamics"> <div class="work-dynamics">
<!-- <div class="title"> <div class="title">
<div>工作动态</div> <div>工作动态</div>
<div class="title-son"></div> <div class="title-son"></div>
</div> </div>
@ -51,7 +51,7 @@
<div class="bottom" @click="jumpPage()"> <div class="bottom" @click="jumpPage()">
查看更多 查看更多
<span class="gengduo"></span> <span class="gengduo"></span>
</div> --> </div>
<div class="fixedmount"> <div class="fixedmount">
<div @click="applyResource()"> <div @click="applyResource()">
<p></p> <p></p>
@ -59,7 +59,7 @@
</div> </div>
<div @click="toView()"> <div @click="toView()">
<p></p> <p></p>
<p>需求</p> <p>需求申请</p>
</div> </div>
<div @click="showModal"> <div @click="showModal">
<p></p> <p></p>
@ -432,8 +432,8 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
// padding-bottom: 0.8rem; padding-bottom: 0.8rem;
// padding-top: 0.78rem; padding-top: 0.78rem;
.title { .title {
font-size: 0.3rem; font-size: 0.3rem;
font-family: 'convergence-typeface'; font-family: 'convergence-typeface';
@ -592,11 +592,11 @@
} }
.fixedmount { .fixedmount {
height: 3rem; height: 2.4rem;
display: flex; display: flex;
position: fixed; position: fixed;
bottom: 1.56rem; bottom: 1.56rem;
right: 0rem; right: calc(100% - 19rem);
z-index: 10; z-index: 10;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
@ -604,52 +604,50 @@
} }
.fixedmount div { .fixedmount div {
width: 0.96rem; width: 0.7rem;
height: 0.96rem; height: 0.7rem;
// border-radius: 0.04rem; border-radius: 0.04rem;
// border: 0.01rem #94aac9 solid; border: 0.01rem #94aac9 solid;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// justify-content: center; // justify-content: center;
align-items: center; align-items: center;
padding-top: 0.16rem; padding-top: 0.13rem;
margin-bottom: 2px;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
// background: #e3edfc; background: #e3edfc;
background: url('~@/assets/home/bg-right.png');
} }
.fixedmount div p:nth-child(2) { .fixedmount div p:nth-child(2) {
position: absolute; position: absolute;
bottom: 0rem; bottom: 0rem;
height: 0.2rem; height: 0.14rem;
font-size: 0.2rem; font-size: 0.14rem;
line-height: 0.2rem; line-height: 0.14rem;
color: #fff; color: #000000;
// margin-top: .08rem; // margin-top: .08rem;
} }
.fixedmount div:nth-child(1) p:nth-child(1) { .fixedmount div:nth-child(1) p:nth-child(1) {
height: 0.32rem; height: 0.24rem;
width: 0.32rem; width: 0.24rem;
//background: url('~@/assets/home/shenqing.png') no-repeat; //background: url('~@/assets/home/shenqing.png') no-repeat;
background: url('~@/assets/home/sq.png') no-repeat; background: url('~@/assets/newHome/banner-yy.png') no-repeat;
background-size: contain; background-size: contain;
background-position: center; background-position: center;
} }
.fixedmount div:nth-child(2) p:nth-child(1) { .fixedmount div:nth-child(2) p:nth-child(1) {
height: 0.32rem; height: 0.24rem;
width: 0.32rem; width: 0.24rem;
background: url('~@/assets/home/xq.png') no-repeat; background: url('~@/assets/home/shangjia.png') no-repeat;
background-size: contain; background-size: contain;
background-position: center; background-position: center;
} }
.fixedmount div:nth-child(3) p:nth-child(1) { .fixedmount div:nth-child(3) p:nth-child(1) {
height: 0.32rem; height: 0.24rem;
width: 0.32rem; width: 0.24rem;
background: url('~@/assets/home/sj.png') no-repeat; background: url('~@/assets/home/abilitysquare.png') no-repeat;
background-size: 140% 126%; background-size: 140% 126%;
background-position: center; background-position: center;
} }

View File

@ -1,12 +1,24 @@
<template> <template>
<DeviceApplyDetail v-if="showType === '设备申请'" :refObj="refObj"></DeviceApplyDetail> <div class="form-container">
<div class="form-container" v-else> <AbilityApplication
<AbilityApplication :refObj="refObj" v-if="showType === '能力申请'"></AbilityApplication> :refObj="refObj"
<PutOnTheShelf :refObj="refObj" v-else-if="showType === '能力上架'"></PutOnTheShelf> v-if="showType === '能力申请'"
<OffTheShelf :refObj="refObj" v-else-if="showType === '能力下架'"></OffTheShelf> ></AbilityApplication>
<PutOnTheShelf
:refObj="refObj"
v-else-if="showType === '能力上架'"
></PutOnTheShelf>
<OffTheShelf
:refObj="refObj"
v-else-if="showType === '能力下架'"
></OffTheShelf>
<Demand :refObj="refObj" v-else-if="showType === '能力需求'"></Demand> <Demand :refObj="refObj" v-else-if="showType === '能力需求'"></Demand>
<Comment :refObj="refObj" v-else-if="showType === '需求评论'"></Comment> <Comment :refObj="refObj" v-else-if="showType === '需求评论'"></Comment>
<OtherApplications :refObj="refObj" v-else></OtherApplications> <OtherApplications :refObj="refObj" v-else></OtherApplications>
<!-- <div class="title">流程图</div>
<div>
<img :src="getResourceURL()" alt="" />
</div> -->
<div> <div>
<div class="title">审批详情</div> <div class="title">审批详情</div>
<template v-for="item in dataSource.data" :key="item"> <template v-for="item in dataSource.data" :key="item">
@ -23,222 +35,219 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import AbilityApplication from './AbilityApplication.vue' import AbilityApplication from './AbilityApplication.vue'
import PutOnTheShelf from './PutOnTheShelf .vue' import PutOnTheShelf from './PutOnTheShelf .vue'
import OffTheShelf from './OffTheShelf.vue' import OffTheShelf from './OffTheShelf.vue'
import Demand from './Demand.vue' import Demand from './Demand.vue'
import Comment from './Comment.vue' import Comment from './Comment.vue'
import DeviceApplyDetail from './DeviceApplyDetail.vue' import OtherApplications from '@/views/personalCenter/components/OtherApplications '
import OtherApplications from '@/views/personalCenter/components/OtherApplications ' import { onMounted, reactive, defineProps, ref } from 'vue'
import { onMounted, reactive, defineProps, ref } from 'vue' import Cookies from 'js-cookie'
import Cookies from 'js-cookie' // import { baseURL } from '@/config'
// import { baseURL } from '@/config' import qs from 'qs'
import qs from 'qs' import {
import { getApplyForm,
getApplyForm, getTaskHandleDetailInfo,
getTaskHandleDetailInfo, getDemandForm,
getDemandForm, nengliziyuanshangjiaapply,
nengliziyuanshangjiaapply, getTaskVariables,
getTaskVariables, } from '@/api/personalCenter'
} from '@/api/personalCenter' import { selectOneDel } from '@/api/home'
import { selectOneDel } from '@/api/home' const props = defineProps({
const props = defineProps({ processDefinitionName: { type: String, default: null },
processDefinitionName: { type: String, default: null }, businessKey: { type: String, default: null },
businessKey: { type: String, default: null }, processInstanceId: { type: String, default: null },
processInstanceId: { type: String, default: null }, resourceId: { type: String, default: null },
resourceId: { type: String, default: null }, refObj: { type: Object, default: null },
refObj: { type: Object, default: null }, showType: { type: String, default: null },
showType: { type: String, default: null },
})
const refObj = ref({})
const showType = ref('')
// eslint-disable-next-line vue/no-setup-props-destructure
refObj.value = props.refObj
// eslint-disable-next-line vue/no-setup-props-destructure
showType.value = props.showType
//
const dataSource = reactive({ data: [] })
console.log('refObj------------>', refObj);
// console.log(props.refObj, '---------------------------------------')
const downloadFile = (path, name) => {
const xhr = new XMLHttpRequest()
xhr.open('get', path)
xhr.responseType = 'blob'
xhr.send()
xhr.onload = function () {
if (this.status === 200 || this.status === 304) {
// IE10downloadmsSaveOrOpenBlobIE10msSaveOrOpenBlob
if ('msSaveOrOpenBlob' in navigator) {
navigator.msSaveOrOpenBlob(this.response, name)
return
}
// const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
// const url = URL.createObjectURL(blob);
const url = URL.createObjectURL(this.response)
const a = document.createElement('a')
a.style.display = 'none'
a.href = url
a.download = name
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
URL.revokeObjectURL(url)
}
}
}
//
const formName = reactive({
user: '',
phone: '',
unit: '',
area: '',
system: '',
scene: '',
basis: '',
id: '',
})
let shifoushizujian = ref('')
let nameNotShow = ref('')
let algorithmShow = ref('')
const dataForm = reactive({ data: {} })
const columns = [
{
title: '任务名称',
dataIndex: 'activityName',
key: 'activityName',
},
{
title: '处理人',
dataIndex: 'assigneeName',
key: 'assigneeName',
},
{
title: '任务开始时间',
dataIndex: 'startTime',
key: 'startTime',
},
{
title: '任务结束时间',
dataIndex: 'endTime',
key: 'endTime',
},
{
title: '审核意见',
dataIndex: 'comment',
key: 'comment',
},
{
title: '任务时长/秒',
dataIndex: 'durationInSeconds',
key: 'durationInSeconds',
},
]
const getInfo = () => {
console.log(props.processInstanceId, '============================')
if (props.processDefinitionName == '能力申请') {
// getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
// console.log('====================>', res.data.data)
// })
}
if (props.processDefinitionName == '能力申请流程') {
getApplyForm(props.businessKey).then((res) => {
const { data } = res.data
console.log(data)
formName.user = data.user
formName.phone = data.phone
formName.unit = data.unit
formName.area = data.area
formName.system = data.system
formName.scene = data.scene
formName.enclosure = data.enclosure
formName.basis = data.basis
})
}
if (props.processDefinitionName == '能力需求申请') {
getDemandForm(props.businessKey).then((res) => {
const { data } = res.data
console.log(data)
formName.applyUserName = data.applyUserName
formName.applyUserPhone = data.applyUserPhone
formName.applyUserDeptName = data.applyUserDeptName
formName.detailsField = data.detailsField
formName.demandDetails = data.demandDetails
formName.detailsType = data.detailsType
formName.demandSubject = data.demandSubject
formName.enclosure = data.enclosure
})
}
if (props.processDefinitionName == '能力资源上架') {
// debugger
nengliziyuanshangjiaapply(props.businessKey).then((res) => {
// const { data } = res.data
dataForm.data = res.data.data.resourceDTO
if (res.data.data.resourceDTO.type == '应用资源') {
shifoushizujian.value = true
} else {
shifoushizujian.value = false
console.log(res.data.data.resourceDTO)
res.data.data.resourceDTO.infoList.forEach((val) => {
console.log(val, '111111111111111111111111')
if (val.attrValue === '智能算法') {
nameNotShow.value = true
algorithmShow.value = false
console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
}
})
}
console.log('222222222222', dataForm.data)
})
}
if (props.processDefinitionName == '能力资源下架') {
// debugger
selectOneDel(props.resourceId).then((res) => {
// const { data } = res.data
dataForm.data = res.data.data
})
}
}
const getLiuZhuanInfo = () => {
const params = qs.stringify({
processInstanceId: props.processInstanceId,
}) })
getTaskHandleDetailInfo(params).then((res) => { const refObj = ref({})
let arr = [] const showType = ref('')
res.data.data.forEach((item) => { // eslint-disable-next-line vue/no-setup-props-destructure
arr.push(item) refObj.value = props.refObj
}) // eslint-disable-next-line vue/no-setup-props-destructure
dataSource.data.push([props.processInstanceId, arr]) showType.value = props.showType
}) //
} const dataSource = reactive({ data: [] })
// console.log(props.refObj, '---------------------------------------')
onMounted(() => { const downloadFile = (path, name) => {
// getInfo() const xhr = new XMLHttpRequest()
if (props.refObj.resourceApplication) { xhr.open('get', path)
dataSource.data = [] xhr.responseType = 'blob'
for (const key in props.refObj.resourceApplication) { xhr.send()
if (props.refObj.resourceApplication[key].length > 0) { xhr.onload = function () {
props.refObj.resourceApplication[key].map((item) => { if (this.status === 200 || this.status === 304) {
dataSource.data.push([item.instanceId, item.taskHandleDetailInfo]) // IE10downloadmsSaveOrOpenBlobIE10msSaveOrOpenBlob
}) if ('msSaveOrOpenBlob' in navigator) {
navigator.msSaveOrOpenBlob(this.response, name)
return
}
// const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
// const url = URL.createObjectURL(blob);
const url = URL.createObjectURL(this.response)
const a = document.createElement('a')
a.style.display = 'none'
a.href = url
a.download = name
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
URL.revokeObjectURL(url)
} }
} }
} else {
getLiuZhuanInfo()
} }
}) //
const formName = reactive({
const getResourceURL = () => { user: '',
console.log('111111111111111111111111111111', Cookies.get('token')) phone: '',
const params = qs.stringify({ unit: '',
token: Cookies.get('token'), area: '',
// processInstanceId: this.dataForm.processInstanceId system: '',
processInstanceId: props.processInstanceId, scene: '',
basis: '',
id: '',
}) })
return `${window.SITE_CONFIG.apiURL}/act/his/getInstImage?${params}` let shifoushizujian = ref('')
} let nameNotShow = ref('')
let algorithmShow = ref('')
const dataForm = reactive({ data: {} })
const columns = [
{
title: '任务名称',
dataIndex: 'activityName',
key: 'activityName',
},
{
title: '处理人',
dataIndex: 'assigneeName',
key: 'assigneeName',
},
{
title: '任务开始时间',
dataIndex: 'startTime',
key: 'startTime',
},
{
title: '任务结束时间',
dataIndex: 'endTime',
key: 'endTime',
},
{
title: '审核意见',
dataIndex: 'comment',
key: 'comment',
},
{
title: '任务时长/秒',
dataIndex: 'durationInSeconds',
key: 'durationInSeconds',
},
]
const getInfo = () => {
console.log(props.processInstanceId, '============================')
if (props.processDefinitionName == '能力申请') {
// getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
// console.log('====================>', res.data.data)
// })
}
if (props.processDefinitionName == '能力申请流程') {
getApplyForm(props.businessKey).then((res) => {
const { data } = res.data
console.log(data)
formName.user = data.user
formName.phone = data.phone
formName.unit = data.unit
formName.area = data.area
formName.system = data.system
formName.scene = data.scene
formName.enclosure = data.enclosure
formName.basis = data.basis
})
}
if (props.processDefinitionName == '能力需求申请') {
getDemandForm(props.businessKey).then((res) => {
const { data } = res.data
console.log(data)
formName.applyUserName = data.applyUserName
formName.applyUserPhone = data.applyUserPhone
formName.applyUserDeptName = data.applyUserDeptName
formName.detailsField = data.detailsField
formName.demandDetails = data.demandDetails
formName.detailsType = data.detailsType
formName.demandSubject = data.demandSubject
formName.enclosure = data.enclosure
})
}
if (props.processDefinitionName == '能力资源上架') {
// debugger
nengliziyuanshangjiaapply(props.businessKey).then((res) => {
// const { data } = res.data
dataForm.data = res.data.data.resourceDTO
if (res.data.data.resourceDTO.type == '应用资源') {
shifoushizujian.value = true
} else {
shifoushizujian.value = false
console.log(res.data.data.resourceDTO)
res.data.data.resourceDTO.infoList.forEach((val) => {
console.log(val, '111111111111111111111111')
if (val.attrValue === '智能算法') {
nameNotShow.value = true
algorithmShow.value = false
console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
}
})
}
console.log('222222222222', dataForm.data)
})
}
if (props.processDefinitionName == '能力资源下架') {
// debugger
selectOneDel(props.resourceId).then((res) => {
// const { data } = res.data
dataForm.data = res.data.data
})
}
}
const getLiuZhuanInfo = () => {
const params = qs.stringify({
processInstanceId: props.processInstanceId,
})
getTaskHandleDetailInfo(params).then((res) => {
let arr = []
res.data.data.forEach((item) => {
arr.push(item)
})
dataSource.data.push([props.processInstanceId, arr])
})
}
onMounted(() => {
// getInfo()
if (props.refObj.resourceApplication) {
dataSource.data = []
for (const key in props.refObj.resourceApplication) {
if (props.refObj.resourceApplication[key].length > 0) {
props.refObj.resourceApplication[key].map((item) => {
dataSource.data.push([item.instanceId, item.taskHandleDetailInfo])
})
}
}
} else {
getLiuZhuanInfo()
}
})
const getResourceURL = () => {
console.log('111111111111111111111111111111', Cookies.get('token'))
const params = qs.stringify({
token: Cookies.get('token'),
// processInstanceId: this.dataForm.processInstanceId
processInstanceId: props.processInstanceId,
})
return `${window.SITE_CONFIG.apiURL}/act/his/getInstImage?${params}`
}
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@ -246,7 +255,6 @@ const getResourceURL = () => {
height: 6rem; height: 6rem;
overflow-y: scroll; overflow-y: scroll;
padding: 20px 20px 30px 20px; padding: 20px 20px 30px 20px;
.title { .title {
font-size: 18px; font-size: 18px;
color: #000; color: #000;
@ -257,23 +265,20 @@ const getResourceURL = () => {
border-left: 6px #0058e1 solid; border-left: 6px #0058e1 solid;
} }
} }
:deep(.ant-table-thead) > tr > .ant-table-cell {
:deep(.ant-table-thead)>tr>.ant-table-cell {
background: #0087ff; background: #0087ff;
color: #fff; color: #fff;
border: none; border: none;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
} }
:deep(.ant-table-tbody) > tr > .ant-table-cell:nth-child(5) {
:deep(.ant-table-tbody)>tr>.ant-table-cell:nth-child(5) {
// width: 110px; // width: 110px;
// display: inline-block; // display: inline-block;
// white-space: nowrap; // white-space: nowrap;
// overflow: hidden; // overflow: hidden;
// text-overflow: ellipsis; // text-overflow: ellipsis;
} }
.oddNumbers { .oddNumbers {
margin-bottom: 0.05rem; margin-bottom: 0.05rem;
} }

View File

@ -1,43 +0,0 @@
<!--
* @Description: 我的申请 设备申请 查看详情
-->
<template>
<div class="device-detail-box">
<div v-for="(db, key) in wrjData" :key="key">
<template v-if="typeof db == 'object'">
<div style="
font-size: 20px;
font-weight: 600;
margin: 10px 0;
text-align: center;
">
{{ db.attrType || '--' }}
</div>
<template v-if="db.attrValue">
<div style="padding: 0 30px" v-for="(value, key2) in JSON.parse(db.attrValue)" :key="value">
{{ key2 + '' + value }}
</div>
</template>
</template>
</div>
</div>
</template>
<script setup>
import { ref, defineProps, watch } from 'vue'
const props = defineProps({
refObj: { type: Object, default: null },
})
const wrjData = ref([])
wrjData.value = props.refObj.deviceAttrDTOList || []
watch(() => props.refObj, (val) => {
wrjData.value = val.deviceAttrDTOList || []
}, { immediate: true, deep: true })
</script>
<style lang="less" scoped>
.device-detail-box {
height: 6rem;
overflow-y: auto;
}
</style>

View File

@ -1,6 +1,23 @@
<template> <template>
<div class="on-the-right-side-of-the-list"> <div class="on-the-right-side-of-the-list">
<div class="title" style="margin-bottom: 0.2rem">我的申请</div> <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
<!-- <div class="sousuokuang">
<a-input-search
v-model:value="name"
placeholder="请输入关键词"
enter-button="搜索"
size="large"
@change="onSearch"
@search="getApplyList(name)"
/>
<a-button
type="primary"
style="width: 90px; height: 36px; margin-left: 10px"
@click="replacement"
>
重置
</a-button>
</div> -->
<div class="tab" style="margin-bottom: 0.1rem"> <div class="tab" style="margin-bottom: 0.1rem">
<span>类型</span> <span>类型</span>
<div <div
@ -16,7 +33,7 @@
<span>申请状态</span> <span>申请状态</span>
<div <div
:class="tabIndex == index ? 'tabclass' : ' '" :class="tabIndex == index ? 'tabclass' : ' '"
@click="changeApplyState(item, index)" @click="tabqiehuan(item, index)"
v-for="(item, index) in tabList" v-for="(item, index) in tabList"
:key="index" :key="index"
> >
@ -47,36 +64,140 @@
{{ item.cameraList ? item.system : item.title }} {{ item.cameraList ? item.system : item.title }}
</template> </template>
<div class="content-body-title"> <div class="content-body-title">
<!-- <span
v-if="item.cameraList && item.ended"
@click="showVideoList(item)"
>
名称{{ item.cameraList ? item.system : item.title }}
</span> -->
<span> <span>
名称{{ item.cameraList ? item.system : item.title }} 名称{{ item.cameraList ? item.system : item.title }}
</span> </span>
<div></div> <div></div>
</div> </div>
</a-tooltip> </a-tooltip>
<!-- <div class="content-body-content">
<p class="content-body-content-son">
流程类型{{ item.processDefinitionName }}
</p>
</div> -->
<div class="content-body-content"> <div class="content-body-content">
<p class="content-body-content-son" v-if="typeName !== '设备申请'"> <p class="content-body-content-son">
审核结果{{ item.ended ? '审核完成' : '审核中' }} 审核结果{{ item.ended ? '审核完成' : '审核中' }}
</p> </p>
<p class="content-body-content-son" v-else>
审核结果{{ item.state === 0 ? '审核中' : '审核完成' }}
</p>
</div> </div>
<!-- <div class="content-body-content" v-if="item.currentTaskList">
<p class="content-body-content-son" v-if="!item.backToFirst">
当前节点{{ item.currentTaskList[0].taskName }}
</p>
</div> -->
<!-- <div>
<p
class="content-body-content-son"
v-if="item.name === '申请摄像头列表'"
>
<span>
申请结果{{
'列表地址:' +
backUrl +
'resource/getApplyCameraList/' +
item.processInstanceId +
';' +
'视频流地址:' +
backUrl +
'/resource/hls/getHls/?channelId='
}}
</span>
<a-button
type="primary"
size="small"
@click="
copyComment(
'列表地址:' +
backUrl +
'resource/getApplyCameraList/' +
item.processInstanceId +
';' +
'视频流地址:' +
backUrl +
'/resource/hls/getHls/?channelId='
)
"
>
复制
</a-button>
</p>
<template v-else>
<p
class="content-body-content-son"
v-if="item.approveStatus == '通过'"
>
<span>申请结果{{ item.comment || '暂无' }}</span>
<a-button
v-if="item.comment"
type="primary"
size="small"
@click="copyComment(item.comment)"
>
复制
</a-button>
</p>
</template>
</div> -->
<!-- <div class="content-body-title"></div>
<div class="content-body-content">
<p class="content-body-content-son"></p>
<div></div>
</div> -->
<!-- <div class="content-body-bottom" v-if="item.currentTaskList">
<div>申请日期{{ item.currentTaskList[0].createTime }}</div>
<div>审批人{{ item.currentTaskList[0].assigneeName }}</div>
</div> -->
<div class="content-body-bottom"> <div class="content-body-bottom">
<div>申请日期{{ item.createDate || item.startTime }}</div> <div>申请日期{{ item.createDate || item.startTime }}</div>
<div></div> <div></div>
</div> </div>
<div class="button-box"> <div class="button-box">
<div
class="button"
v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
@click="showPhoneModal(item)"
>
联系方式
</div>
<div class="button" @click="showDetail(item)">查看详情</div> <div class="button" @click="showDetail(item)">查看详情</div>
<div class="button" @click="showAdd(item)" v-if="item.backToFirst"> <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
修改 修改
</div> </div>
<!-- <div
v-if="
!(
(item.processDefinitionName == '能力需求申请' ||
item.processDefinitionName == '能力资源上架') &&
item.ended == false
)
"
v-show="
item.resourceStatusTip == '正常' &&
item.ended &&
item.processDefinitionName !== '能力申请'
"
class="button button-details"
@click="
viewDetail(
item.processDefinitionName,
item.resourceId,
item.ended,
item.businessKey
)
"
>
查看详情
</div> -->
<!-- <div
class="button button-state"
:class="{
buttonAgree: item.ended,
backToFirst: item.backToFirst,
}"
>
{{
item.ended ? '审核完成' : item.backToFirst ? '被驳回' : '审核中'
}}
</div> -->
<svg <svg
t="1652233950228" t="1652233950228"
class="icon" class="icon"
@ -179,29 +300,20 @@
</a-table> </a-table>
</a-modal> </a-modal>
</div> </div>
<!-- 联系方式弹框 -->
<a-modal
v-model:visible="phoneVisible"
title="提示"
@ok="phoneVisible = false"
>
<!-- 工业信息化局那个号电话配这个号199 6399 0996 -->
<p>请联系工业信息化局电话199 6399 0996</p>
</a-modal>
</template> </template>
<script setup> <script setup>
import { onMounted, reactive, ref, onBeforeUnmount, h } from 'vue' // import qs from 'qs'
import { onMounted, reactive, ref, onBeforeUnmount } from 'vue'
import { import {
getMyProcessInstancePage, getMyProcessInstancePage,
// getTaskHandleDetailInfo,
getTabilityapplication, getTabilityapplication,
getByApplyFlag, getByApplyFlag,
nengliziyuanshangjiaapply, nengliziyuanshangjiaapply,
getDemandForm, getDemandForm,
demandComment, demandComment,
deviceApplylist, // getProcDefBizRoute,
getDeviceDetail,
} from '@/api/personalCenter' } from '@/api/personalCenter'
import { import {
updateRes, updateRes,
@ -214,36 +326,21 @@
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
import ApplyDetails from '@/views/personalCenter/components/ApplyDetails' import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import * as moment from 'moment'
const router = useRouter() const router = useRouter()
let typeList = ref([ let typeList = ref([
'能力申请', '能力申请',
'能力评价',
'能力上架', '能力上架',
'能力下架', '能力下架',
'能力需求', '能力需求',
'需求评论', '需求评论',
'能力评价',
]) ])
// 西-
let isXiHaiAn = whoShow.itShowXiHaiAn
const phoneSate = ref([2, 3])
if (isXiHaiAn) {
typeList.value.push('设备申请')
}
const typeStrObj = {
能力上架: 'resourcemountapply',
能力下架: 'resourcundercarriageapply',
能力需求: 'abilitydemandapply',
需求评论: 'comment_review',
}
let tabList = ref(['全部', '审核中', '审核完成']) let tabList = ref(['全部', '审核中', '审核完成'])
const contentList = reactive({ data: [] }) const contentList = reactive({ data: [] })
// const contentListClone = reactive({ data: [] })
// let contentListLength = contentList.length
let tabIndex = ref(0) let tabIndex = ref(0)
let typeIndex = ref(0) let typeIndex = ref(0)
let typeName = ref(typeList.value[0])
const videoVisible = ref(false) const videoVisible = ref(false)
const numFlag = ref(true) const numFlag = ref(true)
const columns = ref([ const columns = ref([
@ -253,9 +350,8 @@
}, },
]) ])
const xVideoList = ref([]) const xVideoList = ref([])
function tabqiehuan(item, index) {
// // debugger
function changeApplyState(item, index) {
tabIndex.value = index tabIndex.value = index
switch (item) { switch (item) {
case '审核中': case '审核中':
@ -277,15 +373,14 @@
} }
// //
const changeType = (item, index) => { const changeType = (item, index) => {
console.log('item, index-----选择类型------->', item, index)
numFlag.value = true numFlag.value = true
num.value = [] num.value = []
showType.value = '' showType.value = ''
console.log(item, index)
tabIndex.value = 0 tabIndex.value = 0
ended.value = '' ended.value = ''
page.value = 1 page.value = 1
typeIndex.value = index typeIndex.value = index
typeName.value = item
getApplyList() getApplyList()
} }
let name = ref('') let name = ref('')
@ -301,22 +396,13 @@
const taskId = ref('') const taskId = ref('')
const backUrl = ref(window.SITE_CONFIG.apiURL + '/') const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
const refObj = ref({}) const refObj = ref({})
const showDetail = (item) => { const showDetail = (item) => {
// 西- console.log('showDetail', item)
if (isXiHaiAn) { // getProcDefBizRoute(item.processDefinitionId)
if (item.expireDate) { if (typeIndex.value == 0 && item.applyFlag) {
let diff = moment().diff(moment(item.expireDate), 'seconds')
if (diff > 0) {
return message.error('当前申请已过期!')
}
}
}
if (typeName.value == '能力申请' && item.applyFlag) {
getByApplyFlag(item.applyFlag).then((res) => { getByApplyFlag(item.applyFlag).then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {
refObj.value = res.data.data refObj.value = res.data.data
detailsVisible.value = true detailsVisible.value = true
processDefinitionName.value = item.processDefinitionName processDefinitionName.value = item.processDefinitionName
businessKey.value = item.businessKey businessKey.value = item.businessKey
@ -326,23 +412,7 @@
message.error('数据请求失败!') message.error('数据请求失败!')
} }
}) })
} else if (typeName.value == '设备申请') { } else if (typeIndex.value !== 1) {
getDeviceDetailInfo(item.deviceId)
.then((res) => {
if (res.data.code == 0) {
refObj.value = res.data.data
detailsVisible.value = true
processDefinitionName.value = item.processDefinitionName
// businessKey.value = item.businessKey
// processInstanceId.value = item.processInstanceId
// resourceId.value = item.resourceId
}
})
.catch((err) => {})
} else if (
Object.keys(typeStrObj).includes(typeName.value) ||
typeName.value == '能力评价'
) {
refObj.value = item refObj.value = item
detailsVisible.value = true detailsVisible.value = true
processDefinitionName.value = item.processDefinitionName processDefinitionName.value = item.processDefinitionName
@ -376,6 +446,10 @@
oInput.remove() oInput.remove()
} }
const showAdd = (item) => { const showAdd = (item) => {
// resourcemountapply
// resourcundercarriageapply
// abilitydemandapply
// abilityprocess
if (item.processDefinitionKey == 'resourcemountapply') { if (item.processDefinitionKey == 'resourcemountapply') {
const data = { const data = {
id: item.resourceId, id: item.resourceId,
@ -508,7 +582,7 @@
if (ended.value === '') { if (ended.value === '') {
delete params.ended delete params.ended
} }
if (typeName.value == '能力申请') { if (typeIndex.value == 0) {
getTabilityapplication(params).then((res) => { getTabilityapplication(params).then((res) => {
contentList.data = [] contentList.data = []
console.log('获取我的申请===============>', res.data.data) console.log('获取我的申请===============>', res.data.data)
@ -517,32 +591,25 @@
showType.value = '能力申请' showType.value = '能力申请'
initNum2() initNum2()
}) })
} else if (typeName.value == '能力评价') { } else if (typeIndex.value !== 1) {
contentList.data = [] switch (typeIndex.value) {
num.value = [] case 2:
showType.value = '' params.processDefinitionKey = 'resourcemountapply'
} else if (typeName.value == '设备申请') { processDefinitionKey.value = 'resourcemountapply'
let _state = break
ended.value === '' case 3:
? '全部' params.processDefinitionKey = 'resourcundercarriageapply'
: ended.value === true processDefinitionKey.value = 'resourcundercarriageapply'
? '审核完成' break
: '审核中' case 4:
getDeviceApply(_state) params.processDefinitionKey = 'abilitydemandapply'
.then((res) => { processDefinitionKey.value = 'abilitydemandapply'
if (res.data.code == 0) { break
contentList.data = [] case 5:
contentList.data = res.data.data.list || [] params.processDefinitionKey = 'comment_review'
total.value = res.data.data.total processDefinitionKey.value = 'comment_review'
showType.value = '设备申请' break
// }
getDeviceNum()
}
})
.catch((err) => {})
} else if (Object.keys(typeStrObj).includes(typeName.value)) {
processDefinitionKey.value = typeStrObj[typeName.value]
params.processDefinitionKey = processDefinitionKey.value
getMyProcessInstancePage(params).then((res) => { getMyProcessInstancePage(params).then((res) => {
contentList.data = [] contentList.data = []
// initNum(name.value) // initNum(name.value)
@ -570,6 +637,7 @@
showType.value = '能力下架' showType.value = '能力下架'
}) })
}) })
// params.processDefinitionKey = 'resourcundercarriageapply'
break break
case 4: case 4:
contentList.data.map((val) => { contentList.data.map((val) => {
@ -581,6 +649,7 @@
showType.value = '能力需求' showType.value = '能力需求'
}) })
}) })
// params.processDefinitionKey = 'abilitydemandapply'
break break
case 5: case 5:
contentList.data.map((val) => { contentList.data.map((val) => {
@ -592,8 +661,31 @@
showType.value = '需求评论' showType.value = '需求评论'
}) })
}) })
// params.processDefinitionKey = 'comment_review'
break break
} }
// if (contentList.data && contentList.data.length > 0) {
// contentList.data.map((item) => {
// const param = {
// page: 1,
// limit: 4,
// processInstanceId: item.processInstanceId,
// }
// getTaskHandleDetailInfo(qs.stringify(param)).then((res) => {
// console.log('', res.data.data, res.data.data[0].comment)
// const result = res.data.data
// if (result && result.length > 2) {
// item.comment =
// result[0].comment.length > result[1].comment.length
// ? result[0].comment
// : result[1].comment
// } else {
// item.comment = result[0].comment
// }
// })
// return item
// })
// }
}) })
} else { } else {
contentList.data = [] contentList.data = []
@ -664,67 +756,6 @@
} }
}) })
} }
// 西 todo
const getDeviceApply = (state) => {
return new Promise((resolve, reject) => {
let _data = {
page: page.value,
limit: 4,
state,
}
deviceApplylist(_data)
.then((res) => {
resolve(res)
console.log('res----设备申请-------->', res)
})
.catch((err) => {
reject(err)
console.log('err------------>', err)
})
})
}
// 西--
const getDeviceDetailInfo = (deviceId) => {
return new Promise((resolve, reject) => {
getDeviceDetail(deviceId)
.then((res) => {
resolve(res)
console.log('res----查询详情-------->', res)
})
.catch((err) => {
reject(err)
console.log('err------------>', err)
})
})
}
// 西-,
const getDeviceNum = () => {
if (!numFlag.value) {
return
}
num.value = []
Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
.then((res) => {
console.log('res-----数量------->', res)
let unfinished = res[0] && res[0].data && res[0].data.data
let finished = res[1] && res[1].data && res[1].data.data
num.value.unfinished = unfinished.total || ''
num.value.finished = finished.total || ''
numFlag.value = false
})
.catch((err) => {
console.log('err------------>', err)
})
}
const phoneVisible = ref(false)
const showPhoneModal = () => {
phoneVisible.value = true
}
mybus.on('closeModal', (obj) => { mybus.on('closeModal', (obj) => {
detailsVisible.value = false detailsVisible.value = false
changeType(obj.type, obj.index) changeType(obj.type, obj.index)
@ -750,21 +781,17 @@
flex-direction: column; flex-direction: column;
font-size: 16px; font-size: 16px;
justify-content: left; justify-content: left;
.title { .title {
font-size: 20px; font-size: 20px;
color: #000000; color: #000000;
font-family: 'Alibaba PuHuiTi'; font-family: 'Alibaba PuHuiTi';
font-weight: 500; font-weight: 500;
} }
.sousuokuang { .sousuokuang {
margin: 20px 0px 21px 0px; margin: 20px 0px 21px 0px;
.ant-input-search { .ant-input-search {
max-width: 490px; max-width: 490px;
} }
:deep(.ant-input) { :deep(.ant-input) {
width: 400px; width: 400px;
height: 36px; height: 36px;
@ -772,11 +799,9 @@
color: #b2b2b2; color: #b2b2b2;
background: #f5f5f5; background: #f5f5f5;
} }
:deep(.ant-input-group-addon) { :deep(.ant-input-group-addon) {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
.ant-input-search-button { .ant-input-search-button {
width: 80px; width: 80px;
height: 36px; height: 36px;
@ -785,12 +810,10 @@
} }
} }
} }
.tab { .tab {
display: flex; display: flex;
font-size: 14px; font-size: 14px;
color: #999999; color: #999999;
div { div {
// width: 70px; // width: 70px;
padding: 5px 10px; padding: 5px 10px;
@ -803,17 +826,14 @@
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
} }
.tabclass { .tabclass {
border: 1px solid #0087ff; border: 1px solid #0087ff;
color: #0087ff; color: #0087ff;
} }
} }
.content { .content {
padding-right: 10px; padding-right: 10px;
height: 510px; height: 510px;
.content-body { .content-body {
padding-bottom: 20px; padding-bottom: 20px;
padding-top: 20px; padding-top: 20px;
@ -821,7 +841,6 @@
height: 150px; height: 150px;
border-bottom: #cccccc 1px solid; border-bottom: #cccccc 1px solid;
position: relative; position: relative;
.content-body-title { .content-body-title {
min-width: 100px; min-width: 100px;
max-width: 900px; max-width: 900px;
@ -834,7 +853,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.content-body-content { .content-body-content {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
@ -842,7 +860,6 @@
/* width: 720px; */ /* width: 720px; */
display: inline-block; display: inline-block;
} }
.content-body-content-son { .content-body-content-son {
line-height: 16px; line-height: 16px;
font-size: 12px; font-size: 12px;
@ -855,7 +872,6 @@
// -webkit-box-orient: vertical; // -webkit-box-orient: vertical;
display: flex; display: flex;
color: #999999; color: #999999;
span { span {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -867,19 +883,16 @@
word-break: break-all; word-break: break-all;
} }
} }
.content-body-bottom { .content-body-bottom {
display: flex; display: flex;
color: #cccccc; color: #cccccc;
font-size: 12px; font-size: 12px;
div:first-child { div:first-child {
margin-right: 30px; margin-right: 30px;
} }
} }
} }
} }
.bottom { .bottom {
position: absolute; position: absolute;
bottom: 30px; bottom: 30px;
@ -906,16 +919,13 @@
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.buttonAgree { .buttonAgree {
background-color: #49c988; background-color: #49c988;
} }
.backToFirst { .backToFirst {
background-color: rgb(214, 91, 91); background-color: rgb(214, 91, 91);
} }
} }
:deep(.ant-badge-count) { :deep(.ant-badge-count) {
top: -5px; top: -5px;
right: -10px; right: -10px;

File diff suppressed because it is too large Load Diff

View File

@ -93,11 +93,8 @@
:checked="val.checked" :checked="val.checked"
@click.stop="checkedDept(val)" @click.stop="checkedDept(val)"
></a-checkbox> ></a-checkbox>
<span style="margin-left: 0.2rem" v-if="itShowXiHaiAn"> <span style="margin-left: 0.2rem">
{{ val.deptName}} {{ val.deptName + '(' + val.count + ')' }}
</span>
<span style="margin-left: 0.2rem" v-else>
{{ val.deptName + '(' + val.count + ')' }}
</span> </span>
</div> </div>
<DownOutlined v-show="!val.show" /> <DownOutlined v-show="!val.show" />
@ -116,13 +113,13 @@
<a-list-item-meta <a-list-item-meta
:description=" :description="
item.description || item.description ||
(item.note1 && JSON.parse(item.note1) && (JSON.parse(item.note1) &&
JSON.parse(item.note1)[0] && JSON.parse(item.note1)[0] &&
JSON.parse(item.note1)[0].channelName + JSON.parse(item.note1)[0].channelName +
'等' + '等' +
JSON.parse(item.note1).length + JSON.parse(item.note1).length +
'个摄像头') || '个摄像头') ||
'' '--'
" "
style="position: relative" style="position: relative"
> >
@ -147,9 +144,8 @@
</a-tooltip> </a-tooltip>
<span class="type">{{ item.type }}</span> <span class="type">{{ item.type }}</span>
</div> </div>
<!-- // todo -->
<span class="time"> <span class="time">
<span v-if="!itShowXiHaiAn">加购时间:{{ item.time }}</span> 加购时间:{{ item.time }}
<a-popconfirm <a-popconfirm
title="是否删除该记录?" title="是否删除该记录?"
ok-text="是" ok-text="是"
@ -322,7 +318,6 @@
const name = ref('') const name = ref('')
const type = ref('') const type = ref('')
const list = ref([]) const list = ref([])
const itShowXiHaiAn = whoShow.itShowXiHaiAn;
// //
onMounted(() => { onMounted(() => {
getList('init') getList('init')
@ -503,8 +498,6 @@
pageSize: pageSize.value, pageSize: pageSize.value,
name: name.value, name: name.value,
}).then((res) => { }).then((res) => {
console.log('res---获取信息--------->', res);
let statistics = 0 let statistics = 0
res.data.data.list.map((val) => { res.data.data.list.map((val) => {
val.initLoading = true val.initLoading = true
@ -531,13 +524,30 @@
} }
// console.log('===============>', load.value) // console.log('===============>', load.value)
// //
debugger
list.value = res.data.data.list list.value = res.data.data.list
if (index || index === 0) { if (index || index === 0) {
debugger
list.value[index].show = true list.value[index].show = true
// console.log('1111', list.value[index])
showNew(list.value[index]) showNew(list.value[index])
// showBottom()
} }
// list.value = res.data.data.list
console.log(
'重新请求值',
index,
// res.data.data.list[index].show,
list.value
)
total.value = res.data.data.deptCount total.value = res.data.data.deptCount
console.log(
'重新请求值2',
index,
// res.data.data.list[index].show,
list.value
)
showKey.value++ showKey.value++
if (type == 'init' || type == 'changePage') { if (type == 'init' || type == 'changePage') {
getListByDeptId(list.value[0]) getListByDeptId(list.value[0])
@ -548,18 +558,12 @@
const getListByDeptId = (item) => { const getListByDeptId = (item) => {
console.log(item, 'item') console.log(item, 'item')
if (item.children.length == 0) { if (item.children.length == 0) {
let _obj = { selectResourceListByDept({
pageNum: item.pageNum, pageNum: item.pageNum,
pageSize: item.pageSize, pageSize: item.pageSize,
deptId: item.deptId || '', deptId: item.deptId,
name: name.value, name: name.value,
} }).then((res) => {
// 西 todo
if(whoShow.itShowXiHaiAn) {
_obj.key = item.deptName
}
selectResourceListByDept(_obj).then((res) => {
console.log('res----根据部门查询-------->', res);
// console.log( // console.log(
// '=============>', // '=============>',
// item, // item,
@ -637,17 +641,16 @@
} }
// //
const checkedDept = (item) => { const checkedDept = (item) => {
console.log( // console.log(
'点击部门多选框==================>', // '==================>',
item, // item,
checkedList.value, // checkedList.value,
checkAll.value // checkAll.value
) // )
item.checked = !item.checked item.checked = !item.checked
if (item.checked) { if (item.checked) {
if (item.children.length > 0) { if (item.children.length > 0) {
item.children.map((val) => { item.children.map((val) => {
console.log('val.id------------>', val.id);
if (checkedListAbility.value.indexOf(val.id) == -1) { if (checkedListAbility.value.indexOf(val.id) == -1) {
checkedListAbility.value.push(val.id) checkedListAbility.value.push(val.id)
item.checkedList.push(val.id) item.checkedList.push(val.id)
@ -835,15 +838,8 @@
} else { } else {
let arr = [] let arr = []
let delArr = [] let delArr = []
console.log('list.value------------>', list.value);
list.value.map((val) => { list.value.map((val) => {
val.arr = val.children.filter((item) => { val.arr = val.children.filter((item) => {
if(whoShow.itShowXiHaiAn) {
item.type = '基础设施';
item.resourceName = '摄像头列表';
item.resourceId = '1522550195055828996';
}
console.log('选择的数据=============>', item) console.log('选择的数据=============>', item)
if (checkedListAbility.value.indexOf(item.id) > -1) { if (checkedListAbility.value.indexOf(item.id) > -1) {
if (item.delFlag == 0) { if (item.delFlag == 0) {
@ -861,7 +857,6 @@
if (arr.length > 0) { if (arr.length > 0) {
console.log('一键申请===================>', arr) console.log('一键申请===================>', arr)
localStorage.setItem('applyList', JSON.stringify(arr)) localStorage.setItem('applyList', JSON.stringify(arr))
return;
router.push({ router.push({
path: '/apply', path: '/apply',
}) })

View File

@ -1,137 +1,136 @@
<template> <template>
<div id="aside-menu-container"> <div id="aside-menu-container">
<a-menu id="aside-menu" v-model:openKeys="openKeys" v-model:selectedKeys="selectedKeys" mode="inline"> <a-menu
<a-menu-item class="aside-menu-item" v-for="item in menuList" :key="item.key" @click="handleClick(item)"> id="aside-menu"
<i class="icon" :style="{ v-model:openKeys="openKeys"
backgroundImage: v-model:selectedKeys="selectedKeys"
selectedKeys == item.key mode="inline"
? 'url(' + item.imgActive + ')' >
: 'url(' + item.img + ')', <a-menu-item
}"></i> class="aside-menu-item"
v-for="item in menuList"
:key="item.key"
@click="handleClick(item)"
>
<i
class="icon"
:style="{
backgroundImage:
selectedKeys == item.key
? 'url(' + item.imgActive + ')'
: 'url(' + item.img + ')',
}"
></i>
<span>{{ item.title }}</span> <span>{{ item.title }}</span>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</div> </div>
</template> </template>
<script> <script>
import { defineComponent, ref, onMounted } from 'vue' import { defineComponent, ref } from 'vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
export default defineComponent({ export default defineComponent({
components: {}, components: {},
setup() {
const menuList = [
// {
// title: '',
// img: require('@/assets/personalCenter/demand.png'),
// imgActive: require('@/assets/personalCenter/demandactive.png'),
// key: 'PurchaseVehicle',
// },
{
title: '我的发布',
img: require('@/assets/personalCenter/push.png'),
imgActive: require('@/assets/personalCenter/pushactive.png'),
key: 'push',
},
{
title: '我的申请',
img: require('@/assets/personalCenter/apply.png'),
imgActive: require('@/assets/personalCenter/applyactive.png'),
key: 'apply',
},
// {
// title: '',
// img: require('@/assets/personalCenter/collect.png'),
// imgActive: require('@/assets/personalCenter/collectactive.png'),
// key: 'collect',
// },
{
title: '我的浏览',
img: require('@/assets/personalCenter/recent.png'),
imgActive: require('@/assets/personalCenter/recentactive.png'),
key: 'recent',
},
{
title: '我的需求',
img: require('@/assets/personalCenter/demand.png'),
imgActive: require('@/assets/personalCenter/demandactive.png'),
key: 'demand',
},
{
title: '我的评论',
img: require('@/assets/personalCenter/remark.png'),
imgActive: require('@/assets/personalCenter/remarkactive.png'),
key: 'remark',
},
]
// 西
// if() {
// } setup() {
const selectedKeys = ref(['apply']) const menuList = [
{
title: '申购车',
img: require('@/assets/personalCenter/demand.png'),
imgActive: require('@/assets/personalCenter/demandactive.png'),
key: 'PurchaseVehicle',
},
{
title: '我的发布',
img: require('@/assets/personalCenter/push.png'),
imgActive: require('@/assets/personalCenter/pushactive.png'),
key: 'push',
},
{
title: '我的申请',
img: require('@/assets/personalCenter/apply.png'),
imgActive: require('@/assets/personalCenter/applyactive.png'),
key: 'apply',
},
{
title: '我的收藏',
img: require('@/assets/personalCenter/collect.png'),
imgActive: require('@/assets/personalCenter/collectactive.png'),
key: 'collect',
},
{
title: '我的浏览',
img: require('@/assets/personalCenter/recent.png'),
imgActive: require('@/assets/personalCenter/recentactive.png'),
key: 'recent',
},
{
title: '我的需求',
img: require('@/assets/personalCenter/demand.png'),
imgActive: require('@/assets/personalCenter/demandactive.png'),
key: 'demand',
},
{
title: '我的评论',
img: require('@/assets/personalCenter/remark.png'),
imgActive: require('@/assets/personalCenter/remarkactive.png'),
key: 'remark',
},
]
const selectedKeys = ref(['PurchaseVehicle'])
const type = JSON.parse(window.sessionStorage.getItem('type'))
if (type) {
selectedKeys.value = [type]
}
const handleClick = (item) => {
console.log('click', item)
mybus.emit('tabsChange', item)
}
const type = JSON.parse(window.sessionStorage.getItem('type')) return {
if (type) { menuList,
selectedKeys.value = [type] selectedKeys,
} handleClick,
const handleClick = (item) => { }
console.log('click', item) },
mybus.emit('tabsChange', item) })
}
onMounted(() => {
handleClick(menuList[1])
})
return {
menuList,
selectedKeys,
handleClick,
}
},
})
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#aside-menu-container { #aside-menu-container {
margin-top: 20px; margin-top: 20px;
height: 790px; height: 790px;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
:deep(.ant-menu-item) { :deep(.ant-menu-item) {
height: 60px; height: 60px;
font-size: 16px; font-size: 16px;
color: #333; color: #333;
&:hover {
&:hover { color: #0087ff;
color: #0087ff; background-color: #edf4fc;
}
}
:deep(.ant-menu-title-content) {
display: flex;
align-items: center;
.icon {
display: block;
width: 24px;
height: 24px;
background: no-repeat center;
margin-right: 30px;
}
}
:deep(.ant-menu-item-selected) {
background-color: #edf4fc; background-color: #edf4fc;
color: #0087ff;
&::after {
display: none;
}
} }
} }
#aside-menu-container::-webkit-scrollbar {
:deep(.ant-menu-title-content) { width: 0 !important;
display: flex;
align-items: center;
.icon {
display: block;
width: 24px;
height: 24px;
background: no-repeat center;
margin-right: 30px;
}
} }
:deep(.ant-menu-item-selected) {
background-color: #edf4fc;
color: #0087ff;
&::after {
display: none;
}
}
}
#aside-menu-container::-webkit-scrollbar {
width: 0 !important;
}
</style> </style>