diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index e5900aae..513a0fc3 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -424,7 +424,7 @@ export default {
this.submitFrom.infoList.push(obj)
},
submitData () {
- console.log('编辑11111111111===============>', this.putOnTheShelfList)
+ console.log('提交11111111111===============>', this.putOnTheShelfList)
const arr = []
this.putOnTheShelfList.map(item => {
item.children.map(child => {
@@ -510,45 +510,45 @@ export default {
})
})
this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
- if (this.submitFrom.id) {
- // 解决编辑无组件类型
- this.submitFrom.infoList.map(val => {
- if (val.attrType === '组件类型') {
- val.attrValue = this.radio
- }
- })
- console.log('编辑===============>', this.submitFrom)
- console.log(this.submitFrom.infoList, '===============abc')
- // 去重
- const newArr = this.submitFrom.infoList.filter((element, index, self) => {
- return self.findIndex(x => x.attrType === element.attrType) === index
- })
- this.submitFrom.infoList = newArr
- console.log(this.submitFrom.infoList, '====================================wpwpwp')
- this.$http
- .put('/resource/update', this.submitFrom)
- .then(({ data: res }) => {
- if (res.code !== 0) {
- this.$message.error('修改失败!')
- } else {
- this.$message.success('修改成功!')
- this.clear()
- }
- })
- .catch(() => {})
- } else {
- this.$http
- .post('/resource/insert?source= b', this.submitFrom)
- .then(({ data: res }) => {
- if (res.code !== 0) {
- this.$message.error('上架失败!')
- } else {
- this.$message.success('上架成功!')
- this.clear()
- }
- })
- .catch(() => {})
- }
+ // if (this.submitFrom.id) {
+ // // 解决编辑无组件类型
+ // this.submitFrom.infoList.map(val => {
+ // if (val.attrType === '组件类型') {
+ // val.attrValue = this.radio
+ // }
+ // })
+ // console.log('编辑===============>', this.submitFrom)
+ // console.log(this.submitFrom.infoList, '===============abc')
+ // // 去重
+ // const newArr = this.submitFrom.infoList.filter((element, index, self) => {
+ // return self.findIndex(x => x.attrType === element.attrType) === index
+ // })
+ // this.submitFrom.infoList = newArr
+ // console.log(this.submitFrom.infoList, '====================================wpwpwp')
+ // this.$http
+ // .put('/resource/update', this.submitFrom)
+ // .then(({ data: res }) => {
+ // if (res.code !== 0) {
+ // this.$message.error('修改失败!')
+ // } else {
+ // this.$message.success('修改成功!')
+ // this.clear()
+ // }
+ // })
+ // .catch(() => {})
+ // } else {
+ // this.$http
+ // .post('/resource/insert?source= b', this.submitFrom)
+ // .then(({ data: res }) => {
+ // if (res.code !== 0) {
+ // this.$message.error('上架失败!')
+ // } else {
+ // this.$message.success('上架成功!')
+ // this.clear()
+ // }
+ // })
+ // .catch(() => {})
+ // }
},
// 新修改
UpdateData (item) {
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index e87ccf59..88ac92a0 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -113,10 +113,39 @@ export default {
this.options = dataList
if (!this.data.note1) {
this.$http.get('/sys/user/info').then(({ data: res }) => {
+ console.log(res.data)
this.data.note1 = res.data.deptId
})
}
})
+ } else if (this.data.name === '部门联系人') {
+ this.$http.get('/sys/dept/all').then(res => {
+ const dataList = []
+ res.data.data.forEach((element) => {
+ dataList.push(element)
+ })
+ this.options = dataList
+ if (!this.data.note1) {
+ this.$http.get('/sys/user/info').then(({ data: res }) => {
+ console.log(res.data)
+ this.data.note1 = res.data.realName || ''
+ })
+ }
+ })
+ } else if (this.data.name === '部门联系人电话') {
+ this.$http.get('/sys/dept/all').then(res => {
+ const dataList = []
+ res.data.data.forEach((element) => {
+ dataList.push(element)
+ })
+ this.options = dataList
+ if (!this.data.note1) {
+ this.$http.get('/sys/user/info').then(({ data: res }) => {
+ console.log(res.data)
+ this.data.note1 = res.data.mobile || ''
+ })
+ }
+ })
}
},
chekBoxChange (list) {
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 54e3a782..d5de6cfe 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -36,13 +36,32 @@
添加更多{{ configure.name }}
{{ val.name }}
-
+
+
+
+
+ {{
+ numType == '一次性买断'
+ ? '元'
+ : numType == '按调用次数'
+ ? '元/次'
+ : numType == '按并发路数'
+ ? '元/路'
+ : numType == '按年计费'
+ ? '元/年'
+ : ''
+ }}
+
+
-
+
@@ -68,7 +87,8 @@ export default {
data () {
return {
data: [],
- showKey: 0
+ showKey: 0,
+ numType: '一次性买断'
}
},
methods: {
@@ -85,7 +105,21 @@ export default {
if (flag) {
const obj = {}
list.forEach((item) => {
- obj[item.field] = item.note1
+ if (item.type === 'input2') {
+ obj[item.field] =
+ item.note1 +
+ (this.numType === '一次性买断'
+ ? '元'
+ : this.numType === '按调用次数'
+ ? '元/次'
+ : this.numType === '按并发路数'
+ ? '元/路'
+ : this.numType === '按年计费'
+ ? '元/年'
+ : '')
+ } else {
+ obj[item.field] = item.note1
+ }
})
this.data.push(obj)
this.$emit('changeInfoList', {
@@ -108,6 +142,10 @@ export default {
attrValue: JSON.stringify(this.data),
delFlag: 0
})
+ },
+ radioChange (e) {
+ console.log(e, 'wewewe')
+ this.numType = e.target.value
}
},
created () {
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 7e6c279f..85763ee6 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -23,8 +23,8 @@
tip="支持文件类型,大小不超过100M">
-
-
+
+
@@ -106,13 +106,13 @@ export default {
field: 'type',
type: 'radio',
options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
- note1: ''
+ note1: '一次性买断'
},
{
name: '计费标准',
field: 'price',
- type: 'number',
- company: '元',
+ type: 'input2',
+ // company: '元',
note1: ''
},
{
diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index 37079a4d..a482cea2 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -221,7 +221,7 @@ export default {
}
},
operationType (val) {
- if (val !== 'all') {
+ if (val !== 'all' && val !== '') {
this.dataForm.operationType = val
}
}
@@ -245,6 +245,7 @@ export default {
// 重置按钮
resetFunction () {
+ this.operationType = '' // 操作类型转化
const params = {
status: '',
creatorName: '',
@@ -254,10 +255,10 @@ export default {
operationType: 'all'
}
this.value1 = '' // 格式化日期
- this.operationType = '' // 操作类型转化
this.page = 1
this.limit = 10
this.dataForm = params
+ console.log('this.dataForm', this.dataForm)
this.getDataList() // 重置完调用查询方法
},
// 序号
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 66106bcf..685e6098 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -32,7 +32,7 @@ if (newLocation === 'qingdao') {
{ name: '能力统计', key: 'abilityStatistics' },
// { name: '开发指南', key: 'developmentGuide' },
{ name: '指导手册', key: 'instructionManual' },
- // { name: '需求中心', key: 'demandCenter' },
+ { name: '需求中心', key: 'demandCenter' },
// { name: '个人中心', key: 'personalCenter' },
{ name: '区市站点', key: 'mapTest' },
// { name: '后台管理', key: 'houtaiguanli' },
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index ee58275e..dc8a25ca 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 09:44:38
+ * @LastEditTime: 2022-07-15 11:50:22
* @Description: 算法上架
-->
@@ -157,13 +157,13 @@
field: 'type',
type: 'radio',
options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
- note1: '',
+ note1: '一次性买断',
},
{
name: '计费标准',
field: 'price',
- type: 'number',
- company: '元',
+ type: 'input2',
+ // company: '元',
note1: '',
},
{
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index cc5b9b78..9eead4b5 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-13 18:14:42
+ * @LastEditTime: 2022-07-15 11:51:18
* @Description: 上架
-->
@@ -58,6 +58,25 @@
:placeholder="'请填写' + val.name + ',不超过24个字符'"
v-if="val.type == 'input'"
/>
+
+
+
+ {{
+ numType == '一次性买断'
+ ? '元'
+ : numType == '按调用次数'
+ ? '元/次'
+ : numType == '按并发路数'
+ ? '元/路'
+ : numType == '按年计费'
+ ? '元/年'
+ : ''
+ }}
+
+
-
+
请选择来源应用
请选择关联组件
@@ -329,6 +352,10 @@
list: [],
})
const showKey = ref(0)
+ const numType = ref('一次性买断')
+ const radioChange = (e) => {
+ numType.value = e.target.value
+ }
props.refData.children.map((item) => {
if (item.name == '基本信息') {
item.children.map((val) => {
@@ -436,7 +463,21 @@
if (flag) {
let obj = {}
list.forEach((item) => {
- obj[item.field] = item.note1
+ if (item.type === 'input2') {
+ obj[item.field] =
+ item.note1 +
+ (numType.value == '一次性买断'
+ ? '元'
+ : numType.value == '按调用次数'
+ ? '元/次'
+ : numType.value == '按并发路数'
+ ? '元/路'
+ : numType.value == '按年计费'
+ ? '元/年'
+ : '')
+ } else {
+ obj[item.field] = item.note1
+ }
})
data.value[title].push(obj)
// console.log(data.value[title])
@@ -685,17 +726,18 @@
margin-top: 20px;
display: flex;
justify-content: flex-start;
+ align-items: center;
span:first-child {
width: 120px;
}
:deep(.ant-input-textarea) {
- width: 570px;
+ width: 520px;
}
:deep(.ant-radio-group) {
- width: 570px;
+ width: 520px;
}
:deep(.ant-input-number) {
@@ -704,7 +746,7 @@
:deep(.ant-input) {
resize: none;
- width: 570px;
+ width: 520px;
}
.ant-btn {
@@ -742,7 +784,7 @@
}
.application-Area {
- width: 570px;
+ width: 520px;
display: grid;
margin-top: -5px;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
index 35ef590e..3e97e58d 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
@@ -92,6 +92,7 @@
align-items: center;
.item {
width: 424px;
+ height:306px;
padding: 35px;
display: flex;
flex-direction: column;
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
index bbde3d6a..d05a5830 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@@ -1,6 +1,6 @@
-
+
{{ item.title }}
- {{ item.titleSon }}
-
{{ item.contact }}
-
-
- {{ item.facilitator.name }}
-
- {{ item.facilitator.value }}
- {{ item.facilitator.value }}
-
-
-
- {{ item.people.name }}
-
- {{ item.people.value }}
- {{ item.people.value }}
-
-
-
- {{ item.phone.name }}
-
- {{ item.phone.value }}
- {{ item.phone.value }}
-
-
+
+
{{ item.contact }}
+
+
+ {{ item.facilitator.name }}
+
+ {{ item.facilitator.value }}
+ {{ item.facilitator.value }}
+
+
+
+ {{ item.people.name }}
+
+ {{ item.people.value }}
+ {{ item.people.value }}
+
+
+
+ {{ item.phone.name }}
+
+ {{ item.phone.value }}
+ {{ item.phone.value }}
+
+
+
+
+
+
{{ item.contact2 }}
+
+
+ {{ item.facilitator2.name }}
+
+ {{ item.facilitator2.value }}
+ {{ item.facilitator2.value }}
+
+
+
+ {{ item.people2.name }}
+
+ {{ item.people2.value }}
+ {{ item.people2.value }}
+
+
+
+ {{ item.phone2.name }}
+
+ {{ item.phone2.value }}
+ {{ item.phone2.value }}
+
+
+
@@ -65,16 +92,15 @@