From 700bbe7b540eba6fbfa2d14e240ab96e1d58f3d5 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Fri, 30 Dec 2022 14:15:57 +0800 Subject: [PATCH 01/16] =?UTF-8?q?2k=E5=88=86=E8=BE=A8=E7=8E=87=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/newHome/components/WorkDynamics.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index eb5616e0..b0542384 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -619,7 +619,13 @@ right: 0rem; } } - @media only screen and (min-width: 1921px) and (max-width: 3840px) { + @media only screen and (min-width: 1921px) and (max-width: 2560px) { + .fixedmount { + bottom: 1.56rem; + right: 0.37rem; + } + } + @media only screen and (min-width: 2561px) and (max-width: 3840px) { .fixedmount { bottom: 1.56rem; right: 9.6rem; From 227adc0f4bf1354c7c0d7dc72c75a0801b09bc37 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Fri, 30 Dec 2022 15:20:18 +0800 Subject: [PATCH 02/16] =?UTF-8?q?UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/workBench/components/bottom-view.vue | 8 +++++++- .../modules/workBench/components/center-view.vue | 8 ++++++-- .../workBench/components/dept-todo-view.vue | 1 + .../modules/workBench/components/trend-view.vue | 10 ++++------ back/src/views/modules/workBench/workBench.vue | 14 +++++++++++--- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index e3adf2d0..206a7e11 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -79,7 +79,7 @@ export default { } ], tableData: [], - maxSize: { y: 195 }, + maxSize: { y: 235 }, loadingDynamic: false, loadingTable: false } @@ -170,6 +170,7 @@ export default { font-size: 16px; color: #212121; text-align: center; + box-shadow: 2px 2px 5px #ccc; } .container { background: #fff; @@ -177,6 +178,7 @@ export default { height: 335px; padding: 0px 0 0 10px; box-sizing: border-box; + box-shadow: 2px 2px 5px #ccc; } } @@ -256,6 +258,10 @@ export default { ::v-deep .ant-table-thead { background-color: #f4f5f8; } +::v-deep .ant-table-header{ + margin-right: -17px; +} +::v-deep .ant-table-body::-webkit-scrollbar{width:0;} diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index e49554d9..450307a3 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -211,6 +211,7 @@ export default { .num { font-size: 30px; + font-weight: 600; } .unit { diff --git a/back/src/views/modules/workBench/components/trend-view.vue b/back/src/views/modules/workBench/components/trend-view.vue index 202ad275..573f04cc 100644 --- a/back/src/views/modules/workBench/components/trend-view.vue +++ b/back/src/views/modules/workBench/components/trend-view.vue @@ -68,7 +68,6 @@ export default { const valueItem = y + '-' + m + '-' + d // 组合 days.unshift(valueItem) // 添加至数组 } - return days }, @@ -88,7 +87,6 @@ export default { endDate: this.endDate }, (res) => { - if (res.data.data && res.data.data.length > 0) { this.data = res.data.data[0].values this.data.map((item) => { @@ -106,23 +104,23 @@ export default { } else { this.trendChartData = { xaxis: this.ydata, - ydata:this.xaxis + ydata: this.xaxis } } - + this.$nextTick(() => { trendLineChart('trendId', this.trendChartData) }) }, (err) => { - + } ) }, handleTitleSwitch (idx) { this.selectedTitle = idx this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30) - + this.initChart() }, getData (aa) { diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index d0555de2..d3e6b140 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -73,13 +73,13 @@ export default { }, // 部门申请 resourceData: [], - resourceColor: ['#7b2cff', '#fd5151' , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'], + resourceColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'], // 部门申请 applyData: [], - applyColor: ['#5085f2', '#e75fc3', '#f87be2', '#f2719a', '#fca4bb', '#f59a8f', '#fdb301', '#57e7ec', '#cf9ef1'], + applyColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'], // 部门需求 requireData: [], - requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A'], + requireColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'], loadingToDo: false, loadingHasToDo: false, loadingResource: false, @@ -252,12 +252,20 @@ export default { width: 836px; background: #fff; margin-right: 16px; + box-shadow: 2px 2px 5px #ccc; } .dept-chart-box { width: 780px; height: 100%; background: #fff; + box-shadow: 2px 2px 5px #ccc; + &>div{ + border-left: 1px solid rgba($color: #d0d4de, $alpha: 0.5); + } + &>div:nth-of-type(1){ + border: none; + } } } From 9aa7f0f52d6a9b96c022dfbaf92ffc1e48c331ba Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 30 Dec 2022 16:55:07 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/assets/home/sanjiao.png | Bin 0 -> 152 bytes front/src/views/home/DetailsPageconetent.vue | 38 ++++++++++++++---- front/src/views/home/algorithmCompare.vue | 4 +- .../views/home/components/KnowledgeBase.vue | 30 ++++++++------ front/src/views/home/components/header.vue | 19 +++++++-- .../home/components/searchResultList_back.vue | 1 + 6 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 front/src/assets/home/sanjiao.png diff --git a/front/src/assets/home/sanjiao.png b/front/src/assets/home/sanjiao.png new file mode 100644 index 0000000000000000000000000000000000000000..5400ec410ce87b837222f3cdae23b532b2110d34 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhjKx9jP7LeL$-D$|f;?RuLo|Yu zQxq5tCM}rO$a8cef4JeFbdjT(+>ifX=Q;iKuz*^#sXPevK44$rjF6*2UngA7cEzke} literal 0 HcmV?d00001 diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 346c6eaa..da776910 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -74,7 +74,11 @@ {{ item.name }} + +
+ +
From 39d1b8aa801df03363b51954b34952a9dc1d0f98 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Fri, 30 Dec 2022 18:21:23 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 84 +++++++++---------- .../src/views/modules/ability/bsabilityai.vue | 4 +- .../modules/ability/bsabilityservice.vue | 4 +- .../src/views/detailsAll/AlgorithmDetails.vue | 4 +- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index d8d4dbe2..4948d84b 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -1,51 +1,51 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 - * @LastEditors: Light - * @LastEditTime: 2022-10-26 10:48:52 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-12-30 14:21:28 * @Description: 告诉大家这是什么 */ var _global = {} var CONFIGITEM = { - // version: 'qingdao', // 青岛 - // version: 'xihaian', // 西海岸 - version: 'dev', // 测试 - // version: 'frp', // 内网穿透 - // version: 'xihaian', // 开发 - vNum: 'v0.8.7.2', - configData: { - // 青岛市大数据局 - qingdao: { - previewUrl: 'http://15.72.183.90:7008/', - apiURL: 'http://15.72.183.90:8000/ucs-admin', - websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket' - }, - // 西海岸大数据局 - xihaian: { - previewUrl: 'http://10.134.135.9:9796/', - // apiURL: 'http://10.134.135.9:8888/ucs-admin', - // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发 - apiURL: 'http://192.168.124.236:8888/ucs-admin', - // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄 - websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket' - }, - // 测试 - test: { - previewUrl: 'http://192.168.124.243:9796/', - apiURL: 'http://192.168.124.243:8888/ucs-admin', - websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' - }, - // 内网穿透 - frp: { - previewUrl: 'http://124.222.94.39:9796/', - apiURL: 'http://124.222.94.39:8888/ucs-admin', - websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket' - }, - dev: { - previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.233:8888/ucs-admin', - websocketURL: 'ws://192.168.124.233:8888/ucs-admin/websocket' - } + // version: 'qingdao', // 青岛 + // version: 'xihaian', // 西海岸 + version: 'dev', // 测试 + // version: 'frp', // 内网穿透 + // version: 'xihaian', // 开发 + vNum: 'v0.8.7.2', + configData: { + // 青岛市大数据局 + qingdao: { + previewUrl: 'http://15.72.183.90:7008/', + apiURL: 'http://15.72.183.90:8000/ucs-admin', + websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket' + }, + // 西海岸大数据局 + xihaian: { + previewUrl: 'http://10.134.135.9:9796/', + // apiURL: 'http://10.134.135.9:8888/ucs-admin', + // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发 + apiURL: 'http://192.168.124.236:8888/ucs-admin', + // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄 + websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket' + }, + // 测试 + test: { + previewUrl: 'http://192.168.124.243:9796/', + apiURL: 'http://192.168.124.243:8888/ucs-admin', + websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' + }, + // 内网穿透 + frp: { + previewUrl: 'http://124.222.94.39:9796/', + apiURL: 'http://124.222.94.39:8888/ucs-admin', + websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket' + }, + dev: { + previewUrl: 'http://localhost:8080/', + apiURL: 'http://192.168.124.243:8888/ucs-admin', + websocketURL: 'ws://192.168.124.233:8888/ucs-admin/websocket' } + } } -_global.config = CONFIGITEM.configData[CONFIGITEM.version] \ No newline at end of file +_global.config = CONFIGITEM.configData[CONFIGITEM.version] diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 1c29d748..f9ee12c5 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -167,9 +167,9 @@ 详情 - 技术文档 + > --> 详情 - 技术文档 + > -->