From f2e68d01058b302b9f49d843b8111bd691843729 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 16 Sep 2022 15:15:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/apply.vue | 1351 +++++++++++++++++---------------
1 file changed, 702 insertions(+), 649 deletions(-)
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index d47f4091..35fa458c 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -67,7 +67,22 @@
placeholder="请输入单位"
v-model:value="formName.unit"
disabled
+ v-if="deptFlage"
/>
+
+
+ {{ item.name }}
+
+
@@ -176,702 +191,740 @@
From 1b26210e01d0d6a07b98c518d7f91cdc5f35d982 Mon Sep 17 00:00:00 2001
From: guoyue
Date: Fri, 16 Sep 2022 16:44:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=83=BD=E5=8A=9B?=
=?UTF-8?q?=E9=9B=86=E5=B8=82-=E6=B5=8F=E8=A7=88=E9=87=8F=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/components/searchResultList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index f99c692e..0fd2870a 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -367,7 +367,7 @@ export default {
// 购物车id列表
const selList = ref([
{ name: '发布时间', value: 'tdr.create_date', show: true, orderType: 'DESC' },
- { name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
+ // { name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
{ name: '申请量', value: 'applyCount', show: true, orderType: 'DESC' },
{ name: '收藏量', value: 'collectCount', show: true, orderType: 'DESC' },
{ name: '评分', value: 'score', show: true, orderType: 'DESC' },
From 6ef87c3c796a8ac20e328e3b36e3ebf3dfc3a6da Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 19 Sep 2022 10:19:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B9=BF=E5=9C=BA=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=88=A0=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/public/static/config/basicConfig.js | 8 +-
.../capacitySquare/components/algorithm.vue | 103 ++++++++++++++++-
.../capacitySquare/components/application.vue | 76 +++++++++++--
.../views/capacitySquare/components/layer.vue | 105 +++++++++++++++++-
4 files changed, 271 insertions(+), 21 deletions(-)
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 82f01cec..63542373 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-27 14:25:54
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-09-19 09:36:49
* @Description: 系统静态参数配置
*/
var _global = {}
@@ -59,8 +59,8 @@ var CONFIGITEM = {
},
backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.236:9796/',
- // websocketURL: '192.168.124.236:8888/renren-admin',
- websocketURL: '10.18.1.99:8889/renren-admin',
+ websocketURL: '192.168.124.236:8888/renren-admin',
+ // websocketURL: '10.18.1.99:8889/renren-admin',
POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
},
diff --git a/front/src/views/capacitySquare/components/algorithm.vue b/front/src/views/capacitySquare/components/algorithm.vue
index 6bdc1dfe..406a7ffa 100644
--- a/front/src/views/capacitySquare/components/algorithm.vue
+++ b/front/src/views/capacitySquare/components/algorithm.vue
@@ -1,6 +1,18 @@