From 9c7d3db786759480888cef3c371ec17a22443f26 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Wed, 22 Jun 2022 18:10:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/assignCase/components/AssignCaseDetailPage.vue | 9 ++++++--- front/src/views/assignCase/components/queryPage.vue | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/front/src/views/assignCase/components/AssignCaseDetailPage.vue b/front/src/views/assignCase/components/AssignCaseDetailPage.vue index 577a47d1..795b597c 100644 --- a/front/src/views/assignCase/components/AssignCaseDetailPage.vue +++ b/front/src/views/assignCase/components/AssignCaseDetailPage.vue @@ -41,9 +41,12 @@ :key="index" @click="tabSwitch(item, index)" :class=" - tabName == item.attrType + (tabName == item.attrType ? 'assign-case-detail-page-content-left-border-click' - : '' + : '') || + (selectNow == item.id + ? 'assign-case-detail-page-content-left-border-click' + : '') " > {{ item.attrType }} @@ -175,7 +178,7 @@ ) //tab点击事件 const tabSwitch = (item, index) => { - tabName.value = item.title + tabName.value = item.attrType if (index != 0 && index != 3) { let top = document.querySelector( diff --git a/front/src/views/assignCase/components/queryPage.vue b/front/src/views/assignCase/components/queryPage.vue index dab439ec..8345faeb 100644 --- a/front/src/views/assignCase/components/queryPage.vue +++ b/front/src/views/assignCase/components/queryPage.vue @@ -168,6 +168,7 @@ tabClickShow.value = true } else { let list = [] + listBg.value = '' init(list) tabClickShow.value = false } From f7e1556ed7f36be893eb2d1ea34e27393a8d9811 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 23 Jun 2022 14:52:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9token=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/index.html | 18 +++++++++--------- front/src/utils/request.js | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/front/public/index.html b/front/public/index.html index 3ccfd971..feceaf8f 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.wuhongjian - * @LastEditTime: 2022-06-22 18:46:16 + * @LastEditTime: 2022-06-23 14:37:03 * @Description: 告诉大家这是什么 --> @@ -33,10 +33,10 @@ // 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['backUrl'] = 'http://10.110.205.1:8001'; - window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; - window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin'; + // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001'; + // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin'; // 西海岸版本 // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; @@ -49,10 +49,10 @@ // 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['backUrl'] = 'http://124.222.94.39:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; + window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; diff --git a/front/src/utils/request.js b/front/src/utils/request.js index b9b36c15..ed1a4e87 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -90,6 +90,27 @@ instance.interceptors.response.use( console.log('接口返回', response) console.log('接口返回headers', response.headers) console.log('接口返回REDIRECT', response.headers.redirect) + if (response.headers.redirect === '/#/login') { + var keys = document.cookie.match(/[^ =;]+(?=\=)/g) + if (keys) { + for (var i = keys.length; i--; ) { + document.cookie = + keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com + document.cookie = + keys[i] + + '=0;path=/;domain=' + + document.domain + + ';expires=' + + new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com + document.cookie = + keys[i] + + '=0;path=/;domain=kevis.com;expires=' + + new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com + } + } + console.log('已清除') + location.reload() + } response['Access-Control-Expose-Headers'] = 'redirect' const { code, message } = response.data if (response.headers.token) { From 5430330eaff5b72e6d91b32bba68c30a66f3f959 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 23 Jun 2022 15:02:11 +0800 Subject: [PATCH 03/11] =?UTF-8?q?BUG=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/utils/request.js b/front/src/utils/request.js index ed1a4e87..3a642879 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -109,7 +109,7 @@ instance.interceptors.response.use( } } console.log('已清除') - location.reload() + router.push({ path: '/login' }) } response['Access-Control-Expose-Headers'] = 'redirect' const { code, message } = response.data @@ -170,7 +170,7 @@ instance.interceptors.response.use( } } console.log('已清除') - location.reload() + router.push({ path: '/login' }) } if (response.headers.redirect) { window.location.href = response.headers.redirect From 538b6f14a41d7871a36b87d67176b401405e9412 Mon Sep 17 00:00:00 2001 From: gaoxiaolong <327091900@qq.com> Date: Thu, 23 Jun 2022 16:35:53 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/assets/img/TOP5.png | Bin 0 -> 2020 bytes .../applicationResources.vue | 110 ++++++ .../abilityStatistics/componentServices.vue | 358 ++++++++++++++++++ .../views/modules/abilityStatistics/index.vue | 250 ++++++++++++ 4 files changed, 718 insertions(+) create mode 100644 back/src/assets/img/TOP5.png create mode 100644 back/src/views/modules/abilityStatistics/applicationResources.vue create mode 100644 back/src/views/modules/abilityStatistics/componentServices.vue create mode 100644 back/src/views/modules/abilityStatistics/index.vue diff --git a/back/src/assets/img/TOP5.png b/back/src/assets/img/TOP5.png new file mode 100644 index 0000000000000000000000000000000000000000..e43592f2066f58dd74bf9369f2a895a05d4211d5 GIT binary patch literal 2020 zcmaJ?c~Db#9uFXL34#}(V4sOVu;dOxLL%k>iI5CODq+X#kvx(Rlb1~%B)~c-kZq|2 zS*joc3hP+y6vY9t92IJdm|6v`2wlo@TQLY&5kvvI4=Z;6SoY1l_dDkE`FyX>%*%}y z?Q(Y9=!n5!oCOj5Sac0W-?jED(eKUi_AzwvM8YIU9Grw0KplkP$lyc>5U4>p6bpf} zw7>oUu`n2$txB;3kqD!hQdms{7coSmT8pwV7*?oJ3rbZG0wh9mrG|~2Y-+&*N*Nm) zA1EXXwLD0nj7Zl(ap@wlG+iZS$grV10G5%73aB9j1dQrK8a>m<#=g~MqWi^b5*Bz1 zK~!w)A4y4s(EtzDK|m0ZLXeWlWFUw^l!1w$G%+y%ppvN+5}8h-&A<@O zi-yz5l9;jl@OQz`6C0~Q5G|8LG8ha*1C0plTBr27FA_)344FVbo8a-}F zfe-1WI;9p-!Wv*v5ln={kuM)9U~b*Er~)TFV?gK6bk=8RIPrG z)+4ddpZWezVZAs_3z1?WJ)EMGqLWL)Er!xEc{&J0V4WC-4=uGZS^*=lUIA+XDwP-r z;Nz7V8Enw|zaFquvdqmubl zE``D4hjW&=d{~;IhBU|$SN12Dvn+Sf3~DVJnGfldsgNvO2dja%H8YjV=MuE6-aD>r z`CNjR<&w~3NQ;yGuSqXmq4rtazBevE8vC?G8jiuN*dyR`#KxY_;v*H} z1lPmm6a2Mx3&;3Sc(hiDOLv7`auIqB0;@@-)iRgIytWSVd z+p^59rlAAO@T(6hLwd$9JUkQkTdxt{KlZ{j)cms1(lsgmw?&*&cl|#8a=&JBV6NmGA0EN~l6$H4OkT0*_>+99Y~t9) z1Gg0Q{xua|n3V3p4{ZA>9vR;s4mBUyN;FSPL)H%~`d8EpZ%^`)((r*tvwiSyY%)F^ zt^XVzDiP}1W%nG+PqQjl`;a-rXSXi3aFqAlJ}v@EeHW63^ZU$)0+MD2H(#{v6#abF zaVpM_W!Jf~2lwfn68D@gzuPe8?wW=L@&u;LOUI$?*RyWviy5O6Ilb$P!XH+iw@%+Y zTv1+YO)uDjXa-#M8fQh2!pC#hPPx?OO22z{Gwt>2oyFcAnK__j!~MW}aYe5MF>idm zSB({{xNx%O+Dgfo6`}j0pE6HQu3{-Rk8X-Pt8X#YIlkcaRfjZ#1z{QP3b#Dv+Fc>7 z=7<-P)W`}$#gnUGPD>pwxcZ7gz+j(@`t`aYV!uC*#0wt4Is5BLIX2Jc_I>#Qt;Tov zwvi0yW~(oYsU4?%)8+On9^|A*I_}`j!kbgOZa-?>VtVYJ4HwYXwb5(L@@N&0COI*= z?|Cnl_3&OpZ(3-CE#)c?Sw|nzYMS;YY-sf>Jb%}Eyy`^Z$;cp?Fta*!-(*E~o*RRe z?}zg=*E)>uJFk*#+_?uxo-BRJGS5Gs{ zzoz&TSk0Q|1{a@5!AI^9yj!-flB_JY*SBPbWY@-4B&%$!>)htNo$6aM3zN?UbR-Pk ze_FIAYyGTsXOFE_`s1Fdt$n3kkkK93S(5b;)0Tx-1ZLV%^8JbrcVq4)V03Y5RP&Jlp=U z%*UQ&o1E5leDbGen_n{A^2J-NW!ApDQaxZkAx-c(lxwOt4QviRQ>go*f +
+ 应用资源 + 发布情况统计 +
+
+ 评分发布情况 +
+
+ 发布量情况分布 +
+
+ 应用领域分布情况 +
+
+ 被调用组件及数量 + +
+
+ 被申请组件及数量 + +
+
+ 评分发布情况 +
+
+ 评分发布情况 +
+
+
+ + \ No newline at end of file diff --git a/back/src/views/modules/abilityStatistics/componentServices.vue b/back/src/views/modules/abilityStatistics/componentServices.vue new file mode 100644 index 00000000..2ab65dfb --- /dev/null +++ b/back/src/views/modules/abilityStatistics/componentServices.vue @@ -0,0 +1,358 @@ + + + \ No newline at end of file diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue new file mode 100644 index 00000000..5d4a90f1 --- /dev/null +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -0,0 +1,250 @@ + + + From c97201645b0ef8b8dc137554651b3758409dd98b Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 23 Jun 2022 17:56:40 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=85=8D=E7=BD=AE=EF=BC=8Ctoken=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/location.js | 45 ++++++++++++++++++- front/src/utils/request.js | 9 +++- .../components/ResourceAggregation.vue | 2 +- front/src/views/home/DetailsPageconetent.vue | 1 - front/src/views/home/mapTest/index.vue | 32 +++++++++---- .../components/CapabilityConvergence.vue | 4 +- 6 files changed, 76 insertions(+), 17 deletions(-) diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index cf3fbae5..b8618151 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-23 14:17:52 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-23 17:55:06 * @Description: 数据资源参数配置 */ const newLocation = 'qingdao' @@ -14,6 +14,8 @@ const whoShow = {} const launchedDataNumObject = {} // 导航数据 const navListManagement = {} +// 区市站点数据 +const mapTestNum = {} // 底部数据 const footerDataList = {} // qingdao @@ -51,6 +53,45 @@ if (newLocation === 'qingdao') { }, ], } + mapTestNum.lsNum = [ + { + name: '基础设施', + key: 'lsjcss', + num: 20135, + }, + { + name: '数据资源', + key: 'lsjcss', + num: 857, + }, + { + name: '应用资源', + key: 'lsjcss', + num: 28, + }, + ] + mapTestNum.xhaNum = [ + { + name: '基础设施', + key: 'xhajcss', + num: 35282, + }, + { + name: '数据资源', + key: 'xhajcss', + num: 11, + }, + { + name: '应用资源', + key: 'xhajcss', + num: 23, + }, + { + name: '组件服务', + key: 'xhazjfw', + num: 8, + }, + ] } // baotou else if (newLocation === 'baotou') { diff --git a/front/src/utils/request.js b/front/src/utils/request.js index 3a642879..0ab87260 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -90,6 +90,7 @@ instance.interceptors.response.use( console.log('接口返回', response) console.log('接口返回headers', response.headers) console.log('接口返回REDIRECT', response.headers.redirect) + if (response.headers.redirect === '/#/login') { var keys = document.cookie.match(/[^ =;]+(?=\=)/g) if (keys) { @@ -109,7 +110,9 @@ instance.interceptors.response.use( } } console.log('已清除') - router.push({ path: '/login' }) + setTimeout(() => { + location.reload() + }, 1000) } response['Access-Control-Expose-Headers'] = 'redirect' const { code, message } = response.data @@ -170,7 +173,9 @@ instance.interceptors.response.use( } } console.log('已清除') - router.push({ path: '/login' }) + setTimeout(() => { + location.reload() + }, 1000) } if (response.headers.redirect) { window.location.href = response.headers.redirect diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 12e7f225..3fdf4885 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -89,7 +89,7 @@ dataList.value.dataList = res.data.data res.data.data.map((item, index) => { if (dataList.value.dataList[index].type === '数据资源') { - dataList.value.dataList[index].amount = dataSourceNum.value || 10433 + dataList.value.dataList[index].amount = dataSourceNum.value || 0 } dataList.value.dataList[index].organization = '个' dataList.value.dataList[index].photo = photo.value[index] diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 1c2d79ec..7d58846a 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -544,7 +544,6 @@ - -->
diff --git a/front/src/views/home/mapTest/index.vue b/front/src/views/home/mapTest/index.vue index c1352872..73300ce4 100644 --- a/front/src/views/home/mapTest/index.vue +++ b/front/src/views/home/mapTest/index.vue @@ -2,7 +2,7 @@
-
+
西海岸 @@ -11,12 +11,12 @@
-
- 基础设施 +
+ {{ item.name }} - 35282 + {{ item.num }}
-
+
-
+
崂山区 @@ -43,7 +43,12 @@
-
+
+ {{ item.name }} + + {{ item.num }} +
+
@@ -73,6 +78,15 @@ const echarts = require('echarts') const xhaFlag = ref(false) const lsqFlag = ref(false) + const lsList = ref([]) + const xhaList = ref([]) + // eslint-disable-next-line no-undef + const mapTestNum1 = mapTestNum + if (mapTestNum1) { + lsList.value = mapTestNum1.lsNum + xhaList.value = mapTestNum1.xhaNum + } + console.log('===============>', mapTestNum1) const areaMenuList = ref([ // 全市概况 // { diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue index 1b5ecd85..ff34baec 100644 --- a/front/src/views/newHome/components/CapabilityConvergence.vue +++ b/front/src/views/newHome/components/CapabilityConvergence.vue @@ -104,7 +104,7 @@ const whoShow1 = ref(whoShow) const getAppResources = (type, obj) => { paramsGetResources.type = type - if (type === '数据资源') { + if (type === '数据资源' && !whoShow1.value.itShowBaoTou) { getDataResource({ serviceName: paramsGetResources.name, //资源名称 orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段 @@ -138,7 +138,7 @@ }) } else { pageWithAttrs(paramsGetResources).then((res) => { - console.log('知识库查询列表============>', res.data.data.records) + // console.log('知识库查询列表============>', res.data.data.records) obj.value = res.data.data.records }) } From a7e58d18c8153f5ec986943aeefe68ea936429d5 Mon Sep 17 00:00:00 2001 From: kongjun Date: Thu, 23 Jun 2022 18:06:33 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/project/use.vue | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/back/src/views/modules/project/use.vue b/back/src/views/modules/project/use.vue index 499f0480..2c482148 100644 --- a/back/src/views/modules/project/use.vue +++ b/back/src/views/modules/project/use.vue @@ -11,7 +11,7 @@ @@ -29,26 +29,26 @@ align="center" > + + diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index b4280a91..bc20876b 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -6,9 +6,11 @@ -->
+
+ +
-
基础信息
@@ -33,7 +35,7 @@
- - - -
更多申请信息
- diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue index 94acd632..e17e29db 100644 --- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue +++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue @@ -1,106 +1,134 @@ + diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue b/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue new file mode 100644 index 00000000..17fec47b --- /dev/null +++ b/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue @@ -0,0 +1,175 @@ + + + + From f21946644df41d6cf4da65ddba7808b23965f104 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 23 Jun 2022 21:16:11 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/activiti/demo/comments.vue | 114 ++++++++++++++++++ .../views/modules/activiti/my-todo-task.vue | 45 +++---- front/src/api/demandCenter.js | 14 +++ .../src/views/demandCenter/demandDetails.vue | 23 ++-- 4 files changed, 167 insertions(+), 29 deletions(-) create mode 100644 back/src/views/modules/activiti/demo/comments.vue diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue new file mode 100644 index 00000000..dc18fb61 --- /dev/null +++ b/back/src/views/modules/activiti/demo/comments.vue @@ -0,0 +1,114 @@ + + + + diff --git a/back/src/views/modules/activiti/my-todo-task.vue b/back/src/views/modules/activiti/my-todo-task.vue index 29bff2c0..d9c0482b 100644 --- a/back/src/views/modules/activiti/my-todo-task.vue +++ b/back/src/views/modules/activiti/my-todo-task.vue @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-27 19:34:30 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-04-28 19:26:07 + * @LastEditTime: 2022-06-23 21:08:01 * @Description: 告诉大家这是什么 --> @@ -62,7 +63,8 @@ (scope.row.params && scope.row.params.resourceDTO && scope.row.params.resourceDTO.name) || - (scope.row.params && scope.row.params.undercarriageReason) + (scope.row.params && scope.row.params.undercarriageReason)|| + (scope.row.params && scope.row.params.comment) }} @@ -126,41 +128,42 @@ diff --git a/front/src/api/demandCenter.js b/front/src/api/demandCenter.js index 21fdb8fb..75d5dd37 100644 --- a/front/src/api/demandCenter.js +++ b/front/src/api/demandCenter.js @@ -1,3 +1,10 @@ +/* + * @Author: hisense.wuhongjian + * @Date: 2022-06-14 09:43:30 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-23 20:04:39 + * @Description: 告诉大家这是什么 + */ import request from '@/utils/request' export function demandComment(data) { @@ -7,6 +14,13 @@ export function demandComment(data) { data, }) } +export function demandCommentApply(data) { + return request({ + url: '/comment/center/apply', + method: 'post', + data, + }) +} export function demandCommentPage(params) { return request({ diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index 56dada22..cbf6ca70 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -186,15 +186,14 @@