diff --git a/back/public/index.html b/back/public/index.html index 22701d35..9aff360c 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-01 14:33:29 + * @LastEditTime: 2022-08-01 14:42:22 * @Description: 告诉大家这是什么 --> diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 9e3833ac..fc55d089 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -755,6 +755,9 @@ export default { if (!this.submitFrom.deptContacts) { this.notFilled.push('部门联系人') } + if (!this.submitFrom.deptId) { + this.notFilled.push('归属部门') + } if (!this.submitFrom.deptPhone) { this.notFilled.push('部门联系人电话') } diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 84874bc2..56412788 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -680,6 +680,9 @@ export default { if (!this.submitFrom.shareCondition) { this.notFilled.push('共享条件') } + if (!this.submitFrom.deptId) { + this.notFilled.push('归属部门') + } if (!this.submitFrom.deptContacts) { this.notFilled.push('部门联系人') } diff --git a/front/public/index.html b/front/public/index.html index 09778cff..946baa4a 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-30 19:11:54 + * @LastEditTime: 2022-08-01 11:15:53 * @Description: 告诉大家这是什么 --> @@ -59,12 +59,11 @@ // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.236: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://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.236:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://192.168.124.5: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://192.168.124.236:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index 4e9898e7..893d73dd 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -677,7 +677,9 @@ break case '归属部门': dataFrom.value.deptId = obj.attrValue - dataFrom.value.deptName = obj.attrValueTwo.label + if (obj.attrValueTwo) { + dataFrom.value.deptName = obj.attrValueTwo.label + } break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index 16812205..5edbd35a 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -522,7 +522,9 @@ break case '归属部门': dataFrom.value.deptId = obj.attrValue - dataFrom.value.deptName = obj.attrValueTwo.label + if (obj.attrValueTwo) { + dataFrom.value.deptName = obj.attrValueTwo.label + } break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue index 607718da..45cd0117 100644 --- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue +++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue @@ -600,7 +600,9 @@ break case '归属部门': dataFrom.value.deptId = obj.attrValue - dataFrom.value.deptName = obj.attrValueTwo.label + if (obj.attrValueTwo) { + dataFrom.value.deptName = obj.attrValueTwo.label + } break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index b3533225..c4faeb25 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -599,7 +599,9 @@ break case '归属部门': dataFrom.value.deptId = obj.attrValue - dataFrom.value.deptName = obj.attrValueTwo.label + if (obj.attrValueTwo) { + dataFrom.value.deptName = obj.attrValueTwo.label + } break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index bca26c23..9aef15d7 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -496,7 +496,9 @@ break case '归属部门': dataFrom.value.deptId = obj.attrValue - dataFrom.value.deptName = obj.attrValueTwo.label + if (obj.attrValueTwo) { + dataFrom.value.deptName = obj.attrValueTwo.label + } break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue