Compare commits

..

No commits in common. "a6334a67903d9942d6cd294f5585580ec689b7c8" and "1f371a53fc1ac3f9118f0bdd997a7926e4f19e22" have entirely different histories.

37 changed files with 1062 additions and 1398 deletions

View File

@ -26,7 +26,7 @@
</el-tree>
<template slot="footer">
<el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button>
<!-- <el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button> -->
<el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button>
<el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>

View File

@ -52,7 +52,6 @@ export default {
// 获取数据列表
query () {
this.dataListLoading = true
if (this.mixinViewModuleOptions.getDataListURL !== '/resource/pageWithAttrs') {
this.$http.get(
this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({
// order: this.order,
@ -96,13 +95,13 @@ export default {
this.$http.get('/sys/user/info').then(userRes => {
console.log('当前用户信息===========>', userRes.data.data.id)
const userId = userRes.data.data.id
// this.dataList = this.dataList.filter(item => {
// // userId creator
// console.log(item.params.creator)
// if (!(item.params.creator === userId) && !(item.params.userId === userId)) {
// return item
// }
// })
this.dataList = this.dataList.filter(item => {
// userId creator
console.log(item.params.creator)
if (!(item.params.creator === userId) && !(item.params.userId === userId)) {
return item
}
})
this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
})
} else {
@ -125,38 +124,6 @@ export default {
}).catch(() => {
this.dataListLoading = false
})
} else {
this.$http.post(
this.mixinViewModuleOptions.getDataListURL, {
pageNum: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
pageSize: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
).then(({ data: res }) => {
if (res.code !== 0) {
this.dataList = []
this.total = 0
return this.$message.error(res.msg)
}
this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.records : res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
if (this.dataList[0].type === '组件服务') {
this.dataList.map(val => {
val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域' || item.attrType === '组件类型')
})
} else if (this.dataList[0].type === '应用资源') {
this.dataList.map(val => {
val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
})
}
if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data)
}
this.dataListLoading = false
}).catch(() => {
this.dataListLoading = false
})
}
},
// 多选
dataListSelectionChangeHandle (val) {
@ -388,17 +355,7 @@ export default {
},
deleteHandle2 (id) {
if (id == undefined && this.dataListSelections.length < 1) {
this.$message({
type: 'info',
message: '请选择要删除的数据'
})
} else {
this.$confirm('确认是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log('删除========================》', id, this.dataListSelections)
const ids = []
if (id) {
ids.push(id)
@ -411,19 +368,8 @@ export default {
}
this.$http.post('/resource/delete', { ids: ids }).then(res => {
console.log('删除成功', res)
this.$message({
type: 'success',
message: '删除成功!'
})
this.getDataList()
})
}).catch(() => {
// this.$message({
// type: 'info',
// message: '已取消删除'
// });
})
}
},
// 导出
exportHandle () {

View File

@ -70,7 +70,7 @@ export default {
mixinViewModuleOptions: {
getDataListURL: "/fuse/page",
exportURL: "/ability/bsabilityai/export",
deleteURL: "/fuse/delete",
deleteURL: "/fuse",
getDataListIsPage: true,
deleteIsBatch: false,
},
@ -93,11 +93,6 @@ export default {
},
methods: {
deleteRow(id) {
this.$confirm('确认是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http.delete('/fuse/delete', {
data: [id]
}).then(res => {
@ -116,8 +111,6 @@ export default {
}).catch(err => {
this.$message.error(err);
})
}).catch(() => {
});
},
//
searchData() {
@ -147,8 +140,7 @@ export default {
},
//
showDetail(val) {
// window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id)
window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id)
window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id)
},
// showDocument(val) {
// console.log(val);

View File

@ -19,11 +19,7 @@
<path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157"
fill="#0058e1"></path>
</svg>
<el-tooltip effect="dark" placement="top-start">
<div class="tooltip-name" slot="content">{{val.name}}</div>
<span class="name">{{ val.name }}</span>
</el-tooltip>
<span class="num">({{ val.channelCount }})</span>
<span class="name">{{ val.name }}({{ val.channelCount }})</span>
</div>
<span v-if="item.children.length < 0">{{ val.total }}</span>
<span v-else>
@ -315,21 +311,4 @@ export default {
}
}
}
.name {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
word-break: break-all;
width: 190px;
text-align: left;
}
.num {
width: 40px;
text-align: right;
}
.tooltip-name {
max-width: 300px;
}
</style>

View File

@ -12,8 +12,8 @@
v-if="dataInfo.length > 1">删除
</el-button>
</el-form-item>
<el-button class="add-btn" size="small" v-if="index == dataInfo.length - 1" @click="addItem" type="primary">
添加
<el-button class="add-btn" size="small" v-if="index == dataInfo.length - 1" @click="addItem"
type="primary">添加
</el-button>
</div>
</div>
@ -97,19 +97,8 @@ export default {
})
},
//
deleteItem(index) {
this.$confirm('确认是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
});
deleteItem(list, index) {
this.dataInfo.splice(index, 1)
}).catch(() => {
});
}
}
}

View File

@ -16,8 +16,8 @@
v-if="!disabledType && dataInfo.length > 1">删除
</el-button>
</el-form-item>
<el-button class="add-btn" size="small" v-if="!disabledType && index == dataInfo.length - 1"
@click="addItem" type="primary">添加
<el-button class="add-btn" size="small"
v-if="!disabledType && index == dataInfo.length - 1" @click="addItem" type="primary">添加
</el-button>
</div>
@ -100,19 +100,8 @@ export default {
})
},
//
deleteItem(index) {
this.$confirm('确认是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
});
deleteItem(list, index) {
this.dataInfo.splice(index, 1)
}).catch(() => {
});
}
}
}

View File

@ -84,11 +84,6 @@ export default {
},
methods: {
deleteRow(id) {
this.$confirm('确认是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http.delete('/fuse/delete', {
data: [id]
}).then(res => {
@ -107,8 +102,6 @@ export default {
}).catch(err => {
this.$message.error(err);
})
}).catch(() => {
});
},
//
searchData() {

View File

@ -130,14 +130,7 @@
>
<template slot-scope="scope">
<el-button
v-if="scope.row.infoList.filter(val=>val.attrType=='组件类型')[0].attrValue == '智能算法' && scope.row.pinTop == 1"
type="text"
size="small"
@click="noToppingCapacity(scope.row)"
>取消置顶</el-button
>
<el-button
v-if="scope.row.infoList.filter(val=>val.attrType=='组件类型')[0].attrValue == '智能算法' &&scope.row.pinTop != 1"
v-if="scope.row.infoList.filter(val=>val.attrType=='组件类型')[0].attrValue == '智能算法'"
type="text"
size="small"
@click="toppingCapacity(scope.row)"
@ -275,7 +268,7 @@ export default {
]
},
mixinViewModuleOptions: {
getDataListURL: '/resource/pageWithAttrs',
getDataListURL: '/resource/page',
getDataListIsPage: true,
exportURL: '/ability/bsabilityai/export',
deleteURL: '/resource/delete',
@ -286,12 +279,11 @@ export default {
fieldArr: dictionaries.fieldArr,
shareFormArr: dictionaries.shareFormArr,
dataForm: {
orderField: 'pin_top',
orderType: 'DESC',
infoList: [],
name: '',
creator: '',
delFlag: 0,
type: '组件服务',
name: ''
selectType: 0,
type: '组件服务'
},
// qp: false,
//
@ -331,45 +323,31 @@ export default {
message: '置顶成功',
type: 'success'
})
this.reset()
} else {
this.$message({
message: '置顶失败',
type: 'warning'
})
this.reset()
}
})
},
noToppingCapacity (item) {
this.$http.put('/resource/cancel_pin_top/' + item.id).then(res => {
if (res.data.code == 0) {
this.$message({
message: '取消置顶成功',
type: 'success'
})
this.reset()
} else {
this.$message({
message: '取消置顶失败',
type: 'warning'
})
this.reset()
}
})
},
reset () {
this.$http
.post(
this.mixinViewModuleOptions.getDataListURL, {
pageNum: 1,
pageSize: 10,
orderType: 'DESC',
infoList: [],
.get(
this.mixinViewModuleOptions.getDataListURL +
'?' +
qs.stringify({
// order: this.order,
// orderField: this.orderField,
// type: '',
page: 1,
limit: 10,
creator: '',
selectType: 0,
delFlag: 0,
type: '组件服务',
name: ''
}
})
)
.then(({ data: res }) => {
this.dataForm.name = ''
@ -379,7 +357,7 @@ export default {
return this.$message.error(res.msg)
}
this.dataList = this.mixinViewModuleOptions.getDataListIsPage
? res.data.records
? res.data.list
: res.data
this.dataList.map((item, index) => {
const dataListSinforList = []
@ -514,16 +492,21 @@ export default {
getDataList2 (names) {
if (names != null) {
this.$http
.post(
this.mixinViewModuleOptions.getDataListURL, {
.get(
this.mixinViewModuleOptions.getDataListURL +
'?' +
qs.stringify({
// order: this.order,
// orderField: this.orderField,
// type: '',
pageNum: 1,
pageSize: 10,
orderType: 'DESC',
infoList: [],
delFlag: 0,
pageSize: this.limit,
type: '组件服务',
creator: '',
selectType: 0,
delFlag: 0,
name: names
}
})
)
.then(({ data: res }) => {
if (res.code !== 0) {
@ -531,8 +514,8 @@ export default {
this.total = 0
return this.$message.error(res.msg)
}
if (res.data.records.length >= 0) {
this.dataList = res.data.records
if (res.data.list.length !== 0) {
this.dataList = res.data.list
this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total
: 0

View File

@ -354,6 +354,7 @@ export default {
// this.disabled = true
},
showDocument (val) {
console.log(val)
window.open(
window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
'_blank'
@ -392,7 +393,7 @@ export default {
this.total = 0
return this.$message.error(res.msg)
}
if (res.data.list.length >= 0) {
if (res.data.list.length !== 0) {
this.dataList = res.data.list
this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total
@ -458,6 +459,7 @@ export default {
// },
//
applyAndAssembly (val) {
console.log('vvvv', val)
// idid,type
const type = '组件服务'
const id = val.id
@ -473,6 +475,7 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
console.log('rrrrressssz', res.data)
this.relateApplicationResourceVisible = true
this.relationData = {
id: id,
@ -480,11 +483,13 @@ export default {
responseData: res.data
}
this.topNameArray = ['未关联组件名称', '已关联组件名称']
console.log(' this.relationData', this.relationData)
//
})
},
//
applyAndDataResource (val) {
console.log('数据资源')
},
//
applyAndProject (val) {
@ -502,6 +507,7 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
console.log('rrrrressssx', res.data)
this.relateApplicationResourceVisible = true
this.relationData = {
id: id,
@ -528,6 +534,7 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
console.log('rrrrressssj', res.data)
this.relateApplicationResourceVisible = true
this.relationData = {
id: id,
@ -568,6 +575,7 @@ export default {
this.showPutOnTheShelfFlag2 = true
this.$http.get('/category/getCategoryTree').then(res => {
this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
console.log(this.insertList, this, this.radio, 'hhhhhhhhhhh')
this.putOnTheShelfList = this.insertList.children
})
},
@ -662,6 +670,7 @@ export default {
})
this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
this.notFilled = []
console.log(this.submitFrom, '表单验证')
if (!this.submitFrom.name) {
this.notFilled.push('应用名称')
}
@ -702,6 +711,7 @@ export default {
val.attrValue = this.radio
}
})
console.log('编辑===============>', this.submitFrom)
//
this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue)
this.$http

View File

@ -13,7 +13,7 @@
<el-date-picker v-model="dataForm.applydate" value-format="yyyy-MM-dd" type="date" :placeholder="$t('dataresources.putOnDate')" clearable></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>

View File

@ -110,19 +110,8 @@ export default {
})
},
//
deleteItem(index) {
this.$confirm('确认是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
});
deleteItem(list, index) {
this.dataInfo.splice(index, 1)
}).catch(() => {
});
}
}
}

View File

@ -31,7 +31,7 @@
</el-date-picker>
</el-form-item>
<!--审核状态-->
<el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<el-form-item>
<span>审核状态</span>
<el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
<el-option label="全部" value="-1"></el-option>
@ -53,7 +53,7 @@
</el-form-item>
<!--类型-->
<el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<el-form-item>
<span>类型</span>
<el-select @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型" clearable>
<el-option label="全部" value=""></el-option>
@ -68,12 +68,6 @@
</el-option>
</el-select>
</el-form-item>
<!--资源名称 仅明细添加-->
<el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<!-- <span v-if="this.departmentId === 2 || this.departmentId === 4">资源名称</span> -->
<el-input v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
</el-form-item>
<!--操作按钮查询-->
<el-form-item>
@ -347,7 +341,6 @@ export default {
abilityType: '', //
beginTime: '', //
endTime: '', //
resourceName:'',//
typeOptions: [
{ name: '智能算法', value: 1 },
{ name: '图层服务', value: 2 },
@ -530,8 +523,7 @@ export default {
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
})
})
},
@ -597,9 +589,7 @@ export default {
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
})
})
},
@ -668,8 +658,7 @@ export default {
deptId: this.abilityDepartment,
type: this.abilityType,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
}
})
.then((res) => {
@ -681,8 +670,7 @@ export default {
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
})
})
},
@ -709,8 +697,7 @@ export default {
deptId: this.abilityDepartment,
type: this.abilityType,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
}
})
.then((res) => {
@ -721,8 +708,7 @@ export default {
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
})
})
},
@ -966,8 +952,7 @@ export default {
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName:this.resourceName
endDate: this.endDate
})
if (this.departmentId === 1) {
// if (this.detailFlag) {

View File

@ -508,12 +508,7 @@ export default {
},
//
deleteData (row) {
if (this.deleteDataArr.length < 1) {
this.$message({
type: 'info',
message: '请选择要删除的数据'
})
}else{
console.log(row)
this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -547,7 +542,7 @@ export default {
type: 'info',
message: '已取消删除'
})
})}
})
},
//
async openPreviewData (row) {

View File

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

View File

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

View File

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

View File

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

View File

@ -252,8 +252,8 @@ export default {
{ required: true, message: '请填写描述内容', trigger: 'blur' },
{
min: 1,
max: 255,
message: '长度在 1 到 255 个字符',
max: 500,
message: '长度在 1 到 500 个字符',
trigger: 'blur'
}
]

View File

@ -7,33 +7,55 @@
<div class="dataTitleSon">
{{ itemson.name }}
</div>
<div class="dataContent" v-if="
<div
class="dataContent"
v-if="
itemson.name !== '算法优势' &&
itemson.name !== '应用场景' &&
itemson.name !== '功能介绍'
">
<el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
"
>
<el-form-item
v-for="itemsonson in itemson.children"
:key="itemsonson.name"
:label="
itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
" v-show="
"
v-show="
!(
itemsonson.name === '平台地址' ||
itemsonson.name === 'SDK安装包' ||
itemsonson.name === '接口请求方式' ||
itemsonson.name === '服务接口'
)
">
<div class="videoAndImgCss" v-if="
"
>
<div
class="videoAndImgCss"
v-if="
itemsonson.type === 'video' || itemsonson.type === 'image'
" @click="videoAndImg(itemsonson.note1)">
"
@click="videoAndImg(itemsonson.note1)"
>
浏览
</div>
<div class="videoAndImgCss" v-if="
<div
class="videoAndImgCss"
v-if="
itemsonson.name === '上传附件'
" @click="videoAndImg(itemsonson.note1)">
"
@click="videoAndImg(itemsonson.note1)"
>
下载
</div>
<div v-else-if="itemsonson.type === ' multipleAdditions'" class="multipleAdditionsClass">
<div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem">
<div
v-else-if="itemsonson.type === ' multipleAdditions'"
class="multipleAdditionsClass"
>
<div
v-for="multipleAdditionsItem in itemsonson.note1"
:key="multipleAdditionsItem"
>
<el-tooltip placement="top">
<div slot="content">
{{
@ -73,31 +95,54 @@
<!-- <div>{{ multipleAdditionsItem }}</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> -->
<el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
<el-input
v-model="itemsonson.note1"
disabled="disabled"
></el-input>
</el-tooltip>
</el-form-item>
<el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
<el-form-item
v-for="itemsonson in itemson.children"
:key="itemsonson.name"
:label="
itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
" v-show="
"
v-show="
(itemsonson.name === '平台地址' && showDocking) ||
(itemsonson.name === 'SDK安装包' && showSDK) ||
(itemsonson.name === '接口请求方式' && showInterface) ||
(itemsonson.name === '服务接口' && showInterface)
">
"
>
<el-tooltip placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
<el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
<el-input
v-model="itemsonson.note1"
disabled="disabled"
></el-input>
</el-tooltip>
</el-form-item>
</div>
<div v-else-if="itemson.name === '算法优势'" style="margin-bottom: 20px">
<div 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
v-else-if="itemson.name === '算法优势'"
style="margin-bottom: 20px"
>
<div
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>
<el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div>
@ -107,11 +152,24 @@
</div>
</div>
</div>
<div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
<div 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
v-else-if="itemson.name === '应用场景'"
style="margin-bottom: 20px"
>
<div
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>
<el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div>
@ -122,11 +180,24 @@
</div>
</div>
</div>
<div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
<div 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
v-else-if="itemson.name === '功能介绍'"
style="margin-bottom: 20px"
>
<div
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>
<el-tooltip placement="top">
<div slot="content">{{ itemDataFormValue.desc }}</div>
@ -443,7 +514,6 @@ export default {
font-size: 22px;
margin-bottom: 25px;
}
.dataTitleSon {
padding-left: 30px;
color: #333333;
@ -452,10 +522,8 @@ export default {
background: url("~@/assets/img/sj-jx.png") no-repeat;
background-position-x: 15px;
}
.multipleAdditionsClass {
display: flex;
& > div {
margin-right: 30px;
border: 1px solid #3c9bcd;
@ -466,7 +534,6 @@ export default {
align-items: center;
padding: 10px;
overflow: hidden;
& > div:first-child {
margin-bottom: 10px;
font-weight: bold;
@ -477,7 +544,6 @@ export default {
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
& > div:nth-child(2) {
overflow: hidden;
text-overflow: ellipsis;
@ -486,7 +552,6 @@ export default {
-webkit-line-clamp: 6;
line-height: initial;
}
& > div:nth-child(3) {
width: 90%;
overflow: hidden;
@ -498,7 +563,6 @@ export default {
}
}
}
.videoAndImgCss {
cursor: pointer;
font-size: 12px;
@ -507,13 +571,10 @@ export default {
padding: 5px;
margin-top: 10px;
background: rgba(60, 155, 205, 0.1);
display: inline-block;
}
.textAndImg {
display: flex;
padding-left: 30px;
.textAndImgSon {
width: 212px;
height: 182px;
@ -523,7 +584,6 @@ export default {
align-items: center;
padding: 10px;
position: relative;
& > div {
-webkit-line-clamp: 5;
overflow: hidden;
@ -532,12 +592,10 @@ export default {
-webkit-box-orient: vertical;
word-break: break-all;
}
& > div:first-child {
margin-bottom: 10px;
font-weight: bold;
}
& > div:nth-child(3) {
margin-top: 10px;
position: absolute;
@ -552,27 +610,13 @@ export default {
}
}
}
.dataContent {
display: flex;
align-items: center;
flex-wrap: wrap;
display: grid;
grid-template-columns: repeat(3, 33%);
padding-left: 30px;
}
::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 {
display: inline-block;
input {
width: 400px;
}

View File

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

View File

@ -101,7 +101,7 @@ export default {
pid: '',
parentName: '',
sort: 0,
district: ''
district: 0
},
sheng: [{ pid: 100001, value: '山东省' }],
city: [], //

View File

@ -2,12 +2,6 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__dept">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.deptName" :placeholder="$t('dept.name')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
</el-button>
@ -48,22 +42,77 @@
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './dept-add-or-update'
import qs from 'qs'
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/dept/page',
getDataListIsPage: true,
getDataListURL: '/sys/dept/list',
deleteURL: '/sys/dept'
},
dataForm: {
deptName: ''
}
total: 0,
limit: 10,
page: 1,
dataList: []
}
},
components: {
AddOrUpdate
},
watch: {
dataList: {
handler: function () {
this.getData()
}
}
},
methods: {
// ,
pageSizeChangeHandle (val) {
this.page = 1
this.limit = val
this.getData()
},
// ,
pageCurrentChangeHandle (val) {
this.page = val
this.getData()
},
getData() {
// debugger
let _data = {
limt: this.limit,
page: this.page,
}
this.$http.get('sys/dept/page', {
params: _data
}).then((res) => {
this.total = res.data.data.total;
res.data.data.list.map((item, index) => {
console.log('item, index------------>', item, index);
if (item.district != null || item.children.length >= 0) {
this.$http.get('/sys/region/' + item.district).then((data) => {
this.dataList[index].district = data.data.data.name
console.log('datafrom', this.dataList)
})
if (item.children.length > 0) {
item.children.map((item2, index2) => {
if (item2.district != null) {
this.$http.get('/sys/region/' + item2.district).then((data) => {
this.dataList[index].children[index2].district = data.data.data.name
console.log('datafrom', this.dataList)
})
}
})
}
}
})
})
},
},
created() {
this.getData()
}
}
</script>

View File

@ -109,9 +109,3 @@
.ant-popover-inner-content .ant-popover-buttons {
text-align: center;
}
.ApplicationTopDetails-tooltip-card {
max-width: 9rem !important;
min-width: 6rem !important;
max-height: 6rem !important;
overflow-y: auto;
}

View File

@ -4,7 +4,11 @@
<div class="main">
<div class="left">
<a-layout-sider>
<a-menu v-model:selectedKeys="selectedKeys" mode="inline" @click="handleClick">
<a-menu
v-model:selectedKeys="selectedKeys"
mode="inline"
@click="handleClick"
>
<a-menu-item v-for="item in menuList" :key="item.key">
<img :src="item.img" alt="" style="margin-right: 10px" />
<span>{{ item.title }}</span>
@ -14,19 +18,36 @@
</div>
<div class="right">
<!-- <div class="title">数据需求</div> -->
<a-list class="demo-loadmore-list" :loading="initLoading" item-layout="horizontal" :data-source="list"
:key="showKey">
<a-list
class="demo-loadmore-list"
:loading="initLoading"
item-layout="horizontal"
:data-source="list"
:key="showKey"
>
<template #renderItem="{ item }">
<a-list-item>
<a-skeleton avatar :title="false" :loading="!!item.loading" active>
<a-tooltip placement="topLeft" arrow-point-at-center mouseEnterDelay="1"
overlayClassName="demandCenter-tooltip-card">
<a-skeleton
avatar
:title="false"
:loading="!!item.loading"
active
>
<a-tooltip
placement="topLeft"
:title="item.demandDetails || '--'"
arrow-point-at-center
mouseEnterDelay="1"
>
<a-list-item-meta
:description="'描述:' + (item.demandDetails || '--')"
>
<template #title>
<div class="tooltip-desc">{{ item.demandDetails || '--' }}</div>
</template>
<a-list-item-meta :description="'描述:' + (item.demandDetails || '--')">
<template #title>
<span @click="showDetail(item)" style="cursor: pointer" class="name">
<span
@click="showDetail(item)"
style="cursor: pointer"
class="name"
>
{{ item.demandSubject }}
</span>
<span class="time">{{ item.createDate }}</span>
@ -37,8 +58,13 @@
</a-list-item>
</template>
</a-list>
<a-pagination v-model:current="pageNum" v-model:page-size="pageSize" :total="total" @change="pageChange"
:key="showKey">
<a-pagination
v-model:current="pageNum"
v-model:page-size="pageSize"
:total="total"
@change="pageChange"
:key="showKey"
>
<template #buildOptionText="props">
<span>{{ props.value }}/</span>
</template>
@ -175,20 +201,16 @@ onMounted(() => {
background-position-x: center;
display: flex;
justify-content: center;
.main {
width: 1200px;
height: 100%;
padding-top: 30px;
display: flex;
.left {
width: 15%;
.ant-card {
background: transparent;
border: none;
.ant-card-grid {
height: 50px;
display: flex;
@ -200,17 +222,14 @@ onMounted(() => {
cursor: pointer;
}
}
.ant-layout-sider {
background-color: transparent;
:deep(.ant-menu-item) {
height: 100px;
font-size: 18px;
color: #333333;
border: 1px solid #dee8f5;
margin: 0;
&::after {
margin-top: 30px;
height: 40px;
@ -218,13 +237,11 @@ onMounted(() => {
background-color: #0087ff;
}
}
:deep(.ant-menu-item-selected) {
background-color: #e9f4ff;
}
}
}
.right {
flex: 1;
margin-left: 30px;
@ -232,21 +249,17 @@ onMounted(() => {
background-color: #ffffff;
box-shadow: 10px 8px 10px 3px #9dc6ea;
padding: 20px;
.title {
font-size: 22px;
font-weight: 500;
color: #1492ff;
}
.ant-list {
height: 730px;
overflow-y: scroll;
:deep(.ant-list-item-meta-title) {
display: flex;
justify-content: space-between;
.name {
width: 800px;
font-size: 18px;
@ -263,7 +276,6 @@ onMounted(() => {
word-break: break-all;
}
}
:deep(.ant-list-item-meta-description) {
display: -webkit-box;
/*设置为弹性盒子*/
@ -277,17 +289,14 @@ onMounted(() => {
word-break: break-all;
}
}
//
.ant-list::-webkit-scrollbar {
display: none;
}
.ant-pagination {
margin-top: 10px;
}
}
.fixedmount {
height: 1.5rem;
display: flex;
@ -312,12 +321,10 @@ onMounted(() => {
position: relative;
cursor: pointer;
background: #e3edfc;
p {
margin: 0;
}
}
.fixedmount div p:nth-child(1) {
height: 0.24rem;
width: 0.24rem;
@ -333,11 +340,4 @@ body,
html {
height: unset;
}
.demandCenter-tooltip-card {
max-width: 900px !important;
min-width: 600px !important;
max-height: 600px !important;
overflow-y: auto;
}
</style>

View File

@ -45,7 +45,7 @@
<template #title>应用领域{{ applicationArea }}</template>
<div>应用领域{{ applicationArea }}</div>
</a-tooltip>
<a-tooltip placement="top" overlayClassName="ApplicationTopDetails-tooltip-card">
<a-tooltip placement="top">
<template #title>{{ props.dataList.description }}</template>
<div>
{{ props.dataList.description }}
@ -54,29 +54,20 @@
</div>
<div class="bottom" v-if="props.dataList.id">
<a-button type="primary" @click="toView()">
<template #icon>
<form-outlined />
</template>
<template #icon><form-outlined /></template>
申请使用
</a-button>
<a-button type="primary" @click="addShoppingCart()">
<template #icon>
<shopping-cart-outlined />
</template>
<template #icon><shopping-cart-outlined /></template>
加入申购车
</a-button>
<a-button type="primary" @click="goTOCollection()">
{{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏
</a-button>
</div>
<div class="text-tip">
使用声明算法的场景适应性和结果准确性需申请部门根据场景建设要求先行试用进而判断是否满足应用需求除特殊声明算法结果仅为参考
</div>
</div>
<div class="right"></div>
</div>
</template>
<script setup>
import { FormOutlined, ShoppingCartOutlined } from '@ant-design/icons-vue'
@ -248,22 +239,17 @@ const goTOCollection = () => {
background-size: 100%;
display: flex;
justify-content: center;
.left {
width: 7.2rem;
color: #fff;
margin-right: 0.8rem;
margin-top: -0.3rem;
position: relative;
.top {
display: flex;
align-items: center;
span {
font-size: 14px;
}
.name {
display: inline-block;
// width: 10.2rem;
@ -281,18 +267,15 @@ const goTOCollection = () => {
-webkit-box-orient: vertical;
word-break: break-all;
}
.label-content {
position: relative;
}
.lable-father {
position: absolute;
min-width: 5.5rem;
right: -5.5rem;
top: 0;
}
.label {
padding: 1px 10px;
margin-right: 10px;
@ -300,18 +283,15 @@ const goTOCollection = () => {
background: rgba(255, 255, 255, 0.4);
}
}
.main {
margin-top: 20px;
font-size: 18px;
line-height: 34px;
& > div:nth-of-type(1) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
& > div:nth-of-type(2) {
max-height: 100px;
overflow: hidden;
@ -322,11 +302,9 @@ const goTOCollection = () => {
word-break: break-all;
}
}
.bottom {
margin-top: 40px;
display: flex;
.ant-btn {
height: 50px;
margin-right: 20px;
@ -337,21 +315,17 @@ const goTOCollection = () => {
justify-content: center;
align-items: center;
}
.ant-btn:nth-of-type(1) {
width: 180px;
}
.ant-btn:nth-of-type(2) {
width: 220px;
}
.ant-btn:nth-of-type(3) {
width: 145px;
}
}
}
.right {
width: 580px;
height: 400px;
@ -360,12 +334,4 @@ const goTOCollection = () => {
margin-top: -40px;
}
}
.text-tip {
font-size: 14px;
color: #fff;
position: absolute;
bottom: 20px;
width: 140%;
}
</style>

View File

@ -36,7 +36,7 @@
<template #title>应用领域{{ applicationArea }}</template>
<div>应用领域{{ applicationArea }}</div>
</a-tooltip>
<a-tooltip placement="top" overlayClassName="ApplicationTopDetails-tooltip-card">
<a-tooltip placement="top">
<template #title>{{ props.dataList.description }}</template>
<div>
{{ props.dataList.description }}

View File

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

View File

@ -29,8 +29,7 @@
p-id="5928"
></path>
</svg>
<span class="btn" style="font-weight:600" @click="falg = !falg">展开</span>
<span class="btn" @click="falg = !falg">({{totalDataNum}}条数据)</span>
<span class="btn" @click="falg = !falg">展开</span>
</div>
<div class="btnBox" v-show="falg">
<svg
@ -50,7 +49,7 @@
fill="#13227a"
></path>
</svg>
<span class="btn" style="font-weight:600" @click="falg = !falg">收起</span>
<span class="btn" @click="falg = !falg">收起</span>
</div>
</div>
<div
@ -166,7 +165,6 @@
})
const falg = ref(false)
let dataForm = ref([])
let totalDataNum = ref(0);
const videoVisible = ref(false)
const xVideoList = ref([])
const xVideoListAll = ref([])
@ -253,16 +251,6 @@
})
}
getDeptAllData();
const getDataTotalNum = () =>{
let totalNum =0;
dataForm.value.forEach((item)=>{
totalNum = totalNum +item.arr.length;
});
totalDataNum.value = totalNum;
}
getDataTotalNum();
//
</script>
<style scoped lang="less">

View File

@ -789,8 +789,8 @@
DETAIL_PAGE_CONTENT_DEFAULT_TAB
console.log('select------------>', select)
// selectSubType...
let selectSubType = router.currentRoute.value.query.type || ''
let queryName = ref('')
const selectSubType = router.currentRoute.value.query.type || ''
const queryName = ref('')
const str = router.currentRoute.value.query.str
const searchValue = ref(str)
const searchType = ref(str)
@ -849,7 +849,6 @@
paramsGetResources.pageSize = storageSearchInfo.pageSize
paramsGetResources.deptIds = storageSearchInfo.deptIds
paramsGetResources.districtId = storageSearchInfo.districtId
// paramsGetResources.infoList = storageSearchInfo.infoList
// 使
nextTick(() => {
searchResultListDom.value.changeCondition(
@ -1078,7 +1077,6 @@
if (obj) {
val.selectedTags = [obj.attrValue] || []
}
console.log('val---eeee--------->', val)
}
})
ListContentCopy.value = []
@ -1092,16 +1090,12 @@
} else {
queryName.value = ''
}
console.log('selectSubType------------>', selectSubType)
console.log('ListContent.records------------>', ListContent.records)
ListContent.records.forEach((val) => {
console.log('val-----ddd------->', val)
if (!val) {
return
}
if (val.name === queryName.value && selectSubType) {
// todo
if (val.name === queryName.value) {
if (
val.selectedTags &&
val.selectedTags.indexOf(selectSubType) == -1
@ -1109,27 +1103,14 @@
val.selectedTags = [selectSubType]
changeShrink(queryName.value)
} else {
console.log(
'val.selectedTags---123--------->',
val.selectedTags
val.selectedTags &&
val.selectedTags.splice(
val.selectedTags.indexOf(selectSubType),
1
)
let _index = val.selectedTags.findIndex(
(v) => v == selectSubType
)
val.selectedTags.splice(_index, 1, selectSubType)
// changeShrink(queryName.value)
// val.selectedTags &&
// val.selectedTags.splice(
// val.selectedTags.indexOf(selectSubType),
// 1
// )
}
if (val.name == '应用领域' && val.selectedTags.length > 0) {
changeShrink(queryName.value)
}
}
})
// -
if (whoShow1.value.itShowXiHaiAn) {
if (!storageSearchInfo) {
@ -1184,12 +1165,8 @@
res.data.data.map((val) => {
if (mapFlag && val.count != 0) {
mapFlag = false
if (Cardsname.value === val.type) {
getAppResources2()
} else {
changeCards(val.type)
}
}
})
if (!mapFlag) {
return
@ -1667,10 +1644,6 @@
// --
const judgeHasSubSelectType = () => {
if (selectSubType) {
console.log(
'paramsGetResources.infoList--judgeHasSubSelectType---------->',
paramsGetResources.infoList
)
paramsGetResources.infoList = []
if (select == '组件服务') {
queryName.value = '组件类型'
@ -1707,11 +1680,6 @@
listKey.value++
}
}
//
if (str && !router.currentRoute.value.query.select) {
globalSearch()
}
})
//
const applyAll = () => {
@ -1763,15 +1731,11 @@
router.currentRoute.value.query.appLiCation = ''
tecHnosphere = router.currentRoute.value.query.tecHnosphere
appLiCation = router.currentRoute.value.query.appLiCation
//
storageSearchInfo = null
selectSubType = ''
let newQuery = JSON.parse(
JSON.stringify(router.currentRoute.value.query)
)
Cardsname.value = name
newQuery.select = Cardsname.value
newQuery.type = ''
router
.replace({
query: newQuery,
@ -1909,15 +1873,12 @@
font-family: 'webfont';
src: url('~@/assets/capacitySquare/webfont.ttf');
}
.resultListSearchInput-father {
background: #f3f5f9;
padding: 0.2rem;
.resultListSearchInput-son {
background: #fff;
padding: 0.2rem 0.2rem 0rem 0.3rem;
.hengxian {
width: 100%;
height: 0.01rem;
@ -1926,17 +1887,14 @@
}
}
}
.resultListSearchInput {
margin-left: 0.1rem;
:deep(.ant-input) {
width: 4rem;
height: 0.36rem;
background: #fff;
border-radius: 0.04rem;
}
:deep(.ant-input-search-button) {
width: 0.8rem;
height: 0.36rem;
@ -1948,12 +1906,10 @@
line-height: 0.34rem;
margin-left: 0.1rem;
}
:deep(.ant-input-group-addon) {
left: 0 !important;
}
}
.button-reset {
border: 0;
outline: none;
@ -1968,7 +1924,6 @@
margin-left: 2.5rem;
cursor: pointer;
}
.details-pageconetent {
height: 100%;
width: 100%;
@ -1978,7 +1933,6 @@
margin-top: 0.67rem;
position: relative;
background: rgba(245, 243, 243, 0.3);
.details-pageconetent-left {
max-height: 6.9rem;
position: absolute;
@ -1988,7 +1942,6 @@
margin-right: 0.17rem;
overflow: auto;
}
.top {
min-height: 7.2rem;
position: relative;
@ -2000,33 +1953,26 @@
justify-content: left;
margin-left: 2.5rem;
background: #f3f5f9;
.pagination {
background: #f3f5f9;
padding-bottom: 0.6rem;
}
.jichusheshi {
height: 4.45rem;
.yunziyuan {
width: 100%;
position: relative;
.shuoming {
position: absolute;
right: 0.2rem;
top: 0.15rem;
font-size: 0.12rem;
}
.yunziyuan-title {
display: flex;
align-items: center;
.tupian {
}
.title {
margin-left: 0.1rem;
font-weight: 600;
@ -2034,44 +1980,35 @@
cursor: pointer;
}
}
.fenlei {
display: flex;
margin-left: 0.2rem;
margin-right: 0.3rem;
justify-content: space-between;
}
.keyongziyuan {
display: flex;
justify-content: space-between;
margin-left: 0.3rem;
margin-right: 0.3rem;
div {
display: flex;
div:last-child {
font-weight: 600;
}
}
}
}
.yunziyuan > div {
margin-bottom: 0.1rem;
}
.shipin {
width: 100%;
.shipin-title {
display: flex;
align-items: center;
.tupian {
}
.title {
margin-left: 0.1rem;
font-weight: 600;
@ -2079,58 +2016,47 @@
cursor: pointer;
}
}
.fenlei {
display: flex;
margin-left: 0.2rem;
div {
margin-right: 0.6rem;
}
.shuzi {
font-weight: 600;
}
}
}
.shipin > div {
margin-bottom: 0.1rem;
}
}
.jichusheshi > div {
padding-top: 0.1rem;
border-radius: 0.04rem;
margin-bottom: 0.2rem;
padding-bottom: 0.4rem;
}
.shujuziyuan {
display: flex;
flex-direction: column;
justify-content: center;
padding-top: 0.4rem;
.yunziyuan {
width: 100%;
position: relative;
.shuoming {
position: absolute;
right: 0.2rem;
top: 0.15rem;
font-size: 0.12rem;
}
.yunziyuan-title {
display: flex;
align-items: center;
margin-left: 0.2rem;
.tupian {
}
.title {
margin-left: 0.1rem;
font-weight: 600;
@ -2138,35 +2064,29 @@
cursor: pointer;
}
}
.fenlei {
display: flex;
margin-left: 0.2rem;
margin-right: 0.3rem;
justify-content: space-between;
}
.keyongziyuan {
display: flex;
justify-content: space-between;
margin-left: 0.3rem;
margin-right: 0.3rem;
div {
display: flex;
div:last-child {
font-weight: 600;
}
}
}
}
.yunziyuan > div {
margin-bottom: 0.1rem;
}
}
.shujuziyuan > div {
background: #eaf4ff;
padding-top: 0.1rem;
@ -2174,7 +2094,6 @@
margin-bottom: 0.2rem;
padding-bottom: 0.4rem;
}
.top-title {
display: flex;
justify-content: space-around;
@ -2184,47 +2103,39 @@
color: #000000;
line-height: 0.34rem;
margin-bottom: 0.2rem;
.photo {
display: inline-block;
height: 0.44rem;
width: 0.44rem;
margin-right: 0.1rem;
}
div {
padding: 0 0.1rem;
cursor: pointer;
display: flex;
align-items: center;
}
div:hover {
color: #0087ff;
}
.sel {
font-weight: 600;
color: #0087ff;
border-bottom: 0.02rem solid #0087ff;
}
}
.top-content-father {
width: 100%;
padding: 0 0.2rem 0.2rem 0.2rem;
background: #f3f5f9;
margin-bottom: 0.2rem;
.top-content-son {
background: #fff;
padding: 0.2rem 0;
}
.top-content {
display: flex;
margin-top: 0rem;
span:nth-child(1) {
display: inline-block;
position: relative;
@ -2233,24 +2144,20 @@
text-align: center;
vertical-align: middle;
}
.leixingsumfather {
width: 8.1rem;
display: inline-block;
height: 0.3014rem;
overflow: hidden;
}
.leixingsumfather2 {
width: 9.2rem;
}
.leixingsum {
display: inline-block;
cursor: pointer;
text-align: center;
margin-top: 0.05rem;
.ant-tag-checkable {
width: 1rem;
height: 0.25rem;
@ -2268,13 +2175,11 @@
text-align: center;
line-height: 0.14rem;
}
:deep(.ant-tag-checkable-checked) {
margin-left: 0.15rem;
margin-right: 0.15rem;
text-align: center;
}
.ant-tag-checkable:active,
.ant-tag-checkable-checked {
// width: 0.85rem;
@ -2286,7 +2191,6 @@
border-radius: 0.16rem;
}
}
.active {
font-family: Alibaba PuHuiTi;
font-weight: 500;
@ -2294,38 +2198,32 @@
color: #ffffff;
}
}
.top-content:nth-child(1) {
margin-top: 0rem !important;
}
}
}
}
.shrinkTag {
width: 0.5rem;
display: flex;
justify-content: center;
align-items: flex-end;
margin-bottom: 0.05rem;
span {
cursor: pointer;
}
}
.shrink {
height: unset !important;
overflow: unset !important;
}
.talk-monitor {
position: fixed;
bottom: 0.5rem;
right: 0.1rem;
z-index: 9999;
cursor: pointer;
i {
width: 0.64rem;
height: 0.64rem;
@ -2334,7 +2232,6 @@
background-size: cover;
}
}
.abilitySquare {
width: 0.7rem;
height: 0.7rem;
@ -2350,11 +2247,9 @@
right: 0.1rem;
cursor: pointer;
background: #e3edfc;
p {
margin: 0;
}
p:nth-child(1) {
height: 0.35rem;
width: 0.36rem;
@ -2362,7 +2257,6 @@
background-size: 100% 100%;
background-position: center;
}
ul {
background: #ffffff;
font-family: webfont;
@ -2375,7 +2269,6 @@
left: -0.62rem;
padding: 0;
margin: 0;
li {
list-style: none;
color: #0061ec;
@ -2384,24 +2277,20 @@
padding-left: 0.4rem;
border-bottom: 0.01rem solid #dfd9d9;
}
li:nth-of-type(1) {
background: url('~@/assets/home/appIcon.png') no-repeat;
background-position: 0.18rem center;
}
li:nth-of-type(2) {
background: url('~@/assets/home/AiIcon.png') no-repeat;
background-position: 0.18rem center;
}
li:nth-of-type(3) {
border-bottom: none;
background: url('~@/assets/home/GisIcon.png') no-repeat;
background-position: 0.18rem center;
}
}
ul::after {
content: '';
position: absolute;
@ -2412,7 +2301,6 @@
border: 0.13rem solid;
border-color: #fff transparent transparent transparent;
}
ul::before {
content: '';
position: absolute;
@ -2423,26 +2311,21 @@
border: 0.13rem solid;
border-color: #dfd9d9 transparent transparent transparent;
}
@keyframes ulShowTime {
0% {
transform: scale(0);
}
100% {
transform: scale(0);
}
}
}
.top-content-father {
width: 10.87rem;
padding-left: 0.2rem;
.top-content {
display: flex;
margin-top: 0.23rem;
span:nth-child(1) {
display: inline-block;
position: relative;
@ -2454,21 +2337,18 @@
font-size: 0.16rem;
margin-left: 0.3rem;
}
.leixingsumfather {
width: 7.7rem;
display: inline-block;
height: 0.3014rem;
overflow: hidden;
}
.leixingsum {
// width: 1rem;
display: inline-block;
cursor: pointer;
text-align: center;
margin-top: 0.05rem;
.ant-tag-checkable {
width: 1rem;
height: 0.25rem;
@ -2486,13 +2366,11 @@
text-align: center;
line-height: 0.14rem;
}
:deep(.ant-tag-checkable-checked) {
margin-left: 0.15rem;
margin-right: 0.15rem;
text-align: center;
}
.ant-tag-checkable:active,
.ant-tag-checkable-checked {
width: 0.85rem;
@ -2503,7 +2381,6 @@
border-radius: 0.16rem;
}
}
.active {
font-family: Alibaba PuHuiTi;
font-weight: 500;
@ -2511,12 +2388,10 @@
color: #ffffff;
}
}
.top-content:nth-child(1) {
margin-top: 0.41rem !important;
}
}
:deep(.ant-card-grid) {
overflow: hidden;
white-space: nowrap;

View File

@ -6,25 +6,16 @@
<script setup>
import { reactive, ref, watch, defineProps } from 'vue'
import { useRouter } from 'vue-router'
import { useStore } from 'vuex'
const router = useRouter()
const oldValue1= ref('')
console.log('router------------>', router)
const props = defineProps({
textColor: { type: String, default: '' },
})
const previousPage = () => {
if (window.history.state.back){
window.history.go(-1)
} else{
router.push({
path: '/integrationServices',
})
}
}
</script>
<style scoped lang="less">

View File

@ -73,7 +73,6 @@
v-model:value="roomCerateDate"
placeholder="开始日期"
value-format="YYYY-MM-DD"
:disabled-date="disabledDate"
/>
<a-time-picker
v-model:value="roomCreateTime"
@ -280,7 +279,6 @@
style="width: 72%"
v-model:value="formState.bookDate"
value-format="YYYY-MM-DD"
:disabled-date="disabledDate"
@change="handleChange"
/>
</a-form-item>
@ -1054,7 +1052,7 @@
roomResult.value = true
onSearch()
} else {
tabClick(0, '城市云脑会客厅')
tabClick(0, '政务云资源')
}
}
}
@ -1108,14 +1106,14 @@
content: isXiHaiAn
? ['视频资源']
: username == 'admin'
? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议']
: ['城市云脑会客厅', '视频资源', '政务云资源'],
? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
: ['政务云资源', '视频资源', '城市云脑会客厅'],
},
])
let clickList = ref([]) //tab
if (!isXiHaiAn) {
tabList.value.push({
title: '城市云脑会客厅',
title: '政务云资源',
content: [],
})
}
@ -1178,7 +1176,6 @@
console.log(res)
visible.value = true
options.src = res.data.data
//options.src ="wss://10.134.135.45:6014/proxy/10.10.20.15:559/openUrl/0kIF7La"
})
// // --
// visible.value = true
@ -1263,11 +1260,6 @@
chengguoSearch()
}
// ----
//
const disabledDate = (current) => {
const time = moment().endOf('day').subtract(1, 'days')
return current && current < time
}
//
const disabledStartHours = () => {
if (roomEndTime.value) {
@ -2516,16 +2508,6 @@
}
.introduction {
width: unset;
button {
height: 30px;
width: 120px;
border: 1px solid #bbd3ef;
border-radius: 6px;
background: #edf4fc;
color: #0087ff;
font-size: 14px;
}
:deep(.ant-form-item-control) {
margin-left: -2.1rem;
}

View File

@ -32,7 +32,7 @@
</div>
<div class="flex-row-center">
<div class="bg cjtd">
<img :preview="false" :src="bgImg" />
<a-image :preview="false" :src="bgImg" />
</div>
<div class="content" style="margin-left: 0.5rem">
@ -562,10 +562,6 @@
background: url('~@/assets/home/fn/cjtd.png') no-repeat;
background-size: 100%;
}
.cjtd img{
width:100%;
height:100%
}
.content {
overflow: auto;

View File

@ -161,13 +161,13 @@
const store = useStore()
const router = useRouter()
const topList = ref([
'应用资源',
'组件服务',
'应用资源',
'基础设施',
'数据资源',
'知识库',
])
const select = ref(whoShow.itShowQingDao ? '' : '应用资源')
const select = ref(whoShow.itShowQingDao ? '' : '组件服务')
let applicationDataList = ref([])
let technosphereDataList = ref([])
const fabubumen = ref([

View File

@ -225,51 +225,14 @@
style="cursor: pointer"
@click="
openView(
'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + val.channelCode+'&protocol=wss&transmode=1&streamType=1'
backUrl + 'resource/hls/getHls/?key=' + val.channelId
)
"
>
{{ 'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + val.channelCode+'&protocol=wss&transmode=1&streamType=1' }}
{{ backUrl + 'resource/hls/getHls/?key=' + val.channelId }}
</span>
</div>
</div>
<div class="button-bottom" v-if="item.approveStatus == '通过'">
<a
style="
display: inline-block;
width: 88px;
height: 32px;
line-height: 32px;
text-align: center;
background: #40a9ff;
border-radius: 5px;
font-size: 14px;
color: #fff;
cursor:pointer;
"
href="/static/download/InstallRootCert.exe"
>
证书下载
</a>
<span
style="
display: inline-block;
width: 88px;
height: 32px;
line-height: 32px;
text-align: center;
background: #40a9ff;
border-radius: 5px;
font-size: 14px;
color: #fff;
margin-left:40px;
cursor:pointer;
"
@click="downLoadClient()"
>
客户端下载
</span>
</div>
</div>
</div>
</div>
@ -356,18 +319,12 @@
dept.deptName = infrastructure.deptName
}
const showThis = () => {
console.log('props.refObj.enclosure',props.refObj);
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(props.refObj))
btoa(encodeURI(props.refObj.enclosure))
)
}
//
const downLoadClient = () => {
let url = "https://open.hikvision.com/download/5c67f1e2f05948198c909700?type=10";
window.open( url, '_blank')
}
const showArr = ref([])
console.log(props.refObj, '=====================================')
const endThis = (instanceId) => {
@ -561,8 +518,6 @@
})
}
const openView = (url) => {
console.log('valval',url);
//http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=37021100421318000090&protocol=wss&transmode=1&streamType=1
window.open(url, '_blank')
}
</script>
@ -611,10 +566,6 @@
width: 2.5rem;
}
}
.downButton{
display: flex;
justify-content: normal;
}
}
}
.bottom {
@ -641,7 +592,7 @@
.box {
margin-left: 0.1rem;
.ability {
height: 2.0rem;
height: 1.6rem;
display: flex;
border-bottom: 1px #eee solid;
padding: 0.1rem 0;
@ -749,10 +700,6 @@
position: relative;
}
}
.button-bottom{
margin-top: 0;
margin-bottom: 10px;
}
}
.DownloadAttachment {
position: absolute;

View File

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

View File

@ -171,7 +171,7 @@
console.log('编目一级=============>', res.data)
res.data.data.forEach((val) => {
// tabList.value.push(val.name)
if (val.name == '应用资源' || val.name == '组件服务' || val.name == '融合服务') {
if (val.name == '应用资源' || val.name == '组件服务') {
tabList.value.push(val.name)
}
})
@ -357,12 +357,11 @@
})
} else if (delFlag === undefined) {
//
// mybus.emit('tabsChange', { flag: item.resourceId })
mybus.emit('tabsChange', { flag: id })
mybus.emit('tabsChange', { flag: item.resourceId })
router.push({
path: `/integrationServicesDetails`,
query: {
id: id,
id: item.resourceId,
},
})
}