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

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

This commit is contained in:
gongjiale 2022-11-02 09:06:27 +08:00
parent 6eae78fd3b e4cdac8bb9
commit 952db84e29
14 changed files with 239 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,7 +479,7 @@ export default {
this.total = 0 this.total = 0
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
if (res.data.list.length !== 0) { if (res.data.list.length >= 0) {
this.dataList = res.data.list this.dataList = res.data.list
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total

2
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -395,7 +395,7 @@ export default {
this.total = 0 this.total = 0
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
if (res.data.list.length !== 0) { if (res.data.list.length >= 0) {
this.dataList = res.data.list this.dataList = res.data.list
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total

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

@ -31,7 +31,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!--审核状态--> <!--审核状态-->
<el-form-item> <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<span>审核状态：</span> <span>审核状态：</span>
<el-select v-model="examineStatus" placeholder="请选审核状态" clearable> <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
<el-option label="全部" value="-1"></el-option> <el-option label="全部" value="-1"></el-option>
@ -53,7 +53,7 @@
</el-form-item> </el-form-item>
<!--类型--> <!--类型-->
<el-form-item> <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<span>类型：</span> <span>类型：</span>
<el-select @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型" clearable> <el-select @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型" clearable>
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>

2
back/src/views/modules/algorithm/algorithm-management.vue
View File

@ -249,7 +249,7 @@ export default {
this.total = 0 this.total = 0
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
if (res.data.list.length !== 0) { if (res.data.list.length >= 0) {
this.dataList = res.data.list this.dataList = res.data.list
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total

170
back/src/views/modules/canassigncase/index.vue
View File

@ -131,54 +131,54 @@
</template> </template>
<script> <script>
import mixinViewModule from "@/mixins/view-module"; import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from "./canassigncase-add-or-update"; import AddOrUpdate from './canassigncase-add-or-update'
import dictionaries from "@/utils/dictionaries"; import dictionaries from '@/utils/dictionaries'
import qs from "qs"; import qs from 'qs'
import { type } from "os"; import { type } from 'os'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data() { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: "/resource/page", getDataListURL: '/resource/page',
getDataListIsPage: true, getDataListIsPage: true,
exportURL: "/ability/bsabilityai/export", exportURL: '/ability/bsabilityai/export',
deleteURL: "/resource/delete", deleteURL: '/resource/delete',
deleteIsBatch: true, deleteIsBatch: true
}, },
disabled: false, disabled: false,
sceneArr: dictionaries.sceneArr, sceneArr: dictionaries.sceneArr,
fieldArr: dictionaries.fieldArr, fieldArr: dictionaries.fieldArr,
shareFormArr: dictionaries.shareFormArr, shareFormArr: dictionaries.shareFormArr,
dataForm: { dataForm: {
name: "", name: '',
creator: "", creator: '',
selectType: 0, selectType: 0,
delFlag: 0, delFlag: 0,
type: "赋能案例", type: '赋能案例'
}, },
qp: false, qp: false
}; }
}, },
watch: {}, watch: {},
components: { components: {
AddOrUpdate, AddOrUpdate
}, },
created() { created () {
this.dataForm.name = ""; this.dataForm.name = ''
this.dataForm.type = "赋能案例"; this.dataForm.type = '赋能案例'
}, },
mounted() { mounted () {
window.addEventListener("resize", this.a); window.addEventListener('resize', this.a)
this.fullScreen(); this.fullScreen()
}, },
methods: { methods: {
reset() { reset () {
this.$http this.$http
.get( .get(
this.mixinViewModuleOptions.getDataListURL + this.mixinViewModuleOptions.getDataListURL +
"?" + '?' +
qs.stringify({ qs.stringify({
// order: this.order, // order: this.order,
// orderField: this.orderField, // orderField: this.orderField,
@ -187,138 +187,138 @@ export default {
selectType: 0, selectType: 0,
limit: 10, limit: 10,
delFlag: 0, delFlag: 0,
creator: "", creator: '',
type: "赋能案例", type: '赋能案例',
name: "", name: ''
}) })
) )
.then(({ data: res }) => { .then(({ data: res }) => {
this.dataForm.name = ""; this.dataForm.name = ''
if (res.code !== 0) { if (res.code !== 0) {
this.dataList = []; this.dataList = []
this.total = 0; this.total = 0
return this.$message.error(res.msg); return this.$message.error(res.msg)
} }
this.dataList = this.mixinViewModuleOptions.getDataListIsPage this.dataList = this.mixinViewModuleOptions.getDataListIsPage
? res.data.list ? res.data.list
: res.data; : res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total
: 0; : 0
if (this.mixinViewModuleOptions.requestCallback) { if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data); this.mixinViewModuleOptions.requestCallback(res.data)
} }
this.dataListLoading = false; this.dataListLoading = false
}) })
.catch(() => { .catch(() => {
this.dataListLoading = false; this.dataListLoading = false
}); })
}, },
showDetail(val) { showDetail (val) {
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true
this.disabled = false; this.disabled = false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.UpdateState = false; this.$refs.addOrUpdate.UpdateState = false
this.$refs.addOrUpdate.dataFormShowDetails = val; this.$refs.addOrUpdate.dataFormShowDetails = val
this.$refs.addOrUpdate.init(); this.$refs.addOrUpdate.init()
}); })
this.disabled = true; this.disabled = true
}, },
showDocument(val) { showDocument (val) {
console.log(val); console.log(val)
window.open( window.open(
window.SITE_CONFIG.frontUrl + "?id=" + val.id + "&&type=" + val.type, window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
"_blank" '_blank'
); )
}, },
findValue(list, type) { findValue (list, type) {
const found = list.find((item) => item.attrType === type); const found = list.find((item) => item.attrType === type)
if (found) { if (found) {
return found.attrValue; return found.attrValue
} else { } else {
return "暂无数据"; return '暂无数据'
} }
}, },
getDataList2(names) { getDataList2 (names) {
if (names != null) { if (names != null) {
this.$http this.$http
.get( .get(
this.mixinViewModuleOptions.getDataListURL + this.mixinViewModuleOptions.getDataListURL +
"?" + '?' +
qs.stringify({ qs.stringify({
// order: this.order, // order: this.order,
// orderField: this.orderField, // orderField: this.orderField,
// type: '组件服务', // type: '组件服务',
pageNum: 1, pageNum: 1,
pageSize: this.limit, pageSize: this.limit,
type: "赋能案例", type: '赋能案例',
creator: "", creator: '',
selectType: 0, selectType: 0,
delFlag: 0, delFlag: 0,
name: names, name: names
}) })
) )
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.dataList = []; this.dataList = []
this.total = 0; this.total = 0
return this.$message.error(res.msg); return this.$message.error(res.msg)
} }
if (res.data.list.length !== 0) { if (res.data.list.length >= 0) {
this.dataList = res.data.list; this.dataList = res.data.list
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total
: 0; : 0
if (this.mixinViewModuleOptions.requestCallback) { if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data); this.mixinViewModuleOptions.requestCallback(res.data)
} }
this.dataListLoading = false; this.dataListLoading = false
} else { } else {
this.$message.error("未查询到相关信息"); this.$message.error('未查询到相关信息')
this.reset(); this.reset()
} }
}) })
.catch(() => { .catch(() => {
this.dataListLoading = false; this.dataListLoading = false
}); })
} else { } else {
this.$message.error("查询不能输入为空"); this.$message.error('查询不能输入为空')
} }
}, },
fullScreen() { fullScreen () {
if (window.outerHeight === screen.availHeight) { if (window.outerHeight === screen.availHeight) {
if (window.outerWidth === screen.availWidth) { if (window.outerWidth === screen.availWidth) {
console.log( console.log(
"全屏1", '全屏1',
window.outerHeight, window.outerHeight,
screen.availHeight, screen.availHeight,
window.outerWidth, window.outerWidth,
screen.availWidth screen.availWidth
); )
this.qp = false; this.qp = false
} else { } else {
console.log( console.log(
"不是全屏2", '不是全屏2',
window.outerHeight, window.outerHeight,
screen.availHeight, screen.availHeight,
window.outerWidth, window.outerWidth,
screen.availWidth screen.availWidth
); )
this.qp = true; this.qp = true
} }
} else { } else {
console.log( console.log(
"不是全屏3", '不是全屏3',
window.outerHeight, window.outerHeight,
screen.availHeight, screen.availHeight,
window.outerWidth, window.outerWidth,
screen.availWidth screen.availWidth
); )
this.qp = true; this.qp = true
} }
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-tooltip__popper { .el-tooltip__popper {

3
back/src/views/modules/myAgent/AbilityResourceShelf.vue
View File

@ -154,7 +154,6 @@ export default {
methods: { methods: {
// 处理 // 处理
taskHandle (row) { taskHandle (row) {
console.log('row======================>', row, this.forwardHandleUrl)
if (!row.businessKey) { if (!row.businessKey) {
return this.$message.error(this.$t('task.businessKeyError')) return this.$message.error(this.$t('task.businessKeyError'))
} }
@ -171,7 +170,9 @@ export default {
bus.$off('abilityResourceShelfInit') bus.$off('abilityResourceShelfInit')
bus.$on('abilityResourceShelfInit', () => { bus.$on('abilityResourceShelfInit', () => {
this.getDataList() this.getDataList()
bus.$emit('updateTaskNum')
}) })
} }
} }
</script> </script>

1
back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
View File

@ -171,6 +171,7 @@ export default {
bus.$off('AbilityResourcesRemovedInit') bus.$off('AbilityResourcesRemovedInit')
bus.$on('AbilityResourcesRemovedInit', () => { bus.$on('AbilityResourcesRemovedInit', () => {
this.getDataList() this.getDataList()
bus.$emit('updateTaskNum')
}) })
} }
} }

272
back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
View File

@ -7,84 +7,62 @@
<div class="dataTitleSon"> <div class="dataTitleSon">
{{ itemson.name }} {{ itemson.name }}
</div> </div>
<div <div class="dataContent" v-if="
class="dataContent" itemson.name !== '算法优势' &&
v-if=" itemson.name !== '应用场景' &&
itemson.name !== '算法优势' && itemson.name !== '功能介绍'
itemson.name !== '应用场景' && ">
itemson.name !== '功能介绍' <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
" itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
> " v-show="
<el-form-item !(
v-for="itemsonson in itemson.children" itemsonson.name === '平台地址' ||
:key="itemsonson.name" itemsonson.name === 'SDK安装包' ||
:label=" itemsonson.name === '接口请求方式' ||
itemsonson.type != ' multipleAdditions' ? itemsonson.name : '' itemsonson.name === '服务接口'
" )
v-show=" ">
!( <div class="videoAndImgCss" v-if="
itemsonson.name === '平台地址' || itemsonson.type === 'video' || itemsonson.type === 'image'
itemsonson.name === 'SDK安装包' || " @click="videoAndImg(itemsonson.note1)">
itemsonson.name === '接口请求方式' ||
itemsonson.name === '服务接口'
)
"
>
<div
class="videoAndImgCss"
v-if="
itemsonson.type === 'video' || itemsonson.type === 'image'
"
@click="videoAndImg(itemsonson.note1)"
>
浏览 浏览
</div> </div>
<div <div class="videoAndImgCss" v-if="
class="videoAndImgCss" itemsonson.name === '上传附件'
v-if=" " @click="videoAndImg(itemsonson.note1)">
itemsonson.name === '上传附件'
"
@click="videoAndImg(itemsonson.note1)"
>
下载 下载
</div> </div>
<div <div v-else-if="itemsonson.type === ' multipleAdditions'" class="multipleAdditionsClass">
v-else-if="itemsonson.type === ' multipleAdditions'" <div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem">
class="multipleAdditionsClass"
>
<div
v-for="multipleAdditionsItem in itemsonson.note1"
:key="multipleAdditionsItem"
>
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content"> <div slot="content">
{{ {{
multipleAdditionsItem.question || multipleAdditionsItem.question ||
multipleAdditionsItem.type || multipleAdditionsItem.type ||
multipleAdditionsItem.name multipleAdditionsItem.name
}} }}
</div> </div>
<div> <div>
{{ {{
multipleAdditionsItem.question || multipleAdditionsItem.question ||
multipleAdditionsItem.type || multipleAdditionsItem.type ||
multipleAdditionsItem.name multipleAdditionsItem.name
}} }}
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content"> <div slot="content">
{{ {{
multipleAdditionsItem.answer || multipleAdditionsItem.answer ||
multipleAdditionsItem.price || multipleAdditionsItem.price ||
multipleAdditionsItem.img multipleAdditionsItem.img
}} }}
</div> </div>
<div> <div>
{{ {{
multipleAdditionsItem.answer || multipleAdditionsItem.answer ||
multipleAdditionsItem.price || multipleAdditionsItem.price ||
multipleAdditionsItem.img multipleAdditionsItem.img
}} }}
</div> </div>
</el-tooltip> </el-tooltip>
@ -95,54 +73,31 @@
<!-- <div>{{ multipleAdditionsItem }}</div> --> <!-- <div>{{ multipleAdditionsItem }}</div> -->
</div> </div>
</div> </div>
<el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1"> <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null ? false : true"
:content="itemsonson.note1">
<!-- <div slot="content" v-show="itemsonson.note1">{{ itemsonson.note1 }}</div> --> <!-- <div slot="content" v-show="itemsonson.note1">{{ itemsonson.note1 }}</div> -->
<el-input <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
v-model="itemsonson.note1"
disabled="disabled"
></el-input>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
v-for="itemsonson in itemson.children" itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
:key="itemsonson.name" " v-show="
:label=" (itemsonson.name === '平台地址' && showDocking) ||
itemsonson.type != ' multipleAdditions' ? itemsonson.name : '' (itemsonson.name === 'SDK安装包' && showSDK) ||
" (itemsonson.name === '接口请求方式' && showInterface) ||
v-show=" (itemsonson.name === '服务接口' && showInterface)
(itemsonson.name === '平台地址' && showDocking) || ">
(itemsonson.name === 'SDK安装包' && showSDK) || <el-tooltip placement="top" :disabled="itemsonson.note1 !== null ? false : true" :content="itemsonson.note1">
(itemsonson.name === '接口请求方式' && showInterface) || <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
(itemsonson.name === '服务接口' && showInterface) </el-tooltip>
"
>
<el-tooltip placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
<el-input
v-model="itemsonson.note1"
disabled="disabled"
></el-input>
</el-tooltip>
</el-form-item> </el-form-item>
</div> </div>
<div <div v-else-if="itemson.name === '算法优势'" style="margin-bottom: 20px">
v-else-if="itemson.name === '算法优势'" <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
style="margin-bottom: 20px" <div v-if="itemDataForm.attrType === '算法优势'" class="textAndImg">
> <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
<div class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
v-for="itemDataForm in dataForm.infoList"
:key="itemDataForm.attrType"
>
<div
v-if="itemDataForm.attrType === '算法优势'"
class="textAndImg"
>
<div
v-for="itemDataFormValue in itemDataForm.attrValue"
:key="itemDataFormValue.name + 'value'"
class="textAndImgSon"
style="border: 1px solid #3c9bcd;margin"
>
<div>{{ itemDataFormValue.name }}</div> <div>{{ itemDataFormValue.name }}</div>
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div> <div slot="content">{{ itemDataFormValue.desc }}</div>
@ -152,24 +107,11 @@
</div> </div>
</div> </div>
</div> </div>
<div <div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
v-else-if="itemson.name === '应用场景'" <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
style="margin-bottom: 20px" <div v-if="itemDataForm.attrType === '应用场景'" class="textAndImg">
> <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
<div class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
v-for="itemDataForm in dataForm.infoList"
:key="itemDataForm.attrType"
>
<div
v-if="itemDataForm.attrType === '应用场景'"
class="textAndImg"
>
<div
v-for="itemDataFormValue in itemDataForm.attrValue"
:key="itemDataFormValue.name + 'value'"
class="textAndImgSon"
style="border: 1px solid #3c9bcd;margin"
>
<div>{{ itemDataFormValue.name }}</div> <div>{{ itemDataFormValue.name }}</div>
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div> <div slot="content">{{ itemDataFormValue.desc }}</div>
@ -180,24 +122,11 @@
</div> </div>
</div> </div>
</div> </div>
<div <div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
v-else-if="itemson.name === '功能介绍'" <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
style="margin-bottom: 20px" <div v-if="itemDataForm.attrType === '功能介绍'" class="textAndImg">
> <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
<div class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
v-for="itemDataForm in dataForm.infoList"
:key="itemDataForm.attrType"
>
<div
v-if="itemDataForm.attrType === '功能介绍'"
class="textAndImg"
>
<div
v-for="itemDataFormValue in itemDataForm.attrValue"
:key="itemDataFormValue.name + 'value'"
class="textAndImgSon"
style="border: 1px solid #3c9bcd;margin"
>
<div>{{ itemDataFormValue.name }}</div> <div>{{ itemDataFormValue.name }}</div>
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div> <div slot="content">{{ itemDataFormValue.desc }}</div>
@ -227,7 +156,7 @@ export default {
type: Array type: Array
} }
}, },
data () { data() {
return { return {
dataList: [], dataList: [],
dataView: [], dataView: [],
@ -242,12 +171,12 @@ export default {
} }
}, },
watch: { watch: {
dataList (item) { dataList(item) {
if (item) { if (item) {
this.dataList = item this.dataList = item
} }
}, },
insertList (val) { insertList(val) {
if (val) { if (val) {
if (this.dataForm.type === '应用资源') { if (this.dataForm.type === '应用资源') {
this.dataView = val.filter( this.dataView = val.filter(
@ -437,7 +366,7 @@ export default {
}, },
computed: {}, computed: {},
methods: { methods: {
videoAndImg (link) { videoAndImg(link) {
if (link) { if (link) {
window.open(link) window.open(link)
} else { } else {
@ -447,7 +376,7 @@ export default {
}) })
} }
}, },
deptName () { deptName() {
console.log(this.dataForm.deptId) console.log(this.dataForm.deptId)
this.$http this.$http
.get(`/sys/dept/${this.dataForm.deptId}`) .get(`/sys/dept/${this.dataForm.deptId}`)
@ -456,13 +385,13 @@ export default {
this.unit = res.data.name this.unit = res.data.name
}) })
}, },
queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) { queryPartAppByKeyIdFunction(index, indexSon, indexSonSon) {
if (this.dataForm.type === '组件服务') { if (this.dataForm.type === '组件服务') {
this.$http this.$http
.get( .get(
'/dataResourceRel/queryApp4PartByKeyId' + '/dataResourceRel/queryApp4PartByKeyId' +
'?keyId=' + '?keyId=' +
this.dataForm.id this.dataForm.id
) )
.then(({ data: res }) => { .then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[ this.dataView.children[index].children[indexSon].children[
@ -478,9 +407,9 @@ export default {
this.$http this.$http
.get( .get(
'/dataResourceRel/queryPart4AppByKeyId?keyId=' + '/dataResourceRel/queryPart4AppByKeyId?keyId=' +
this.dataForm.id + this.dataForm.id +
'&type=' + '&type=' +
'组件服务' '组件服务'
) )
.then(({ data: res }) => { .then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[ this.dataView.children[index].children[indexSon].children[
@ -495,8 +424,8 @@ export default {
} }
} }
}, },
created () {}, created() { },
mounted () { mounted() {
this.deptName() this.deptName()
} }
} }
@ -514,6 +443,7 @@ export default {
font-size: 22px; font-size: 22px;
margin-bottom: 25px; margin-bottom: 25px;
} }
.dataTitleSon { .dataTitleSon {
padding-left: 30px; padding-left: 30px;
color: #333333; color: #333333;
@ -522,9 +452,11 @@ export default {
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 {
display: flex; display: flex;
& > div {
&>div {
margin-right: 30px; margin-right: 30px;
border: 1px solid #3c9bcd; border: 1px solid #3c9bcd;
width: 212px; width: 212px;
@ -534,7 +466,8 @@ export default {
align-items: center; align-items: center;
padding: 10px; padding: 10px;
overflow: hidden; overflow: hidden;
& > div:first-child {
&>div:first-child {
margin-bottom: 10px; margin-bottom: 10px;
font-weight: bold; font-weight: bold;
line-height: 14px; line-height: 14px;
@ -544,7 +477,8 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
} }
& > div:nth-child(2) {
&>div:nth-child(2) {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
@ -552,7 +486,8 @@ export default {
-webkit-line-clamp: 6; -webkit-line-clamp: 6;
line-height: initial; line-height: initial;
} }
& > div:nth-child(3) {
&>div:nth-child(3) {
width: 90%; width: 90%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -563,6 +498,7 @@ export default {
} }
} }
} }
.videoAndImgCss { .videoAndImgCss {
cursor: pointer; cursor: pointer;
font-size: 12px; font-size: 12px;
@ -571,10 +507,13 @@ export default {
padding: 5px; padding: 5px;
margin-top: 10px; margin-top: 10px;
background: rgba(60, 155, 205, 0.1); background: rgba(60, 155, 205, 0.1);
display: inline-block;
} }
.textAndImg { .textAndImg {
display: flex; display: flex;
padding-left: 30px; padding-left: 30px;
.textAndImgSon { .textAndImgSon {
width: 212px; width: 212px;
height: 182px; height: 182px;
@ -584,7 +523,8 @@ export default {
align-items: center; align-items: center;
padding: 10px; padding: 10px;
position: relative; position: relative;
& > div {
&>div {
-webkit-line-clamp: 5; -webkit-line-clamp: 5;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -592,11 +532,13 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
word-break: break-all; word-break: break-all;
} }
& > div:first-child {
&>div:first-child {
margin-bottom: 10px; margin-bottom: 10px;
font-weight: bold; font-weight: bold;
} }
& > div:nth-child(3) {
&>div:nth-child(3) {
margin-top: 10px; margin-top: 10px;
position: absolute; position: absolute;
bottom: 8px; bottom: 8px;
@ -610,13 +552,27 @@ export default {
} }
} }
} }
.dataContent { .dataContent {
display: grid; display: flex;
grid-template-columns: repeat(3, 33%); align-items: center;
padding-left: 30px; flex-wrap: wrap;
} }
::v-deep .el-form-item {
flex: 1;
display: flex;
justify-content: flex-start;
}
::v-deep .el-form-item__label {
width: 112px;
}
::v-deep .el-form-item__content { ::v-deep .el-form-item__content {
display: inline-block; display: inline-block;
input { input {
width: 400px; width: 400px;
} }

6
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51 * @Date: 2022-06-29 15:59:51
* @LastEditors: Light * @LastEditors: Light
* @LastEditTime: 2022-10-27 16:04:01 * @LastEditTime: 2022-11-01 15:00:19
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
@ -63,6 +63,7 @@
<!-- 申请能力 --> <!-- 申请能力 -->
<div class="AbilityApply"> <div class="AbilityApply">
<h3>申请能力</h3> <h3>申请能力</h3>
<div style="font-size:18px;font-weight:600;margin-top:20px;">{{deptName}}</div>
<ul v-for="item in dataList" :key="item.id"> <ul v-for="item in dataList" :key="item.id">
<!-- <li class="title">{{item.address}}</li> --> <!-- <li class="title">{{item.address}}</li> -->
<li class="clearfix"> <li class="clearfix">
@ -157,6 +158,7 @@ export default {
content: {} content: {}
}, },
dataList: [], dataList: [],
deptName: '',
inputAgree: '', inputAgree: '',
inputNo: '', inputNo: '',
agreeOrList: '同意' agreeOrList: '同意'
@ -228,6 +230,7 @@ export default {
}) })
}, },
showDialog (title) { showDialog (title) {
this.input = title
this.dialogVisible = true this.dialogVisible = true
this.dialogType = title this.dialogType = title
}, },
@ -270,6 +273,7 @@ export default {
this.dataForm, this.dataForm,
'elas============================' 'elas============================'
) )
this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
this.$http this.$http
.get( .get(
`/act/task/getTaskVariables?${params}&variableName=allowEntrust` `/act/task/getTaskVariables?${params}&variableName=allowEntrust`

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

@ -151,7 +151,7 @@
console.log('收藏===================》', props.dataList) console.log('收藏===================》', props.dataList)
if (scFlag2.value) { if (scFlag2.value) {
scFlag2.value = false scFlag2.value = false
if (props.dataList.isCollect) { if (props.dataList.isCollect == 'true') {
scDel([props.dataList.id]).then((res) => { scDel([props.dataList.id]).then((res) => {
if (res.data.msg === 'success') { if (res.data.msg === 'success') {
message.success('取消成功') message.success('取消成功')

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

@ -1165,7 +1165,11 @@
res.data.data.map((val) => { res.data.data.map((val) => {
if (mapFlag && val.count != 0) { if (mapFlag && val.count != 0) {
mapFlag = false mapFlag = false
changeCards(val.type) if (Cardsname.value === val.type) {
getAppResources2()
} else {
changeCards(val.type)
}
} }
}) })
if (!mapFlag) { if (!mapFlag) {

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

@ -1052,7 +1052,7 @@
roomResult.value = true roomResult.value = true
onSearch() onSearch()
} else { } else {
tabClick(0, '政务云资源') tabClick(0, '城市云脑会客厅')
} }
} }
} }
@ -1106,14 +1106,14 @@
content: isXiHaiAn content: isXiHaiAn
? ['视频资源'] ? ['视频资源']
: username == 'admin' : username == 'admin'
? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议'] ? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议']
: ['政务云资源', '视频资源', '城市云脑会客厅'], : ['城市云脑会客厅', '视频资源', '政务云资源'],
}, },
]) ])
let clickList = ref([]) //存储点击的tab let clickList = ref([]) //存储点击的tab
if (!isXiHaiAn) { if (!isXiHaiAn) {
tabList.value.push({ tabList.value.push({
title: '政务云资源', title: '城市云脑会客厅',
content: [], content: [],
}) })
} }

20
front/src/views/newHome/components/Navigation.vue
View File

@ -161,13 +161,13 @@
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const topList = ref([ const topList = ref([
'组件服务',
'应用资源', '应用资源',
'组件服务',
'基础设施', '基础设施',
'数据资源', '数据资源',
'知识库', '知识库',
]) ])
const select = ref(whoShow.itShowQingDao ? '' : '组件服务') const select = ref(whoShow.itShowQingDao ? '' : '应用资源')
let applicationDataList = ref([]) let applicationDataList = ref([])
let technosphereDataList = ref([]) let technosphereDataList = ref([])
const fabubumen = ref([ const fabubumen = ref([
@ -283,14 +283,14 @@
} }
const mohuchaxun = ref('组件服务') const mohuchaxun = ref('组件服务')
function onSearch() { function onSearch() {
// if (text.value) { // if (text.value) {
snum.value.str = text.value snum.value.str = text.value
console.log('===================>', text.value) console.log('===================>', text.value)
store.commit('home/selectCardsData', snum.value) store.commit('home/selectCardsData', snum.value)
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: snum.value, query: snum.value,
}) })
// } else { // } else {
// message.warning('请输入查询内容！') // message.warning('请输入查询内容！')
// } // }

7
front/src/views/personalCenter/components/ApplyDetails.vue
View File

@ -120,36 +120,43 @@
title: '任务名称', title: '任务名称',
dataIndex: 'activityName', dataIndex: 'activityName',
key: 'activityName', key: 'activityName',
width: '180px',
}, },
{ {
title: '处理部门', title: '处理部门',
dataIndex: 'assigneeDeptName', dataIndex: 'assigneeDeptName',
key: 'assigneeDeptName', key: 'assigneeDeptName',
width: '180px',
}, },
{ {
title: '处理人', title: '处理人',
dataIndex: 'assigneeName', dataIndex: 'assigneeName',
key: 'assigneeName', key: 'assigneeName',
width: '180px',
}, },
{ {
title: '任务开始时间', title: '任务开始时间',
dataIndex: 'startTime', dataIndex: 'startTime',
key: 'startTime', key: 'startTime',
width: '180px',
}, },
{ {
title: '任务结束时间', title: '任务结束时间',
dataIndex: 'endTime', dataIndex: 'endTime',
key: 'endTime', key: 'endTime',
width: '180px',
}, },
{ {
title: '审核意见', title: '审核意见',
dataIndex: 'comment', dataIndex: 'comment',
key: 'comment', key: 'comment',
width: '180px',
}, },
{ {
title: '任务时长', title: '任务时长',
dataIndex: 'duration', dataIndex: 'duration',
key: 'duration', key: 'duration',
width: '180px',
}, },
] ]
const getInfo = () => { const getInfo = () => {