Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-07-14 10:56:55 +08:00
commit ecf536e13c
16 changed files with 533 additions and 136 deletions

3
.gitignore vendored
View File

@ -4,3 +4,6 @@ back/dist-西海岸-后台管理-带配置文件.zip
back/dist-市局-后台管理-带配置文件.zip
back/dist-包头-后台管理.zip
back/dist-市局-后台管理.zip
back/dist-市局-后台管理-v0.8.2.1.zip
front/public/index.html
back/dist-西海岸-后台管理-v0.8.2.1.zip

View File

@ -4,16 +4,131 @@
<div v-for="(item, index) in dataView.children" :key="item">
<div class="dataTitle">{{ item.name }}</div>
<div v-for="itemson in item.children" :key="itemson.name">
<div class="dataTitleSon">{{ itemson.name }}</div>
<div class="dataContent">
<div class="dataTitleSon">
{{ itemson.name }}
</div>
<div
class="dataContent"
v-if="
itemson.name !== '算法优势' &&
itemson.name !== '应用场景' &&
itemson.name !== '功能介绍'
"
>
<el-form-item
v-for="itemsonson in itemson.children"
:key="itemsonson.name"
:label="itemsonson.name"
:label="
itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
"
>
<el-input v-model="itemsonson.note1"></el-input>
<div
class="videoAndImgCss"
v-if="
itemsonson.type === 'video' || itemsonson.type === 'image'
"
@click="videoAndImg(itemsonson.note1)"
>
浏览
</div>
<div
v-else-if="itemsonson.type === ' multipleAdditions'"
class="multipleAdditionsClass"
>
<div
v-for="multipleAdditionsItem in itemsonson.note1"
:key="multipleAdditionsItem"
>
<div>
{{
multipleAdditionsItem.question ||
multipleAdditionsItem.type ||
multipleAdditionsItem.name
}}
</div>
<div>
{{
multipleAdditionsItem.answer ||
multipleAdditionsItem.price ||
multipleAdditionsItem.img
}}
</div>
<div>{{ multipleAdditionsItem.desc }}</div>
<!-- <div>{{ multipleAdditionsItem }}</div> -->
</div>
</div>
<el-input
v-else
v-model="itemsonson.note1"
disabled="disabled"
></el-input>
</el-form-item>
</div>
<div v-else-if="itemson.name === '算法优势'">
<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>
<div>{{ itemDataFormValue.desc }}</div>
</div>
</div>
</div>
</div>
<div v-else-if="itemson.name === '应用场景'">
<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>
<div>{{ itemDataFormValue.desc }}</div>
<div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
</div>
</div>
</div>
</div>
<div v-else-if="itemson.name === '功能介绍'">
<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>
<div>{{ itemDataFormValue.desc }}</div>
<div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
</div>
</div>
</div>
</div>
</div>
</div>
</el-form>
@ -21,6 +136,8 @@
</template>
<script>
import qs from 'qs'
export default {
components: {},
props: {
@ -34,7 +151,9 @@ export default {
data () {
return {
dataList: [],
dataView: []
dataView: [],
//
unit: ''
}
},
watch: {
@ -52,11 +171,17 @@ export default {
console.log(this.dataView)
console.log(this.dataForm)
//
this.dataView.children[0].children[0].children[4].note1 =
this.dataForm.description
// this.dataView.children[0].children[0].children[4].note1 =
// this.dataForm.description
//
this.dataView.children[0].children[0].children[0].note1 =
this.dataForm.name
// this.dataView.children[0].children[0].children[0].note1 =
// this.dataForm.name
//
this.dataView.children[2].children[1].children[0].note1 =
this.dataForm.shareCondition
//
this.dataView.children[2].children[1].children[1].note1 =
this.dataForm.shareType
this.dataForm.infoList.map((item, index) => {
this.dataView.children.map((itemView, indexView) => {
// console.log('itemView', itemView)
@ -72,30 +197,50 @@ export default {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.name
} else if (itemSon.name.indexOf('共享条件') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.shareCondition
} else if (itemSon.name.indexOf('共享方式') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.shareMode
} else if (itemSon.name.indexOf('共享类型') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.shareType
} else if (itemSon.name.indexOf('能力类型') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.type
} else if (itemSon.name === item.attrType) {
} else if (itemSon.name.indexOf('属部门') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.unit
} else if (itemSon.name.indexOf('共享条件') != -1) {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = item.attrValue
].children[indexSon].note1 = this.dataForm.shareCondition
} else if (itemSon.name.indexOf('共享类型') != -1) {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = this.dataForm.shareType
} else if (
itemSon.name === '关联组件信息' &&
item.attrType === '关联组件信息'
) {
this.queryPartAppByKeyIdFunction(
indexView,
indexViewSon,
indexSon
)
} else if (itemSon.name === item.attrType) {
if (itemSon.type !== ' multipleAdditions') {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = item.attrValue
} else {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = JSON.parse(item.attrValue)
}
}
})
})
})
if (item.attrType === '功能介绍') {
this.dataForm.infoList[index].attrValue = JSON.parse(
item.attrValue
)
}
})
} else {
const componentType = this.dataForm.infoList.filter(
@ -141,7 +286,7 @@ export default {
} else if (itemSon.name.indexOf('属部门') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.deptId
].note1 = this.unit
} else if (itemSon.name.indexOf('部门联系人电话') != -1) {
this.dataView.children[indexView].children[0].children[
indexSon
@ -150,56 +295,34 @@ export default {
this.dataView.children[indexView].children[0].children[
indexSon
].note1 = this.dataForm.apiMethodType
} else if (
itemSon.name === '来源应用' &&
item.attrType === '来源应用'
) {
this.queryPartAppByKeyIdFunction(
indexView,
indexViewSon,
indexSon
)
} else if (itemSon.name === item.attrType) {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = item.attrValue
if (itemSon.type !== ' multipleAdditions') {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = item.attrValue
} else if (itemSon.type === ' multipleAdditions') {
this.dataView.children[indexView].children[
indexViewSon
].children[indexSon].note1 = JSON.parse(item.attrValue)
}
}
})
})
// .children.map((itemSon, indexSon) => {
// // if (itemSon.name.indexOf('') != -1) {
// // debugger
// // this.dataView.children[indexView].children[0].children[
// // itemSon.name.indexOf('')
// // ].note1 = this.dataForm.description
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.name
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.shareCondition
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.shareMode
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.shareType
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.deptContacts
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.deptId
// // // } else if (itemSon.name.indexOf('')) {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = this.dataForm.deptPhone
// // // } else {
// // // this.dataView.children[indexView].children[0].children[
// // // indexSon
// // // ].note1 = item.attrValue
// // // }
// // } else if (itemSon.name === item.attrType) {
// // }
// })
})
if (item.attrType === '算法优势' || item.attrType === '应用场景') {
this.dataForm.infoList[index].attrValue = JSON.parse(
item.attrValue
)
}
})
console.log(
'valvalvalvalvalvalvalvalvalvalval',
@ -211,9 +334,69 @@ export default {
}
},
computed: {},
methods: {},
methods: {
videoAndImg (link) {
if (link) {
window.open(link)
} else {
this.$message({
message: '未上传',
type: 'warning'
})
}
},
deptName () {
console.log(this.dataForm.deptId)
this.$http
.get(`/sys/dept/${this.dataForm.deptId}`)
.then(({ data: res }) => {
console.log(res.data.name, 'res')
this.unit = res.data.name
})
},
queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
if (this.dataForm.type === '组件服务') {
this.$http
.get(
'/dataResourceRel/queryApp4PartByKeyId' +
'?keyId=' +
this.dataForm.id
)
.then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 = ''
res.data.map((item) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 += item.name + ';'
})
})
} else {
this.$http
.get(
'/dataResourceRel/queryPart4AppByKeyId?keyId=' +
this.dataForm.id +
'&type=' +
'组件服务'
)
.then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 = ''
res.data.map((item) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 += item.name + ';'
})
})
}
}
},
created () {},
mounted () {}
mounted () {
this.deptName()
}
}
</script>
<style lang="scss" scoped>
@ -232,11 +415,67 @@ 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;
width: 212px;
height: 182px;
display: flex;
flex-direction: column;
align-items: center;
padding: 10px;
& > div:first-child {
margin-bottom: 10px;
font-weight: bold;
line-height: 14px;
}
}
}
.videoAndImgCss {
cursor: pointer;
font-size: 12px;
border: 1px solid #3c9bcd;
line-height: 12px;
padding: 5px;
margin-top: 10px;
background: rgba(60, 155, 205, 0.1);
}
.textAndImg {
display: flex;
padding-left: 30px;
.textAndImgSon {
width: 212px;
height: 182px;
margin-right: 30px;
display: flex;
flex-direction: column;
align-items: center;
padding: 10px;
position: relative;
& > div:first-child {
margin-bottom: 10px;
font-weight: bold;
}
& > div:nth-child(3) {
margin-top: 10px;
position: absolute;
bottom: 30px;
cursor: pointer;
font-size: 12px;
border: 1px solid #3c9bcd;
line-height: 12px;
padding: 5px;
margin-top: 10px;
background: rgba(60, 155, 205, 0.1);
}
}
}
.dataContent {
display: grid;
grid-template-columns: repeat(3, 33%);
}
::v-deep .el-form {
padding-left: 30px;
}
::v-deep .el-form-item__content {
display: inline-block;

View File

@ -28,13 +28,26 @@
</el-form>
</div>
<!-- 流程综合组件 -->
<ren-process-multiple
<!-- <ren-process-multiple
v-if="processVisible"
updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
saveFormUrl="/processForm/tabilityapplication"
dataFormName="dataForm"
ref="renProcessMultiple"
></ren-process-multiple>
></ren-process-multiple> -->
<!-- 审批 -->
<div class="agreeOr">
<h3>审批</h3>
<div>
<el-radio-group v-model="agreeOrList" style="width:230px;">
<el-radio-button label="同意" class="blueAll">同意</el-radio-button>
<el-radio-button label="退回" class="redAll">退回</el-radio-button>
</el-radio-group>
<el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
<el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
<el-button class="inputBule" @click="agreeOrNot">提交</el-button>
</div>
</div>
</div>
</template>
@ -42,9 +55,12 @@
import processModule from '@/mixins/process-module'
import Applicationresources from './Application-resources.vue'
import ResourcesAndServices from './ResourcesAndServices.vue'
import debounce from 'lodash/debounce'
import qs from 'qs'
export default {
//
mixins: [processModule],
// mixins: [processModule],
components: {
Applicationresources,
ResourcesAndServices
@ -70,10 +86,38 @@ export default {
coverageNotShow: true,
nameNotShow: false,
algorithmShow: true,
insertList: []
insertList: [],
inputAgree: '',
inputNo: '',
agreeOrList: '同意',
taskId: ''
}
},
watch: {},
created () {
// KEY
console.log('params=================>', this.$route, this.$route.params)
this.taskId = this.$route.params.taskId
this.init()
console.log('fromList', this.$router.currentRoute.params.businessKey)
// this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
var callbacks = {
startProcessSuccessCallback: this.closeCurrentTab,
startProcessErrorCallback: this.startProcessErrorCallback,
taskHandleSuccessCallback: this.closeCurrentTab,
taskHandleErrorCallback: this.taskHandleErrorCallback,
formSaveSuccessCallback: null,
formSaveErrorCallback: null
}
//
this.initProcessMultiple(callbacks)
},
mounted () {
const businessKey = this.$router.currentRoute.params.businessKey
this.getInfo(businessKey)
this.methodsThree()
console.log(this.taskId, 'this.dataForm.taskId')
},
computed: {},
methods: {
getInfo (id) {
@ -101,35 +145,131 @@ export default {
console.log('id', this.$router.currentRoute.params.businessKey)
// }
})
}
},
created () {
// this.dataForm = this.$router.currentRoute.params.id
this.init()
console.log('fromList', this.$router.currentRoute.params.businessKey)
// this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
var callbacks = {
startProcessSuccessCallback: this.closeCurrentTab,
startProcessErrorCallback: this.startProcessErrorCallback,
taskHandleSuccessCallback: this.closeCurrentTab,
taskHandleErrorCallback: this.taskHandleErrorCallback,
formSaveSuccessCallback: null,
formSaveErrorCallback: null
}
//
this.initProcessMultiple(callbacks)
},
mounted () {
const businessKey = this.$router.currentRoute.params.businessKey
this.getInfo(businessKey)
this.methodsThree()
},
agreeOrNot: debounce(function () {
if (this.agreeOrList === '同意') {
console.log('this.dataForm.taskId', this.taskId)
const params = qs.stringify({
taskId: this.taskId,
comment: this.inputAgree
})
console.log(params)
this.$http.post('/act/task/complete?' + params).then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res)
}
return
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res)
}
}
})
}).catch(() => {})
} else if (this.agreeOrList === '退回') {
console.log('this.dataForm.taskId', this.taskId)
const params = qs.stringify({
taskId: this.taskId,
comment: this.inputNo
})
this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res)
}
return
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res)
}
}
})
})
}
}, 1000, { leading: true, trailing: false })
}
}
</script>
<style lang="scss">
<style scoped lang="scss">
.kuandukuandukuandu {
max-width: 1500px;
}
.wrapper {
}
::v-deep .agreeOr > div {
display: flex;
align-items: center;
.el-input {
margin-right: 10px;
margin-left: 32px;
}
}
::v-deep .agreeOr > div:last-of-type {
margin-top: 15px;
}
.blueAll {
::v-deep .el-radio-button__inner {
width: 80px;
height: 32px;
line-height: 32px;
padding: 0;
border-radius: 2px;
background: #ffffff;
color: #0558e1;
border: 1px solid #0558e1;
}
::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
box-shadow: unset !important;
background: #0558e1;
color: #ffffff;
}
}
.inputBule {
width: 55px;
height: 32px;
line-height: 32px;
padding: 0;
border-radius: 2px;
background: #0558e1;
color: #ffffff;
border: 1px solid #0558e1;
}
.redAll {
margin-left: 10px;
::v-deep .el-radio-button__inner {
width: 80px;
height: 32px;
line-height: 32px;
padding: 0;
border-radius: 2px;
border: 1px solid #e83a48;
background: #ffffff;
color: #e83a48;
margin-left: 10px;
}
::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
box-shadow: unset !important;
color: #ffffff;
background: #e83a48;
}
}
.blueInput {
width: 55px;
}
</style>

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-13 14:47:47
* @LastEditTime: 2022-07-14 09:34:08
* @Description: 告诉大家这是什么
-->
<!DOCTYPE html>
@ -33,7 +33,7 @@
// window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
// window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
// window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 包头
// window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
// window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@ -49,7 +49,7 @@
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';

View File

@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-08 08:53:41
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-13 18:05:38
* @Description: 数据资源参数配置
*/
const newLocation = 'qingdao'
@ -37,7 +37,7 @@ if (newLocation === 'qingdao') {
{ name: '区市站点', key: 'mapTest' },
// { name: '', key: 'houtaiguanli' },
{ name: '赋能案例', key: 'assignCase' },
{ name: '融合服务', key: 'integrationServices' },
// { name: '', key: 'integrationServices' },
]
footerDataList.footerList = {
company: {

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-20 09:59:01
* @LastEditTime: 2022-07-14 09:44:38
* @Description: 算法上架
-->
<template>
@ -280,9 +280,9 @@
console.log('res3', res3)
if (res3.data.code == 0) {
message.success('上架成功!')
submitFlag.value = true
window.setTimeout(() => {
window.close()
submitFlag.value = true
}, 1000)
}
})

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-17 19:31:27
* @LastEditTime: 2022-07-14 09:44:49
* @Description: 应用上架
-->
<template>
@ -238,9 +238,9 @@
console.log('res3', res3)
if (res3.data.code == 0) {
message.success('上架成功!')
submitFlag.value = true
window.setTimeout(() => {
window.close()
submitFlag.value = true
}, 1000)
}
})

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-20 09:35:51
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-21 10:37:49
* @LastEditTime: 2022-07-14 09:44:58
* @Description: 业务组件
-->
<template>
@ -262,9 +262,9 @@
console.log('res3', res3)
if (res3.data.code == 0) {
message.success('上架成功!')
submitFlag.value = true
window.setTimeout(() => {
window.close()
submitFlag.value = true
}, 1000)
}
})

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-20 09:35:17
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-21 10:37:45
* @LastEditTime: 2022-07-14 09:45:07
* @Description: 开发组件
-->
<template>
@ -262,9 +262,9 @@
console.log('res3', res3)
if (res3.data.code == 0) {
message.success('上架成功!')
submitFlag.value = true
window.setTimeout(() => {
window.close()
submitFlag.value = true
}, 1000)
}
})

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-20 09:35:17
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-22 17:23:30
* @LastEditTime: 2022-07-14 09:45:18
* @Description: 图层服务
-->
<template>
@ -210,9 +210,9 @@
console.log('res3', res3)
if (res3.data.code == 0) {
message.success('上架成功!')
submitFlag.value = true
window.setTimeout(() => {
window.close()
submitFlag.value = true
}, 1000)
}
})

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-01 20:34:36
* @LastEditTime: 2022-07-13 18:14:42
* @Description: 上架
-->
<template>
@ -461,6 +461,7 @@
})
}
const ApplicationArea = (item, itemson) => {
console.log('点击=========》', item, itemson)
// console.log(item, itemson)
if (item.note2.indexOf(itemson.dictLabel) === -1) {
item.note2.push(itemson.dictLabel)
@ -568,7 +569,7 @@
delFlag: 0,
})
} else {
if (val.name !== '应用领域') {
if (val.name !== '应用领域' && val.name !== '发布端') {
mybus.emit('chageDataFrom', {
attrType: val.name,
attrValue: val.note1,

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-09 09:29:29
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-05 20:25:49
* @LastEditTime: 2022-07-13 16:34:26
* @Description: 算法详情 算法试用
-->
<template>
@ -30,7 +30,8 @@
if (!obj) {
flag.value = false
} else {
onTrial.value = obj.attrValue
//
onTrial.value = obj.attrValue.replace(/amp;/g, '')
}
}
watch(
@ -41,7 +42,8 @@
if (!obj) {
flag.value = false
} else {
onTrial.value = obj.attrValue
//
onTrial.value = obj.attrValue.replace(/amp;/g, '')
}
}
}

View File

@ -14,7 +14,7 @@
:headers="headers"
:showUploadList="false"
@change="handleChange"
maxCount="1"
maxCount="100"
>
<a-button>
<upload-outlined></upload-outlined>
@ -73,8 +73,10 @@
</template>
<script setup>
import { ref, onMounted } from 'vue'
import { paddleocr } from '@/api/file'
import { paddleocr,algo } from '@/api/file'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
const router = useRouter()
const uploadUrl = window.SITE_CONFIG.apiURL + '/upload'
let fileList = ref([])
// const responseUrl = ref('')
@ -82,31 +84,41 @@
const imageResult0 = ref('')
const imageResult1 = ref('')
const menuOpenKeys2 = ref(['全文还原'])
let responseUrl = ref('static/image/test.jpg')
//
let responseUrl = ref('static/image/' + router.currentRoute.value.query.exampleImg)
const imgType = router.currentRoute.value.query.exampleImg.split('.')[1]
const handleChange = (info) => {
debugger;
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList)
}
if (info.file.status === 'done') {
message.success(`${info.file.name} file uploaded successfully`)
debugger
responseUrl.value = info.file.response.data
checkImage()
// imgType.value = info.file.response.data.split('.')[1]
if (responseUrl.value) {
checkImage()
}
} else if (info.file.status === 'error') {
message.error(`${info.file.name} file upload failed.`)
}
}
const checkImage = () => {
getUrlBase64(responseUrl.value, 'jpg', (base64) => {
getUrlBase64(responseUrl.value, imgType.value, (base64) => {
console.log('1111111', base64)
const param = {
img: base64.split('base64,')[1],
company: router.currentRoute.value.query.company,
algorithmName: router.currentRoute.value.query.algorithmName,
data: base64.split('base64,')[1],
type: router.currentRoute.value.query.type
}
paddleocr(param).then((res) => {
algo(param).then((res) => {
// wordValue.value = res.data
console.log('1111', res.data)
imageResult.value = res.data.output
imageResult0.value = res.data.output
imageResult1.value = res.data.output
imageResult.value = res.data.data.text_data
imageResult0.value = res.data.data.text_data
imageResult1.value = res.data.data.text_data
})
})
}

View File

@ -73,7 +73,7 @@
// })
// })
algo(param).then(res=>{
errorWord.value = res.data.text_data
errorWord.value = res.data.data.text_data
})
}
</script>

View File

@ -423,7 +423,7 @@
item.note1 = JSON.parse(item.note1)
item.note1.map((sxt) => {
obj.system.push({
resourceId: sxt.idtCameraChannel,
resourceId: sxt.idtCameraChannel + '',
resourceName: sxt.channelName,
cameraId: sxt.channelId,
})

View File

@ -137,7 +137,7 @@
const mynoticeFlag = ref(false)
const mynoticeData = ref([])
console.log('navListManagement------------>', navListManagement);
// eslint-disable-next-line no-undef
const navList = ref(navListManagement.navList)
const props = defineProps({
@ -209,8 +209,8 @@
})
break
case '后台管理':
window.open(window.SITE_CONFIG.backUrl + '/#/login')
window.reload('http://15.2.21.238:9797')
window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
// window.reload('http://15.2.21.238:9797')
break
case '赋能案例':
router.push({