BUG修改 后台上架开发

This commit is contained in:
a0049873 2022-07-09 15:22:20 +08:00
parent 883581f67e
commit 23324f50ad
11 changed files with 158 additions and 77 deletions

View File

@ -154,9 +154,10 @@
:visible.sync="showPutOnTheShelfFlag2" :visible.sync="showPutOnTheShelfFlag2"
:close-on-click-modal='false' :close-on-click-modal='false'
:close-on-press-escape='false' :close-on-press-escape='false'
:destroy-on-close='true'
:before-close='clear' :before-close='clear'
width="50%"> width="50%">
<putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList'></putOnTheShelf> <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio'></putOnTheShelf>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="clear"> </el-button> <el-button @click="clear"> </el-button>
<el-button type="primary" @click="submitData"> </el-button> <el-button type="primary" @click="submitData"> </el-button>
@ -236,10 +237,6 @@ export default {
this.fullScreen() this.fullScreen()
}, },
methods: { methods: {
changeInfoList (obj) {
this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
this.submitFrom.infoList.push(obj)
},
reset () { reset () {
this.$http this.$http
.get( .get(
@ -434,8 +431,73 @@ export default {
this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
console.log('radio', this.radio) console.log('radio', this.radio)
}, },
changeInfoList (obj) {
this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
this.submitFrom.infoList.push(obj)
},
submitData () { submitData () {
console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList) const arr = []
this.putOnTheShelfList.map(item => {
item.children.map(child => {
if (child.children) {
if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
arr.push(child.name)
}
child.children.map(val => {
arr.push(val.name)
if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
}
if (val.note1) {
switch (val.name) {
case '算法名称':
case '应用名称':
case '组件名称':
case '图层名称':
this.submitFrom.name = val.note1
break
case '算法描述':
case '应用描述':
case '组件描述':
case '图层描述':
this.submitFrom.description = val.note1
break
case '共享条件':
this.submitFrom.shareCondition = val.note1
break
case '共享类型':
this.submitFrom.shareType = val.note1
break
case '服务接口':
this.submitFrom.apiUrl = val.note1
break
case '接口请求方式':
this.submitFrom.apiMethodType = val.note1
break
case '访问地址':
this.submitFrom.link = val.note1
break
case '部门联系人':
this.submitFrom.deptContacts = val.note1
break
case '部门联系人电话':
this.submitFrom.deptPhone = val.note1
break
default:
this.submitFrom.infoList.push({
attrType: val.name,
attrValue: val.note1,
delFlag: 0
})
break
}
}
})
}
})
})
this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList, arr)
} }
} }
} }

View File

@ -16,12 +16,12 @@ js:
<template> <template>
<div id="inputSelectCheckbox"> <div id="inputSelectCheckbox">
<!-- input框 --> <!-- input框 -->
<a-input v-if="type == 'input'" v-model:value="value" :placeholder="'请输入' + name" /> <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" />
<!-- 下拉框 --> <!-- 下拉框 -->
<el-select <el-select
v-else-if="type === 'select'" v-else-if="type === 'select' || type == 'radio'"
style="width: 240px" style="width: 240px"
v-model="value" v-model:value="data.note1"
:placeholder="'请选择' + name"> :placeholder="'请选择' + name">
<el-option <el-option
:value="itemSelect.dictLabel" :value="itemSelect.dictLabel"
@ -34,7 +34,7 @@ js:
<div <div
v-else-if="type === 'checkBox'" v-else-if="type === 'checkBox'"
> >
<el-checkbox-group v-model="valueCheckBox"> <el-checkbox-group v-model="valueCheckBox" @change='chekBoxChange'>
<el-checkbox-button v-for="val in options" :label="val.dictLabel" :key="val.dictLabel">{{val.dictLabel}}</el-checkbox-button> <el-checkbox-button v-for="val in options" :label="val.dictLabel" :key="val.dictLabel">{{val.dictLabel}}</el-checkbox-button>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
@ -46,20 +46,10 @@ js:
:disabled="true" :disabled="true"
/> />
<!-- 单选 --> <!-- 单选 -->
<el-radio-group v-model="value" v-else-if="type == 'radio'"> <!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'">
<el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio> <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
</el-radio-group> </el-radio-group> -->
<!-- <a-radio-group <a-textarea v-else-if="type == 'textArea'" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
v-model:value="value"
:options="item.options.dictLabel"
/> -->
<!-- 描述框 -->
<!-- <a-textarea v-model:value="value" :showCount="true"
/> -->
<a-textarea v-else-if="type == 'textArea'" v-model:value="value" :showCount="true" :maxlength="200" :placeholder="'请填写' + name"
/>
<!-- <el-input type="textarea" :maxlength="200" v-model="value" :placeholder="'请输入' + item.name" ></el-input> -->
</div> </div>
</template> </template>
<script> <script>
@ -103,6 +93,17 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} }
},
chekBoxChange (list) {
let str = ''
list.map((val, index) => {
str += val
if (index < list.length - 1) {
str += ';'
}
})
// console.log(str)
this.data.note1 = str
} }
}, },
mounted () { mounted () {
@ -112,7 +113,8 @@ export default {
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
#inputSelectCheckbox { #inputSelectCheckbox {
margin-top: 20px; // margin-top: 20px;
width: 100%;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
@ -128,17 +130,17 @@ export default {
} }
} }
::v-deep .ant-input { ::v-deep .ant-input {
// width: 570px; width: 100%;
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
resize: none; resize: none;
// width: 570px; width: 100%;
} }
::v-deep .el-textarea { ::v-deep .el-textarea {
width: 570px; width: 100%;
} }
::v-deep .el-textarea__inner { ::v-deep .el-textarea__inner {
width: 570px; width: 100%;
height: 76px; height: 76px;
min-height: 32px; min-height: 32px;
resize: none; resize: none;
@ -148,10 +150,10 @@ export default {
right: 5px; right: 5px;
} }
::v-deep .el-checkbox-group { ::v-deep .el-checkbox-group {
width: 570px; width: 100%;
display: grid; display: grid;
margin-top: -5px; margin-top: -5px;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
} }
::v-deep .el-checkbox-button__inner { ::v-deep .el-checkbox-button__inner {
cursor: pointer; cursor: pointer;
@ -165,7 +167,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 10px; margin: 10px 5px 0;
font-weight: 500; font-weight: 500;
} }
::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner { ::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-08 09:54:50 * @Date: 2022-07-08 09:54:50
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-08 17:26:24 * @LastEditTime: 2022-07-09 10:54:48
* @Description: 多条数据特殊处理 * @Description: 多条数据特殊处理
--> -->
<template> <template>
@ -43,9 +43,9 @@
<a-input-number v-model:value="val.note1" :min="0" :max="9999" :step="0.01" string-mode <a-input-number v-model:value="val.note1" :min="0" :max="9999" :step="0.01" string-mode
:placeholder="'请填写' + val.name" v-else-if="val.type == 'number'" /> :placeholder="'请填写' + val.name" v-else-if="val.type == 'number'" />
<a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'" /> <a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'" />
<upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型大小不超过100M" <!-- <upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型大小不超过100M"
v-else-if="val.type == 'image'"></upload> v-else-if="val.type == 'image'"></upload> -->
<!-- <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload> --> <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload>
</div> </div>
<div class="submit"> <div class="submit">
<a-button type="primary" @click="add(configure.name)">提交</a-button> <a-button type="primary" @click="add(configure.name)">提交</a-button>
@ -54,8 +54,8 @@
</div> </div>
</template> </template>
<script> <script>
// import upload from '@/views/modules/ability/upload.vue' import upload from '@/views/modules/ability/upload.vue'
import upload from '@/views/modules/components/upload' // import upload from '@/views/modules/components/upload'
export default { export default {
name: '', name: '',
components: { components: {

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-08 09:48:52 * @Date: 2022-07-08 09:48:52
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-08 17:48:27 * @LastEditTime: 2022-07-09 10:57:07
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -21,13 +21,13 @@
tip="支持文件类型大小不超过100M"></upload> tip="支持文件类型大小不超过100M"></upload>
<upload @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item" <upload @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
tip="支持视频类型大小不超过100M"></upload> tip="支持视频类型大小不超过100M"></upload>
<input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" value="组件服务"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name" :value="item.note1"></input-select-checkbox> <input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
</div> </div>
</template> </template>
<template v-else> <template v-else>
@ -49,6 +49,7 @@ export default {
inputSelectCheckbox inputSelectCheckbox
}, },
props: { props: {
type: String,
putOnTheShelfList: Array putOnTheShelfList: Array
}, },
data () { data () {

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-07 20:21:07 * @LastEditTime: 2022-07-09 15:05:57
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -28,11 +28,11 @@
<!-- 站点配置 --> <!-- 站点配置 -->
<script> <script>
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001'; // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/'; // 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['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; // 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['backUrl'] = 'http://10.110.205.1:8001';
// window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@ -45,11 +45,11 @@
// window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
// 开发 // 开发
// window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; 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['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.238:8888/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://124.222.94.39:9797'; // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';

View File

@ -174,7 +174,7 @@
} else { } else {
for (let i = 0; i < 31; i++) { for (let i = 0; i < 31; i++) {
let time = moment() let time = moment()
.subtract('days', 29 - i) .subtract('days', 30 - i)
.format('MM-DD') .format('MM-DD')
callTheTrendData.value.time.push(time) callTheTrendData.value.time.push(time)
console.log('time', callTheTrendData.value, name) console.log('time', callTheTrendData.value, name)

View File

@ -137,7 +137,9 @@
<div v-if="selectCardsname !== '数据资源'"> <div v-if="selectCardsname !== '数据资源'">
浏览量{{ item.visits || 0 }} 浏览量{{ item.visits || 0 }}
</div> </div>
<div>申请量{{ item.applyCount || 0 }}</div> <div v-if="selectCardsname !== '应用资源'">
申请量{{ item.applyCount || 0 }}
</div>
<div v-if="selectCardsname === '数据资源'"> <div v-if="selectCardsname === '数据资源'">
数据量{{ item.sjlCount || 0 }} 数据量{{ item.sjlCount || 0 }}
</div> </div>
@ -145,18 +147,15 @@
收藏量{{ item.collectCount || 0 }} 收藏量{{ item.collectCount || 0 }}
</div> </div>
</div> </div>
<div class="pingfen"> <!-- <div class="pingfen">
<a-tooltip placement="top" mouseEnterDelay="1"> <a-tooltip placement="top" mouseEnterDelay="1">
<!-- <template #title>
<span>{{ item.score || 0 }}</span>
</template> -->
<a-rate <a-rate
:value="item.score || 0" :value="item.score || 0"
disabled disabled
v-if="item.score != 0" v-if="item.score != 0"
/> />
</a-tooltip> </a-tooltip>
</div> </div> -->
</div> </div>
<div class="btn"> <div class="btn">
<div class="right" v-if="selectCardsname !== '基础设施'"> <div class="right" v-if="selectCardsname !== '基础设施'">

View File

@ -152,6 +152,7 @@
} }
switch (val.type) { switch (val.type) {
case '市级': case '市级':
case '企业':
case '其他': case '其他':
generateChildren(val, obj) generateChildren(val, obj)
break break

View File

@ -253,6 +253,12 @@
let tableHeight = ref('600') let tableHeight = ref('600')
//tab //tab
const tabClick = (indexFather, name) => { const tabClick = (indexFather, name) => {
console.log(
'点击tab================>',
indexFather,
name,
clickList.value[indexFather]
)
selectedRowKeys.value = [] selectedRowKeys.value = []
selectedList.value = [] selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) { if (clickList.value[indexFather].content.indexOf(name) != -1) {
@ -338,22 +344,22 @@
}) })
console.log('选中的标签code', mapSearchParam.value) console.log('选中的标签code', mapSearchParam.value)
mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
let fatherName = ref('视频资源') // let fatherName = ref('')
if (name == '视频资源' || name == '云资源' || name == '感知资源') { // if (name == '' || name == '' || name == '') {
fatherName.value == name // fatherName.value == name
} // }
if (fatherName.value == '视频资源') { // if (fatherName.value == '') {
getCamera()
} else {
dataSource.value = []
pagination.value.total = 0
}
// if (name == '') {
// getCamera() // getCamera()
// } else { // } else {
// dataSource.value = [] // dataSource.value = []
// pagination.value.total = 0 // pagination.value.total = 0
// } // }
if (name == '云资源' || name == '感知资源') {
dataSource.value = []
pagination.value.total = 0
} else {
getCamera()
}
} }
// //
const nullClick = () => { const nullClick = () => {

View File

@ -52,7 +52,7 @@
v-for="(item, index) in sjList" v-for="(item, index) in sjList"
:key="item.id" :key="item.id"
:class="index == 4 ? 'name-last' : ''" :class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)" @click="selectOne3(item.name)"
> >
{{ index + 1 }}-{{ item.name }} {{ index + 1 }}-{{ item.name }}
</div> </div>
@ -243,6 +243,16 @@
}, },
}) })
} }
const selectOne3 = (name) => {
console.log('点击===============》', name)
router.push({
path: '/DetailsPageconetent',
query: {
str: name,
select: '数据资源',
},
})
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.capability-convergence { .capability-convergence {

View File

@ -75,7 +75,7 @@
</a-form-item> </a-form-item>
</div> </div>
<div class="qushi-class-father"> <div class="qushi-class-father">
<div class="qushi-class"> <!-- <div class="qushi-class">
<a-form-item label="发布部门" class="gaojisousuo"> <a-form-item label="发布部门" class="gaojisousuo">
<a-select <a-select
ref="select" ref="select"
@ -139,7 +139,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</div> </div> -->
<div class="sousuo" @click="onSearch(mohuchaxun)">搜索</div> <div class="sousuo" @click="onSearch(mohuchaxun)">搜索</div>
<div @click="gaojisousuo" class="mohusousuo"> <div @click="gaojisousuo" class="mohusousuo">
<div class="mohusousuo-tupian"></div> <div class="mohusousuo-tupian"></div>