From 2eca6ab7583b1246bdf88dea98da7305ffeb67ae Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 11 Jul 2022 15:41:18 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=90=8E=E5=8F=B0=20=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/index.html | 7 +- .../src/views/modules/ability/bsabilityai.vue | 181 ++++++++++++++---- back/src/views/modules/ability/upload.vue | 4 - .../views/modules/components/upload/index.vue | 31 ++- .../components/inputSelectCheckbox.vue | 41 +++- .../putOnTheShelf/components/special.vue | 18 +- .../src/views/modules/putOnTheShelf/index.vue | 16 +- 7 files changed, 232 insertions(+), 66 deletions(-) diff --git a/back/public/index.html b/back/public/index.html index 4869501d..465e77bf 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.liangjunhua - * @LastEditTime: 2022-07-08 14:13:20 + * @LastEditTime: 2022-07-11 12:09:13 * @Description: 告诉大家这是什么 --> @@ -43,8 +43,9 @@ diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue index 9c8395e7..784284be 100644 --- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue +++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue @@ -19,7 +19,7 @@ js: @@ -30,6 +30,21 @@ js: {{ itemSelect.dictLabel }} + + + {{ itemSelect.name }} + +
{ - console.log(res, 'res') const dataList = [] res.data.list.forEach((element) => { dataList.push(element) - console.log(dataList, 'this.options') }) this.options = dataList - console.log(this.options) }) .catch(() => {}) + } 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 }) => { + this.data.note1 = res.data.deptId + }) + } + }) } }, chekBoxChange (list) { @@ -102,10 +127,16 @@ export default { str += ';' } }) - // console.log(str) this.data.note1 = str } }, + created () { + if (this.data.name === '应用领域') { + if (this.data.note1) { + this.valueCheckBox = this.data.note1.split(';') + } + } + }, mounted () { this.selectOptions() } diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue index 77fa3e34..ee40bfcc 100644 --- a/back/src/views/modules/putOnTheShelf/components/special.vue +++ b/back/src/views/modules/putOnTheShelf/components/special.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-07-08 09:54:50 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-09 10:54:48 + * @LastEditTime: 2022-07-11 15:00:24 * @Description: 多条数据特殊处理 --> diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue index c878f35e..85ab0b3d 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue @@ -2,10 +2,17 @@ From a44cce5492845826ced6822401bbf505e4719b77 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Mon, 11 Jul 2022 18:33:58 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=97=A5=E5=BF=97bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/sys/log-data-modification-log.vue | 2 +- back/src/views/modules/sys/log-operation.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c76cc6ea..c28d66c5 100644 --- a/back/src/views/modules/sys/log-data-modification-log.vue +++ b/back/src/views/modules/sys/log-data-modification-log.vue @@ -31,7 +31,7 @@ Date: Mon, 11 Jul 2022 18:53:42 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=97=A5=E5=BF=97bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/log-data-modification-log.vue | 29 +++++++++++++++++- back/src/views/modules/sys/log-operation.vue | 30 +++++++++++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) 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 c28d66c5..d65b42f9 100644 --- a/back/src/views/modules/sys/log-data-modification-log.vue +++ b/back/src/views/modules/sys/log-data-modification-log.vue @@ -163,7 +163,13 @@ width="150" align="center" :show-overflow-tooltip="true" - > + > + + + diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue index 3b70341b..c0b085ed 100644 --- a/back/src/views/modules/sys/log-operation.vue +++ b/back/src/views/modules/sys/log-operation.vue @@ -117,13 +117,18 @@ :show-overflow-tooltip="true" > + > + + + From ae22bbd063fea0628bc66b40f64ac1ad64e29848 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Mon, 11 Jul 2022 18:59:21 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=9A=90=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/sys/log-data-modification-log.vue | 5 +++-- back/src/views/modules/sys/log-operation.vue | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 d65b42f9..8f5f7c0c 100644 --- a/back/src/views/modules/sys/log-data-modification-log.vue +++ b/back/src/views/modules/sys/log-data-modification-log.vue @@ -70,11 +70,11 @@ 重置 - + 重置 - + Date: Mon, 11 Jul 2022 19:12:53 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=B1=BB=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E8=AF=95=E7=94=A8+=E5=8D=95=E7=82=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/index.html | 6 +-- front/public/index.html | 8 ++-- front/src/api/file.js | 8 +++- front/src/utils/request.js | 34 +++++++++----- front/src/vab/plugins/permissions.js | 6 ++- .../components/Algorithm/TestOfWords.vue | 47 ++++++++++++------- front/src/views/home/infrastructurePage.vue | 2 +- 7 files changed, 69 insertions(+), 42 deletions(-) diff --git a/back/public/index.html b/back/public/index.html index 465e77bf..1d32cc9d 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -44,7 +44,7 @@ // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin'; - 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['previewUrl'] = 'http://15.2.21.238:9796/'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin'; // WebSocket地址 diff --git a/front/public/index.html b/front/public/index.html index cacc03dd..e408d9d5 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -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'; @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/front/src/api/file.js b/front/src/api/file.js index 96f3d1ea..5848b83a 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-20 17:16:35 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-22 14:57:16 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-07-11 19:02:33 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -46,6 +46,10 @@ export function correct(params) { export function paddleocr(params) { return axios.post('http://15.72.183.90:7008/paddleocr', params, config2) } +// 算法总接口 +export function algo(params) { + return axios.post('http://15.72.184.10:8888/api/algo', params, config2) +} // 能力云图-数据资源 export function count() { diff --git a/front/src/utils/request.js b/front/src/utils/request.js index f4fe2a90..0f02346e 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -29,12 +29,13 @@ const handleCode = (code, msg, res) => { // message.error(msg || '登录失效') store.dispatch('user/resetAll').catch(() => {}) - if (res.token) { - console.log('存在token信息', res.token) - setAccessToken(res.token) - const token = getAccessToken() - console.log('验证token信息', token) - } + debugger + // if (res.token) { + // console.log('存在token信息', res.token) + // setAccessToken(res.token) + // const token = getAccessToken() + // console.log('验证token信息', token) + // } // // location.reload() // if (redirect) { @@ -71,8 +72,10 @@ const instance = axios.create({ */ instance.interceptors.request.use( (config) => { - if (store.getters['user/accessToken']) - config.headers[tokenName] = store.getters['user/accessToken'] + debugger + const token = getAccessToken() + if (token) + config.headers[tokenName] = token if ( config.data && config.headers['Content-Type'] === @@ -101,10 +104,12 @@ instance.interceptors.response.use( console.log('接口返回REDIRECT', response.headers.redirect) response['Access-Control-Expose-Headers'] = 'redirect' const { code, message } = response.data - if (response.headers.token) { + debugger + if (code=='0' && response.headers.token) { setAccessToken(response.headers.token) } else { - if (response.headers.redirect) { + const token = getAccessToken() + if (response.headers.redirect && !token) { // window.location.href = response.headers.redirect window.location.replace(response.headers.redirect) return @@ -154,16 +159,21 @@ instance.interceptors.response.use( // } }, (error) => { + debugger console.log('接口error', error) if (loadingInstance) loadingInstance.close() + const { response, message } = error - if (error.response && error.response.data) { + if (error.response) { console.log('接口返回', response) console.log('接口返回headers', response.headers) console.log('接口返回REDIRECT', response.headers.redirect) + // if (response.headers.token) { + // setAccessToken(response.headers.token) + // } if (response.headers.redirect) { window.location.replace(response.headers.redirect) - return Promise.reject(error) + // return Promise.resolve() } const { status, data } = response diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js index 8e495192..6139bd4b 100644 --- a/front/src/vab/plugins/permissions.js +++ b/front/src/vab/plugins/permissions.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 17:23:11 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-08 18:55:28 + * @LastEditTime: 2022-07-11 16:39:36 * @Description: 告诉大家这是什么 */ /** @@ -33,8 +33,9 @@ if (!loginInterception) hasToken = true console.log('hasToken存在巨大问题', hasToken) if (hasToken) { - setAccessToken(hasToken) + // setAccessToken(hasToken) await store.dispatch('user/getUserInfo') + debugger next() } else { let accessRoutes = [] @@ -45,6 +46,7 @@ if (routesWhiteList.indexOf(to.path) !== -1) { next() } else { + // 这里是一个单点登录的入口 getUserInfo().then(res=>{ console.log(res) router.replace('/home') diff --git a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue index 6cee07eb..4541c9a5 100644 --- a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue +++ b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue @@ -26,9 +26,9 @@
-

错误内容： {{ errorWord }}

-

错误位置： {{ errorWordIndex }}

-

识别内容： {{ errorWordContent }}

+

返回结果： {{ errorWord }}

+
@@ -43,26 +43,37 @@ diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index f58fb5c9..a7de5707 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -138,7 +138,7 @@ muted: false, //静音 webFullScreen: false, speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速 - autoPlay: true, //自动播放 + autoPlay: false, //自动播放 loop: false, //循环播放 mirror: false, //镜像画面 ligthOff: false, //关灯模式 From 616d806c2df607c6d8a944b12ff9dbd8b42a981d Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 12 Jul 2022 15:58:57 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/personalCenter.js | 8 + .../views/capacityOnTheShelf/Application.vue | 13 +- .../capacityOnTheShelf/BusinessComponent.vue | 11 + .../DevelopmentComponents.vue | 11 + .../views/capacityOnTheShelf/FilesUpload.vue | 68 + .../capacityOnTheShelf/LayerServices.vue | 11 + .../components/PutOnTheShelf.vue | 1220 +++++++++-------- 7 files changed, 798 insertions(+), 544 deletions(-) create mode 100644 front/src/views/capacityOnTheShelf/FilesUpload.vue diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 67079961..892ff59d 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -231,3 +231,11 @@ export function queryResourceRelByKeyId(params) { params, }) } +// 文件上传接口 +export function filesUpload(data) { + return request({ + url: window.SITE_CONFIG.apiURL + '/upload', + method: 'post', + data, + }) +} diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index d2483801..38d71e39 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -99,6 +99,7 @@ import mybus from '@/myplugins/mybus' const showView = ref('基本信息') const router = useRouter() + let shiyongshouce = ref({}) const navList = ref([]) const navList2 = ref([]) const fileList = ref({}) @@ -285,7 +286,9 @@ } init() mybus.on('chageDataFrom', (obj) => { - console.log(obj, dataFrom.value.infoList) + if (obj.attrType == '使用手册' && obj.attrValue != null) { + shiyongshouce.value = obj + } dataFrom.value.infoList = dataFrom.value.infoList.filter( (item) => item.attrType !== obj.attrType ) @@ -293,6 +296,14 @@ obj.attrValue = '' } dataFrom.value.infoList.push(obj) + if (shiyongshouce.value.attrValue) { + dataFrom.value.infoList.map((syscitem, syscindex) => { + if (syscitem.attrType == '使用手册') { + dataFrom.value.infoList[syscindex] = shiyongshouce.value + } + }) + } + console.log('数据变更=================》', obj, dataFrom.value.infoList) }) mybus.on('chageFileList', (obj) => { fileList.value = obj diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue index 8a515f72..42f6ceba 100644 --- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue +++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue @@ -173,6 +173,7 @@ ], }, ]) + let shiyongshouce = ref({}) const navList = ref([]) const navList2 = ref([]) const fileList = ref({}) @@ -297,6 +298,9 @@ } init() mybus.on('chageDataFrom', (obj) => { + if (obj.attrType == '使用手册' && obj.attrValue != null) { + shiyongshouce.value = obj + } dataFrom.value.infoList = dataFrom.value.infoList.filter( (item) => item.attrType !== obj.attrType ) @@ -304,6 +308,13 @@ obj.attrValue = '' } dataFrom.value.infoList.push(obj) + if (shiyongshouce.value.attrValue) { + dataFrom.value.infoList.map((syscitem, syscindex) => { + if (syscitem.attrType == '使用手册') { + dataFrom.value.infoList[syscindex] = shiyongshouce.value + } + }) + } console.log('数据变更=================》', obj, dataFrom.value.infoList) }) mybus.on('chageFileList', (obj) => { diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index 1f43e8ce..135e5e0f 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -173,6 +173,7 @@ ], }, ]) + let shiyongshouce = ref({}) const navList = ref([]) const navList2 = ref([]) const fileList = ref({}) @@ -297,6 +298,9 @@ } init() mybus.on('chageDataFrom', (obj) => { + if (obj.attrType == '使用手册' && obj.attrValue != null) { + shiyongshouce.value = obj + } dataFrom.value.infoList = dataFrom.value.infoList.filter( (item) => item.attrType !== obj.attrType ) @@ -304,6 +308,13 @@ obj.attrValue = '' } dataFrom.value.infoList.push(obj) + if (shiyongshouce.value.attrValue) { + dataFrom.value.infoList.map((syscitem, syscindex) => { + if (syscitem.attrType == '使用手册') { + dataFrom.value.infoList[syscindex] = shiyongshouce.value + } + }) + } console.log('数据变更=================》', obj, dataFrom.value.infoList) }) mybus.on('chageFileList', (obj) => { diff --git a/front/src/views/capacityOnTheShelf/FilesUpload.vue b/front/src/views/capacityOnTheShelf/FilesUpload.vue new file mode 100644 index 00000000..ce675fe4 --- /dev/null +++ b/front/src/views/capacityOnTheShelf/FilesUpload.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index c6a7ae55..507eba4a 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -121,6 +121,7 @@ ], }, ]) + let shiyongshouce = ref({}) const navList = ref([]) const navList2 = ref([]) const fileList = ref({}) @@ -245,6 +246,9 @@ } init() mybus.on('chageDataFrom', (obj) => { + if (obj.attrType == '使用手册' && obj.attrValue != null) { + shiyongshouce.value = obj + } dataFrom.value.infoList = dataFrom.value.infoList.filter( (item) => item.attrType !== obj.attrType ) @@ -252,6 +256,13 @@ obj.attrValue = '' } dataFrom.value.infoList.push(obj) + if (shiyongshouce.value.attrValue) { + dataFrom.value.infoList.map((syscitem, syscindex) => { + if (syscitem.attrType == '使用手册') { + dataFrom.value.infoList[syscindex] = shiyongshouce.value + } + }) + } console.log('数据变更=================》', obj, dataFrom.value.infoList) }) mybus.on('chageFileList', (obj) => { diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 96eae8fe..9cbd5f94 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -16,14 +16,21 @@
+
+ +
From f593a9785445f60b6ed319c396169e5180565795 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 12 Jul 2022 16:54:35 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/capacityOnTheShelf/Algorithm.vue | 11 +++++++++++ front/src/views/capacityOnTheShelf/Application.vue | 4 ++-- .../capacityOnTheShelf/DevelopmentComponents.vue | 4 ++-- front/src/views/capacityOnTheShelf/FilesUpload.vue | 2 +- front/src/views/capacityOnTheShelf/LayerServices.vue | 4 ++-- .../capacityOnTheShelf/components/PutOnTheShelf.vue | 12 +++++++++++- .../DeveloperOwningDepartmentAndServiceProvider.vue | 2 ++ 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index 61d51591..7bfd8929 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -192,6 +192,7 @@ ], }, ]) + let shiyongshouce = ref({}) const navList = ref([]) const navList2 = ref([]) const fileList = ref({}) @@ -315,6 +316,9 @@ } init() mybus.on('chageDataFrom', (obj) => { + if (obj.attrType == '技术文档' && obj.attrValue != null) { + shiyongshouce.value = obj + } dataFrom.value.infoList = dataFrom.value.infoList.filter( (item) => item.attrType !== obj.attrType ) @@ -322,6 +326,13 @@ obj.attrValue = '' } dataFrom.value.infoList.push(obj) + if (shiyongshouce.value.attrValue) { + dataFrom.value.infoList.map((syscitem, syscindex) => { + if (syscitem.attrType == '技术文档') { + dataFrom.value.infoList[syscindex] = shiyongshouce.value + } + }) + } console.log('数据变更=================》', obj, dataFrom.value.infoList) }) mybus.on('chageFileList', (obj) => { diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index 38d71e39..4ec9bbfc 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -286,7 +286,7 @@ } init() mybus.on('chageDataFrom', (obj) => { - if (obj.attrType == '使用手册' && obj.attrValue != null) { + if (obj.attrType == '技术文档' && obj.attrValue != null) { shiyongshouce.value = obj } dataFrom.value.infoList = dataFrom.value.infoList.filter( @@ -298,7 +298,7 @@ dataFrom.value.infoList.push(obj) if (shiyongshouce.value.attrValue) { dataFrom.value.infoList.map((syscitem, syscindex) => { - if (syscitem.attrType == '使用手册') { + if (syscitem.attrType == '技术文档') { dataFrom.value.infoList[syscindex] = shiyongshouce.value } }) diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index 135e5e0f..d66cb874 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -298,7 +298,7 @@ } init() mybus.on('chageDataFrom', (obj) => { - if (obj.attrType == '使用手册' && obj.attrValue != null) { + if (obj.attrType == '技术文档' && obj.attrValue != null) { shiyongshouce.value = obj } dataFrom.value.infoList = dataFrom.value.infoList.filter( @@ -310,7 +310,7 @@ dataFrom.value.infoList.push(obj) if (shiyongshouce.value.attrValue) { dataFrom.value.infoList.map((syscitem, syscindex) => { - if (syscitem.attrType == '使用手册') { + if (syscitem.attrType == '技术文档') { dataFrom.value.infoList[syscindex] = shiyongshouce.value } }) diff --git a/front/src/views/capacityOnTheShelf/FilesUpload.vue b/front/src/views/capacityOnTheShelf/FilesUpload.vue index ce675fe4..9140988c 100644 --- a/front/src/views/capacityOnTheShelf/FilesUpload.vue +++ b/front/src/views/capacityOnTheShelf/FilesUpload.vue @@ -47,7 +47,7 @@ const res = resData mybus.emit('showTextFunctionEmit', false) let infoList = ref({ - attrType: '使用手册', + attrType: '技术文档', attrValue: res.data.data, delFlag: 0, }) diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index 507eba4a..37da99ce 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -246,7 +246,7 @@ } init() mybus.on('chageDataFrom', (obj) => { - if (obj.attrType == '使用手册' && obj.attrValue != null) { + if (obj.attrType == '技术文档' && obj.attrValue != null) { shiyongshouce.value = obj } dataFrom.value.infoList = dataFrom.value.infoList.filter( @@ -258,7 +258,7 @@ dataFrom.value.infoList.push(obj) if (shiyongshouce.value.attrValue) { dataFrom.value.infoList.map((syscitem, syscindex) => { - if (syscitem.attrType == '使用手册') { + if (syscitem.attrType == '技术文档') { dataFrom.value.infoList[syscindex] = shiyongshouce.value } }) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 9cbd5f94..7ecb6a0e 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -146,8 +146,18 @@ :list="props.fileList" tip="支持文件类型，大小不超过100M" > -
+
上传附件 diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue index 81931869..ec1d4bd8 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue @@ -138,6 +138,7 @@ let obj = props.dataList.infoList.filter( (item) => item.attrType === '技术文档' )[0] + debugger console.log('dataFrom.value.link', obj.attrValue) window.open( window.SITE_CONFIG.previewUrl + @@ -149,6 +150,7 @@ let obj = props.dataList.infoList.filter( (item) => item.attrType === '使用手册' )[0] + debugger console.log('dataFrom.value.link', obj.attrValue) window.open( window.SITE_CONFIG.previewUrl + From 57df5fe2206170aeffd4a55e8abb85989a30d9a0 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 12 Jul 2022 17:08:58 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/capacityOnTheShelf/FilesUpload.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/FilesUpload.vue b/front/src/views/capacityOnTheShelf/FilesUpload.vue index 9140988c..6f059550 100644 --- a/front/src/views/capacityOnTheShelf/FilesUpload.vue +++ b/front/src/views/capacityOnTheShelf/FilesUpload.vue @@ -24,7 +24,7 @@ import * as fontJs from '/public/static/js/font.js' import { filesUpload } from '@/api/personalCenter' import mybus from '@/myplugins/mybus' - let text = '' + let text = ref('') let iconfontJs = fontJs const props = defineProps({ data: { type: Array, default: null }, @@ -44,11 +44,12 @@ // formData.append('name', this.route.currentRoute.query.id + '.md') // FileSaver.saveAs(blob, '开发指南.md') filesUpload(formData).then((resData) => { - const res = resData + const res = resData.data.data + text.value = res mybus.emit('showTextFunctionEmit', false) let infoList = ref({ attrType: '技术文档', - attrValue: res.data.data, + attrValue: res, delFlag: 0, }) mybus.emit('chageDataFrom', infoList.value) From 570a582818ba371b9214f2462571ff98d2284276 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 12 Jul 2022 17:13:03 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PutOnTheShelf.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 7ecb6a0e..06f1be99 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -157,10 +157,11 @@ tip="支持文件类型，大小不超过100M" >
- 上传附件 + 编辑富文本
div { width: 100%; From 19e8f11f1d15696bdb7c434b2d3c99ae1e4bed4a Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 13 Jul 2022 09:09:35 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/personalCenter.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 67079961..602e06ed 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -7,6 +7,13 @@ export function getMyProcessInstancePage(params) { params, }) } +export function getTabilityapplication(params) { + return request({ + url: '/processForm/tabilityapplication/my_page', + method: 'get', + params, + }) +} // 查询申购车列表 export function getSgcList(params) {