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

合并版本

This commit is contained in:
wuhongjian 2022-07-15 14:10:46 +08:00
parent 16e4146471 3acee93e23
commit 09518566c7
15 changed files with 434 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
back/src/views/modules/ability/bsabilityai.vue
View File

@ -424,7 +424,7 @@ export default {
this.submitFrom.infoList.push(obj)
},
submitData () {
console.log('编辑11111111111===============>', this.putOnTheShelfList)
console.log('提交11111111111===============>', this.putOnTheShelfList)
const arr = []
this.putOnTheShelfList.map(item => {
item.children.map(child => {
@ -510,45 +510,45 @@ export default {
})
})
this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
if (this.submitFrom.id) {
// 解决编辑无组件类型
this.submitFrom.infoList.map(val => {
if (val.attrType === '组件类型') {
val.attrValue = this.radio
}
})
console.log('编辑===============>', this.submitFrom)
console.log(this.submitFrom.infoList, '===============abc')
// 去重
const newArr = this.submitFrom.infoList.filter((element, index, self) => {
return self.findIndex(x => x.attrType === element.attrType) === index
})
this.submitFrom.infoList = newArr
console.log(this.submitFrom.infoList, '====================================wpwpwp')
this.$http
.put('/resource/update', this.submitFrom)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error('修改失败!')
} else {
this.$message.success('修改成功！')
this.clear()
}
})
.catch(() => {})
} else {
this.$http
.post('/resource/insert?source= b', this.submitFrom)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error('上架失败!')
} else {
this.$message.success('上架成功！')
this.clear()
}
})
.catch(() => {})
}
// if (this.submitFrom.id) {
// // 解决编辑无组件类型
// this.submitFrom.infoList.map(val => {
// if (val.attrType === '组件类型') {
// val.attrValue = this.radio
// }
// })
// console.log('编辑===============>', this.submitFrom)
// console.log(this.submitFrom.infoList, '===============abc')
// // 去重
// const newArr = this.submitFrom.infoList.filter((element, index, self) => {
// return self.findIndex(x => x.attrType === element.attrType) === index
// })
// this.submitFrom.infoList = newArr
// console.log(this.submitFrom.infoList, '====================================wpwpwp')
// this.$http
// .put('/resource/update', this.submitFrom)
// .then(({ data: res }) => {
// if (res.code !== 0) {
// this.$message.error('修改失败!')
// } else {
// this.$message.success('修改成功！')
// this.clear()
// }
// })
// .catch(() => {})
// } else {
// this.$http
// .post('/resource/insert?source= b', this.submitFrom)
// .then(({ data: res }) => {
// if (res.code !== 0) {
// this.$message.error('上架失败!')
// } else {
// this.$message.success('上架成功！')
// this.clear()
// }
// })
// .catch(() => {})
// }
},
// 新修改
UpdateData (item) {

29
back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
View File

@ -113,10 +113,39 @@ export default {
this.options = dataList
if (!this.data.note1) {
this.$http.get('/sys/user/info').then(({ data: res }) => {
console.log(res.data)
this.data.note1 = res.data.deptId
})
}
})
} else if (this.data.name === '部门联系人') {
this.$http.get('/sys/dept/all').then(res => {
const dataList = []
res.data.data.forEach((element) => {
dataList.push(element)
})
this.options = dataList
if (!this.data.note1) {
this.$http.get('/sys/user/info').then(({ data: res }) => {
console.log(res.data)
this.data.note1 = res.data.realName || ''
})
}
})
} else if (this.data.name === '部门联系人电话') {
this.$http.get('/sys/dept/all').then(res => {
const dataList = []
res.data.data.forEach((element) => {
dataList.push(element)
})
this.options = dataList
if (!this.data.note1) {
this.$http.get('/sys/user/info').then(({ data: res }) => {
console.log(res.data)
this.data.note1 = res.data.mobile || ''
})
}
})
}
},
chekBoxChange (list) {

46
back/src/views/modules/putOnTheShelf/components/special.vue
View File

@ -36,13 +36,32 @@
<div class="add">添加更多{{ configure.name }}</div>
<div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
<span>{{ val.name }}</span>
<a-input v-model:value="val.note1" :maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
v-if="val.type == 'input'"/>
<!-- <a-input v-model:value="val.note1" ::maxlength="24" placeholder="'请填写' + val.name + ',不超过24个字符'"
v-if="val.type == 'input'"/> -->
<template v-if="val.type == 'input2'">
<a-input
v-model:value="val.note1"
:placeholder="'请填写' + val.name"
/>
<span style="width: 2.5rem; padding-left: 0.1rem">
{{
numType == '一次性买断'
? '元'
: numType == '按调用次数'
? '元/次'
: numType == '按并发路数'
? '元/路'
: numType == '按年计费'
? '元/年'
: ''
}}
</span>
</template>
<a-textarea v-model:value="val.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + val.name"
v-else-if="val.type == 'textArea'"/>
<a-input-number v-model:value="val.note1" :min="0" :max="9999" :step="0.01" string-mode
:placeholder="'请填写' + val.name" v-else-if="val.type == 'number'" />
<a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'" />
<a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'" @change="radioChange"/>
<!-- <upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型，大小不超过100M"
v-else-if="val.type == 'image'"></upload> -->
<upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload>
@ -68,7 +87,8 @@ export default {
data () {
return {
data: [],
showKey: 0
showKey: 0,
numType: '一次性买断'
}
},
methods: {
@ -85,7 +105,21 @@ export default {
if (flag) {
const obj = {}
list.forEach((item) => {
if (item.type === 'input2') {
obj[item.field] =
item.note1 +
(this.numType === '一次性买断'
? '元'
: this.numType === '按调用次数'
? '元/次'
: this.numType === '按并发路数'
? '元/路'
: this.numType === '按年计费'
? '元/年'
: '')
} else {
obj[item.field] = item.note1
}
})
this.data.push(obj)
this.$emit('changeInfoList', {
@ -108,6 +142,10 @@ export default {
attrValue: JSON.stringify(this.data),
delFlag: 0
})
},
radioChange (e) {
console.log(e, 'wewewe')
this.numType = e.target.value
}
},
created () {

10
back/src/views/modules/putOnTheShelf/index.vue
View File

@ -23,8 +23,8 @@
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"
tip="支持视频类型，大小不超过100M"></upload>
<input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
@ -106,13 +106,13 @@ export default {
field: 'type',
type: 'radio',
options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
note1: ''
note1: '一次性买断'
},
{
name: '计费标准',
field: 'price',
type: 'number',
company: '元',
type: 'input2',
// company: '元',
note1: ''
},
{

5
back/src/views/modules/sys/log-data-modification-log.vue
View File

@ -221,7 +221,7 @@ export default {
}
},
operationType (val) {
if (val !== 'all') {
if (val !== 'all' && val !== '') {
this.dataForm.operationType = val
}
}
@ -245,6 +245,7 @@ export default {
// 重置按钮
resetFunction () {
this.operationType = '' // 操作类型转化
const params = {
status: '',
creatorName: '',
@ -254,10 +255,10 @@ export default {
operationType: 'all'
}
this.value1 = '' // 格式化日期
this.operationType = '' // 操作类型转化
this.page = 1
this.limit = 10
this.dataForm = params
console.log('this.dataForm', this.dataForm)
this.getDataList() // 重置完调用查询方法
},
// 序号

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

@ -32,7 +32,7 @@ if (newLocation === 'qingdao') {
{ name: '能力统计', key: 'abilityStatistics' },
// { name: '开发指南', key: 'developmentGuide' },
{ name: '指导手册', key: 'instructionManual' },
// { name: '需求中心', key: 'demandCenter' },
{ name: '需求中心', key: 'demandCenter' },
// { name: '个人中心', key: 'personalCenter' },
{ name: '区市站点', key: 'mapTest' },
// { name: '后台管理', key: 'houtaiguanli' },

8
front/src/views/capacityOnTheShelf/Algorithm.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-14 09:44:38
* @LastEditTime: 2022-07-15 11:50:22
* @Description: 算法上架
-->
<template>
@ -157,13 +157,13 @@
field: 'type',
type: 'radio',
options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
note1: '',
note1: '一次性买断',
},
{
name: '计费标准',
field: 'price',
type: 'number',
company: '元',
type: 'input2',
// company: '元',
note1: '',
},
{

60
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-13 18:14:42
* @LastEditTime: 2022-07-15 11:51:18
* @Description: 上架
-->
<template>
@ -58,6 +58,25 @@
:placeholder="'请填写' + val.name + ',不超过24个字符'"
v-if="val.type == 'input'"
/>
<template v-if="val.type == 'input2'">
<a-input
v-model:value="val.note1"
:placeholder="'请填写' + val.name"
/>
<span style="width: 0.5rem; padding-left: 0.1rem">
{{
numType == '一次性买断'
? '元'
: numType == '按调用次数'
? '元/次'
: numType == '按并发路数'
? '元/路'
: numType == '按年计费'
? '元/年'
: ''
}}
</span>
</template>
<a-textarea
v-model:value="val.note1"
:showCount="true"
@ -77,6 +96,7 @@
<a-radio-group
v-model:value="val.note1"
:options="val.options"
@change="radioChange"
v-else-if="val.type == 'radio'"
/>
<upload
@ -110,13 +130,13 @@
:options="item.options"
/>
<a-input
v-else-if="item.type == 'text'"
v-else-if="item.type == 'AbilityType'"
v-model:value="item.note1"
:placeholder="'请输入' + item.name"
:disabled="true"
/>
<a-input
v-else-if="item.type == 'text2'"
v-else-if="item.type == 'ComponentType'"
v-model:value="item.note1"
:placeholder="'请输入' + item.name"
:disabled="true"
@ -179,11 +199,14 @@
:list="props.videoList"
tip="支持视频类型，大小不超过100M"
></upload>
<a-button v-else-if="item.type == 'dialog'" @click="sourceClick">
<a-button
v-else-if="item.type == 'AssociatedApplication'"
@click="sourceClick"
>
请选择来源应用
</a-button>
<a-button
v-else-if="item.type == 'dialog2'"
v-else-if="item.type == 'AssociatedComponents'"
@click="componentsClick"
>
请选择关联组件
@ -329,6 +352,10 @@
list: [],
})
const showKey = ref(0)
const numType = ref('一次性买断')
const radioChange = (e) => {
numType.value = e.target.value
}
props.refData.children.map((item) => {
if (item.name == '基本信息') {
item.children.map((val) => {
@ -436,7 +463,21 @@
if (flag) {
let obj = {}
list.forEach((item) => {
if (item.type === 'input2') {
obj[item.field] =
item.note1 +
(numType.value == '一次性买断'
? '元'
: numType.value == '按调用次数'
? '元/次'
: numType.value == '按并发路数'
? '元/路'
: numType.value == '按年计费'
? '元/年'
: '')
} else {
obj[item.field] = item.note1
}
})
data.value[title].push(obj)
// console.log(data.value[title])
@ -685,17 +726,18 @@
margin-top: 20px;
display: flex;
justify-content: flex-start;
align-items: center;
span:first-child {
width: 120px;
}
:deep(.ant-input-textarea) {
width: 570px;
width: 520px;
}
:deep(.ant-radio-group) {
width: 570px;
width: 520px;
}
:deep(.ant-input-number) {
@ -704,7 +746,7 @@
:deep(.ant-input) {
resize: none;
width: 570px;
width: 520px;
}
.ant-btn {
@ -742,7 +784,7 @@
}
.application-Area {
width: 570px;
width: 520px;
display: grid;
margin-top: -5px;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;

1
front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
View File

@ -92,6 +92,7 @@
align-items: center;
.item {
width: 424px;
height:306px;
padding: 35px;
display: flex;
flex-direction: column;

265
front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 使用方式 -->
<div class="usage-mode" v-if="flag">
<div class="usage-mode" v-if="true">
<div class="tltle">
<DetalsTitle
:title="dataFrom.title"
@ -12,7 +12,6 @@
<div class="left">
<div class="content-left-title">
<span>{{ item.title }}</span>
<span>{{ item.titleSon }}</span>
</div>
<div class="content-left-content">
<p>
@ -30,10 +29,11 @@
</div>
<div class="right">
<div @click="technical()">技术文档</div>
<!-- <div>新手指引</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>
@ -59,22 +59,48 @@
</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>
</template>
<script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { message } from 'ant-design-vue'
import { pinyin } from 'pinyin-pro'
import { ref, defineProps, watch } from 'vue'
import { message } from 'ant-design-vue'
let dataFrom = ref({
title: '使用方式',
englishTitle: 'USAGE',
content: [
{
title: '技术对接',
titleSon: '调用接口',
title: '组件地址',
link: {
name: '服务接口：',
value: '',
@ -83,16 +109,23 @@
name: '请求方式：',
value: '',
},
contact: '联系厂商',
facilitator: { name: '服务商：', value: '科大讯飞' },
people: { name: '联系人：', value: '李四' },
linkValue: '',
contact: '归属部门',
facilitator: { name: '归属部门：', value: '' },
people: { name: '部门联系人：', value: '' },
phone: {
name: '联系电话：',
value: '12345678901',
name: '联系人电话：',
value: '',
},
contact2: '服务商',
facilitator2: { name: '服务商：', value: '' },
people2: { name: '服务商联系人：', value: '' },
phone2: {
name: '联系人电话：',
value: '',
},
},
],
link: '',
})
//数据初始化
const props = defineProps({
@ -105,6 +138,9 @@
item.attrType === '技术文档' ||
item.attrType === '服务商' ||
item.attrType === '服务商联系人' ||
item.attrType === '使用手册' ||
item.attrType === '服务接口' ||
item.attrType === '样式服务地址' ||
item.attrType === '服务商联系电话'
)[0]
if (!obj) {
@ -112,23 +148,22 @@
} else {
// eslint-disable-next-line vue/no-setup-props-destructure
dataFrom.value.content[0].link.value = props.dataList.apiUrl
// eslint-disable-next-line vue/no-setup-props-destructure
dataFrom.value.content[0].postMethod.value = props.dataList.apiMethodType
dataFrom.value.content[0].facilitator.value = props.dataList.deptName
dataFrom.value.content[0].people.value = props.dataList.deptContacts
dataFrom.value.content[0].phone.value = props.dataList.deptPhone
dataFrom.value.content[0].postMethod.value = val.apiMethodType
console.log('dataList', props.dataList)
props.dataList.infoList.map((item) => {
if (item.attrType === '使用方式') {
dataFrom.value.content[0].titleSon = item.attrValue
if (item.attrType === '组件地址') {
dataFrom.value.content[0].linkValue = item.attrValue || '--'
} else if (item.attrType === '服务商') {
dataFrom.value.content[0].facilitator.value = item.attrValue || '--'
dataFrom.value.content[0].facilitator2.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系人') {
dataFrom.value.content[0].people.value = item.attrValue || '--'
dataFrom.value.content[0].people2.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[0].phone.value = item.attrValue || '--'
}
// } else if (item.attrType === '技术文档') {
// dataFrom.value.link = item.attrValue || '--'
// }
else if (item.attrType === '服务接口') {
dataFrom.value.content[0].phone2.value = item.attrValue || '--'
} else if (item.attrType === '服务接口') {
debugger
dataFrom.value.content[0].link.value = item.attrValue || '--'
}
})
@ -143,29 +178,32 @@
item.attrType === '技术文档' ||
item.attrType === '服务商' ||
item.attrType === '服务商联系人' ||
item.attrType === '使用手册' ||
item.attrType === '服务接口' ||
item.attrType === '样式服务地址' ||
item.attrType === '服务商联系电话'
)[0]
if (!obj) {
flag.value = false
} else {
dataFrom.value.content[0].link.value = val.apiUrl
dataFrom.value.content[0].facilitator.value = val.deptName
dataFrom.value.content[0].people.value = val.deptContacts
dataFrom.value.content[0].phone.value = val.deptPhone
dataFrom.value.content[0].postMethod.value = val.apiMethodType
console.log('dataList', val)
val.infoList.map((item) => {
if (item.attrType === '使用方式') {
dataFrom.value.content[0].titleSon = item.attrValue
if (item.attrType === '组件地址') {
dataFrom.value.content[0].linkValue = item.attrValue || '--'
} else if (item.attrType === '服务商') {
dataFrom.value.content[0].facilitator.value =
dataFrom.value.content[0].facilitator2.value =
item.attrValue || '--'
} else if (item.attrType === '服务商联系人') {
dataFrom.value.content[0].people.value = item.attrValue || '--'
dataFrom.value.content[0].people2.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[0].phone.value = item.attrValue || '--'
}
// else if (item.attrType === '技术文档') {
// dataFrom.value.link = item.attrValue || '--'
// }
else if (item.attrType === '服务接口') {
dataFrom.value.content[0].phone2.value = item.attrValue || '--'
} else if (item.attrType === '服务接口') {
debugger
dataFrom.value.content[0].link.value = item.attrValue || '--'
}
})
@ -185,7 +223,6 @@
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '技术文档'
)[0]
// console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
} else {
@ -195,6 +232,31 @@
message.error('暂未上传技术文档')
}
}
function technicalNew() {
// 拼接路径
// const type = pinyin(props.dataList.type, {
// pattern: 'initial',
// }).replace(/\s*/g, '')
// // 打开文档
// const id = props.dataList.id
// window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else {
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂未上传使用手册')
}
}
</script>
<style lang="less" scoped>
@ -202,103 +264,128 @@
display: flex;
flex-direction: column;
align-items: center;
padding: 80px 0;
padding: 0.8rem 0;
.content {
margin-top: 30px;
margin-top: 0.3rem;
display: flex;
.content-left {
height: 150px;
width: 620px;
background: linear-gradient(to right, #7184fc, #94a3fc);
border-radius: 10px;
margin-right: 60px;
box-shadow: 0px 5px 15px rgba(82, 106, 255, 0.4);
height: 1.5rem;
width: 6.2rem;
background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
no-repeat;
background-position: center;
background-size: 100% 100%;
border-radius: 0.1rem;
margin-right: 0.6rem;
box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
display: flex;
align-items: center;
padding: 0 35px;
padding: 0 0.35rem;
.left {
.content-left-title {
font-size: 26px;
line-height: 26px;
font-size: 0.26rem;
line-height: 0.26rem;
color: #212956;
margin-bottom: 20px;
margin-bottom: 0.2rem;
span:first-child {
margin-right: 10px;
margin-right: 0.1rem;
}
}
.content-left-content {
width: 420px;
font-size: 20px;
width: 4.2rem;
font-size: 0.2rem;
color: rgba(33, 41, 86, 0.8);
line-height: 20px;
line-height: 0.2rem;
p {
display: -webkit-box;
margin-bottom: 0.1rem;
span:last-of-type {
width: 298px;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-bottom: 10px;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
}
}
}
.right {
div {
height: 40px;
width: 130px;
height: 0.4rem;
width: 1.3rem;
background: #ffffff;
border-radius: 20px;
border-radius: 0.2rem;
color: #526aff;
font-size: 20px;
font-size: 0.2rem;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
div:first-child {
margin-bottom: 20px;
margin-bottom: 0.2rem;
}
}
}
.content-right {
height: 150px;
width: 620px;
background: linear-gradient(
to right,
rgba(113, 132, 252, 0.4),
rgba(148, 163, 252, 0.4)
);
border-radius: 10px;
box-shadow: 0px 5px 15px rgba(82, 106, 255, 0.4);
height: 1.5rem;
width: 6.2rem;
background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
no-repeat;
background-position: center;
background-size: 100% 100%;
border-radius: 0.1rem;
box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
display: flex;
flex-direction: column;
justify-content: center;
padding: 0 30px;
.content-right-title {
font-size: 26px;
line-height: 26px;
color: #212956;
margin-bottom: 25px;
justify-content: space-around;
align-items: center;
padding: 0 0.3rem;
.content-right-left {
border-right: 0.01rem solid #707fe0;
padding-right: 0.1rem;
margin-right: 0.1rem;
}
.content-right-title {
font-size: 0.26rem;
line-height: 0.26rem;
color: #212956;
margin-bottom: 0.15rem;
}
.content-right-content {
display: flex;
font-size: 18px;
font-size: 0.16rem;
color: rgba(33, 41, 86, 0.8);
line-height: 20px;
line-height: 0.2rem;
overflow: hidden;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
margin-bottom: 10px;
flex-direction: column;
p {
// width: 160px;
height: 20px;
overflow: hidden;
text-overflow: ellipsis;
// width: 1.60rem;
height: 0.2rem;
display: -webkit-box;
// overflow: hidden;
margin-bottom: 0.08rem;
white-space: nowrap;
margin-right: 15px;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
margin-right: 0.15rem;
span {
display: inline-block;
max-width: 1.2rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
}
}

2
front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 使用方式 -->
<div class="usage-mode" v-if="flag">
<div class="usage-mode" v-if="true">
<div class="tltle">
<DetalsTitle
:title="dataFrom.title"

2
front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
View File

@ -1,6 +1,6 @@
<!--使用方式-->
<template>
<div class="application-deployment-and-security" v-if="flag">
<div class="application-deployment-and-security" v-if="true">
<div class="title">
<DetalsTitle
:title="dataFrom.title"

2
front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 使用方式 -->
<div class="usage-mode" v-if="flag">
<div class="usage-mode" v-if="true">
<div class="tltle">
<DetalsTitle
:title="dataFrom.title"

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

@ -168,6 +168,7 @@
<div
v-if="
selectCardsname !== '应用资源' &&
selectCardsname !== '数据资源' &&
selectCardsname !== '融合服务'
"
>

16
front/src/views/personalCenter/components/MyApply.vue
View File

@ -83,10 +83,7 @@
</div> -->
<div class="content-body-content">
<p class="content-body-content-son">
审核结果：{{
// item.ended ? '审核完成' : item.backToFirst ? '被终止' : '审核中'
item.approveStatus || item.resourceStatusTip || '--'
}}
审核结果：{{ item.ended ? '审核完成' : '审核中' }}
</p>
</div>
<!-- <div class="content-body-content" v-if="item.currentTaskList">
@ -344,6 +341,7 @@
let tabIndex = ref(0)
let typeIndex = ref(0)
const videoVisible = ref(false)
const numFlag = ref(true)
const columns = ref([
{
title: '摄像头名称',
@ -374,6 +372,7 @@
}
// 选择类型
const changeType = (item, index) => {
numFlag.value = true
num.value = []
showType.value = ''
console.log(item, index)
@ -499,6 +498,7 @@
unfinished: 0,
})
const initNum = () => {
if (numFlag.value) {
num.value = []
getMyProcessInstancePage({
page: 1,
@ -516,12 +516,15 @@
}).then((res) => {
if (res.data.code == 0) {
num.value.finished = res.data.data.total
numFlag.value = false
}
})
}
})
}
}
const initNum2 = () => {
if (numFlag.value) {
num.value = []
getTabilityapplication({
page: 1,
@ -537,11 +540,13 @@
}).then((res) => {
if (res.data.code == 0) {
num.value.finished = res.data.data.total
numFlag.value = false
}
})
}
})
}
}
// initNum()
const total = ref('')
const showType = ref('')
@ -564,6 +569,9 @@
ended: ended.value,
// name: name.value,
}
if (ended.value === '') {
delete params.ended
}
if (typeIndex.value == 0) {
getTabilityapplication(params).then((res) => {
contentList.data = []