From 3bb31de1b7cd170f683f3916fc7566511625d6a8 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 14 Mar 2022 14:58:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 75966340..1211047a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -328,9 +328,9 @@ router.beforeEach((to, from, next) => { .then(({ data: res }) => { if (res.code !== 0) { // Vue.prototype.$message.error(res.msg) - return next({ - name: "login", - }); + // return next({ + // name: "login", + // }); } window.SITE_CONFIG["menuList"] = res.data; fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]); @@ -341,9 +341,9 @@ router.beforeEach((to, from, next) => { }); }) .catch(() => { - next({ - name: "login", - }); + // next({ + // name: "login", + // }); }); }); @@ -397,14 +397,20 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { route["meta"]["iframeURL"] = URL; } else { URL = URL.replace(/^\//, "").replace(/_/g, "-"); - route["path"] = route["name"] = URL.replace(/\//g, "-"); - route["component"] = () => import(`@/views/modules/${URL}`); + if (menuList[i].children && menuList[i].children.length >= 1) { + route["path"] = route["name"] = URL; + route["redirect"] = URL.replace(/\//g, "-"); + } else { + route["path"] = route["name"] = URL.replace(/\//g, "-"); + route["component"] = () => import(`@/views/modules/${URL}`); + } } routes.push(route); } if (temp.length >= 1) { return fnAddDynamicMenuRoutes(temp, routes); } + // routers.reverse(); // 添加路由 router.addRoutes([ { From fe4b87ad084ddf30110f9850622d4f3d9279ae3d Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 15 Mar 2022 10:05:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/dqfwzx/index.vue | 244 +++++++++++------- .../modules/communityService/sqzzz/index.vue | 8 +- 2 files changed, 148 insertions(+), 104 deletions(-) diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index 0b2265aa..f5b5b873 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -2,23 +2,26 @@
- 新增 + 新增
-
+
-
-
+
+
修改
{{ item.centerName }}
@@ -48,88 +51,107 @@ >
--> -
- - - - +
+ + + + - + - +
-
- +
+
- - + + - - + + - - + +
@@ -150,7 +172,7 @@ let loading; // 加载动画 export default { components: { editForm, orderForm, orderList }, - data () { + data() { return { openSearch: false, @@ -167,23 +189,23 @@ export default { }; }, computed: { - maxTableHeight () { - return this.clientHeight - 410; + maxTableHeight() { + return this.clientHeight - 520; }, ...mapGetters(["clientHeight"]), }, watch: { - currentIndex () { + currentIndex() { this.setMap(); }, }, - async mounted () { + async mounted() { await this.loadAgency(); await this.getTableData(); }, methods: { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap () { + initMap() { // 定义地图中心点坐标 var center = new window.TMap.LatLng(36.0722275, 120.38945519); // 定义map变量，调用 TMap.Map() 构造函数创建地图 @@ -203,7 +225,7 @@ export default { infoWindowList = Array(10); }, - setMarker (lat, lng, centerName) { + setMarker(lat, lng, centerName) { markers.setGeometries([]); markers.add([ { @@ -217,11 +239,11 @@ export default { ]); }, - setCenter (lat, lng) { + setCenter(lat, lng) { map.setCenter(new window.TMap.LatLng(lat, lng)); }, - setMap () { + setMap() { const { tableData, currentIndex } = this; let item = tableData[currentIndex]; if (item) { @@ -230,24 +252,24 @@ export default { } }, - handleClose () { + handleClose() { this.formShow = false; }, - handleCloseForm2 () { + handleCloseForm2() { this.form2Show = false; }, - handleCloseOrderList () { + handleCloseOrderList() { this.orderListShow = false; }, - async handleAdd () { + async handleAdd() { this.formShow = true; await nextTick(); console.log(this.$refs); this.$refs.eleEditForm.initForm("add"); }, - async handleWatch () { + async handleWatch() { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm( @@ -256,7 +278,7 @@ export default { ); }, - async handleEdit () { + async handleEdit() { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm( @@ -265,12 +287,12 @@ export default { ); }, - handleEditSuccess () { + handleEditSuccess() { this.handleClose(); this.getTableData(); }, - async handleOrder (index) { + async handleOrder(index) { this.form2Show = true; await nextTick(); this.$refs.eleOrderForm.initForm( @@ -280,18 +302,18 @@ export default { ); }, - handleOrderSuccess () { + handleOrderSuccess() { this.handleCloseForm2(); }, - async handleOrderList (index) { + async handleOrderList(index) { this.orderListShow = true; await nextTick(0); console.log(this.$refs); this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index); }, - async handleDel (rowData, rowIndex) { + async handleDel(rowData, rowIndex) { console.log(rowData, rowIndex); const url = "/heart/iccommunityselforganization/delcommunityselforganization"; @@ -309,7 +331,7 @@ export default { } }, - async getTableData () { + async getTableData() { const oldLen = this.tableData.length; const url = "/gov/org/icpartyservicecenter/partyservicecenterlist"; const { data, code, msg } = await requestPost(url, { @@ -330,7 +352,7 @@ export default { }, //加载组织 - async loadAgency () { + async loadAgency() { const url = "/epmetuser/customerstaff/staffbasicinfo"; let params = {}; @@ -358,6 +380,27 @@ export default { .center-left { width: 25%; .list { + padding-right: 10px; + height: calc(100vh - 210px); + overflow-y: auto; + &::-webkit-scrollbar { + /*滚动条整体样式*/ + width: 8px; /*高宽分别对应横竖滚动条的尺寸*/ + height: 1px; + } + &::-webkit-scrollbar-thumb { + /*滚动条里面小方块*/ + border-radius: 8px; + box-shadow: inset 0 0 5px rgba(#333, 0.1); + background: linear-gradient(270deg, #eee, #aaa); + } + &::-webkit-scrollbar-track { + /*滚动条里面轨道*/ + box-shadow: inset 0 0 5px rgba(#333, 0.1); + border-radius: 8px; + background: #eee; + } + .item { position: relative; box-sizing: border-box; @@ -420,6 +463,7 @@ export default { } .div_map { margin-bottom: 10px; + height: 300px; } } } @@ -448,7 +492,7 @@ export default { } .resi-card-table { - margin-top: 20px; + // margin-top: 20px; } .resi-row-btn { margin-bottom: 13px; diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index ef13f05a..fa82fc66 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -54,7 +54,7 @@ excel导出导出
{ // this.importLoading = false; - // this.importBtnTitle = "excel导入"; + // this.importBtnTitle = "导入"; // console.log("resresresresresresres", res); // this.getTableData(); @@ -307,7 +307,7 @@ export default { // console.log("失败", err); // }); this.importLoading = false - this.importBtnTitle = 'excel导入' + this.importBtnTitle = '导入' this.$refs.upload.clearFiles(); }, From 7c447b6bb918e7f3329d5f4580cea5740a45bfa9 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 15 Mar 2022 10:34:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue index f208e869..07f748b3 100644 --- a/src/views/pages/index.vue +++ b/src/views/pages/index.vue @@ -5,13 +5,15 @@
-
党建引领基层治理互联管理平台
+ +
数字社区管理平台
-
数据分析可视化平台
+ +
数字社区可视化平台
From 2ada00899940405869b1ed3968107b97b3ca707b Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 15 Mar 2022 10:51:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue index 07f748b3..056814c6 100644 --- a/src/views/pages/index.vue +++ b/src/views/pages/index.vue @@ -21,7 +21,7 @@
From 76aba99be634c9d9d90c53d4abd30f5aa63f7b1d Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 15 Mar 2022 16:36:58 +0800 Subject: [PATCH 5/6] ddd --- src/assets/img/unopen-hint.png | Bin 0 -> 9201 bytes src/router/index.js | 14 ++++++++- src/views/modules/unopen.vue | 51 +++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/assets/img/unopen-hint.png create mode 100644 src/views/modules/unopen.vue diff --git a/src/assets/img/unopen-hint.png b/src/assets/img/unopen-hint.png new file mode 100644 index 0000000000000000000000000000000000000000..c1a108e3e3aafd7cea2b930e85d97036ddf55293 GIT binary patch literal 9201 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 import("@/views/modules/unopen"), + name: "unopen", + meta: { + title: "未开放功能", + isTab: true, + }, + }, ], }; @@ -397,7 +406,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { route["meta"]["iframeURL"] = URL; } else { URL = URL.replace(/^\//, "").replace(/_/g, "-"); - if (menuList[i].children && menuList[i].children.length >= 1) { + if (URL.startsWith("unopen")) { + route["path"] = route["name"] = URL.replace(/\//g, "-"); + route["component"] = () => import(`@/views/modules/unopen`); + } else if (menuList[i].children && menuList[i].children.length >= 1) { route["path"] = route["name"] = URL; route["redirect"] = URL.replace(/\//g, "-"); } else { diff --git a/src/views/modules/unopen.vue b/src/views/modules/unopen.vue new file mode 100644 index 00000000..06cfb17d --- /dev/null +++ b/src/views/modules/unopen.vue @@ -0,0 +1,51 @@ + + + + + From 3ecf0e4fcd7961ae3dcaef45daf55e7192d3ce4f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 15 Mar 2022 17:23:32 +0800 Subject: [PATCH 6/6] dd --- src/views/components/resiSearch.vue | 20 +++++++++++++++---- src/views/modules/base/resi.vue | 7 ++++--- .../modules/communityParty/elegant/index.vue | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 72503bad..26c928c7 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -65,7 +65,7 @@ > - +
@@ -190,6 +190,7 @@ --> 查询 + 重置
@@ -372,6 +373,12 @@ export default { this.form.UNIT_ID = '' this.form.HOME_ID = '' }, + resetForm(formName) { + for(const n in this.form) { + this.form[n] = '' + } + this.handleSearch() + }, handleSearch() { // console.log('formmmmm---', this.form) const itemTypes = ['daterange', 'timerange'] @@ -435,9 +442,13 @@ export default { if (n === val) { if (this.fixedList.length > 0) { let _item = {} + let hasVal = false this.fixedList.forEach((item, index) => { - if (item.columnName === val) { + if (item.columnName == val) { + hasVal = true item.columnValue[0] = this.form[val] + if (!this.form[val]) this.fixedList.splice(index, 1) + console.log('fixedList----val', this.fixedList) } else { _item = { queryType: 'equal', @@ -445,10 +456,11 @@ export default { columnName: val, columnValue: [this.form[val]] } + console.log('fixedList----else', _item) // this.$set(this.fixedList, index, _item) } }) - if (Object.keys(_item).length > 0) this.fixedList.push(_item) + if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item) } else { this.$set(this.fixedList, 0, { queryType: 'equal', diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 2d9d49cf..7054fb54 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -12,11 +12,12 @@ @click="handleAdd">新增 下载人口模板 + @click="handleExportModule('room')">下载模板