diff --git a/src/assets/img/unopen-hint.png b/src/assets/img/unopen-hint.png new file mode 100644 index 00000000..c1a108e3 Binary files /dev/null and b/src/assets/img/unopen-hint.png differ diff --git a/src/router/index.js b/src/router/index.js index 75966340..932df895 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -67,6 +67,15 @@ export const moduleRoutes = { isTab: true, }, }, + { + path: "unopen", + component: () => import("@/views/modules/unopen"), + name: "unopen", + meta: { + title: "未开放功能", + isTab: true, + }, + }, ], }; @@ -328,9 +337,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 +350,9 @@ router.beforeEach((to, from, next) => { }); }) .catch(() => { - next({ - name: "login", - }); + // next({ + // name: "login", + // }); }); }); @@ -397,14 +406,23 @@ 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 (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 { + 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([ { 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')">下载模板
- 新增 + 新增
-
+
-
-
+
+
修改
{{ 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(); }, 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 @@ + + + + + diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue index f208e869..056814c6 100644 --- a/src/views/pages/index.vue +++ b/src/views/pages/index.vue @@ -5,13 +5,15 @@
-
党建引领基层治理互联管理平台
+ +
数字社区管理平台
-
数据分析可视化平台
+ +
数字社区可视化平台
@@ -19,7 +21,7 @@