Merge branch 'dev-220309' into dev

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({
+        // return next({
-          name: "login",
+        //   name: "login",
-        });
+        // });
       }
       window.SITE_CONFIG["menuList"] = res.data;
       fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);
@@ -341,9 +350,9 @@ router.beforeEach((to, from, next) => {
       });
     })
     .catch(() => {
-      next({
+      // next({
-        name: "login",
+      //   name: "login",
-      });
+      // });
     });
 });
 
@@ -397,14 +406,23 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
       route["meta"]["iframeURL"] = URL;
     } else {
       URL = URL.replace(/^\//, "").replace(/_/g, "-");
+      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([
     {

src/views/components/resiSearch.vue

@@ -65,7 +65,7 @@
                   >
                   </el-option>
                 </el-select>
-                <!-- <el-select
+                <el-select
                   v-model.trim="form.UNIT_ID"
                   :disabled="changeBDisabled"
                   placeholder="单元"
@@ -98,7 +98,7 @@
                     :value="item.value"
                   >
                   </el-option>
-                </el-select> -->
+                </el-select>
               </div>
             </div>
           </el-col>
@@ -190,6 +190,7 @@
         </el-col> -->
         <el-col :span="24">
           <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
+          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
         </el-col>
       </el-row>
       <div class="resi-down" @click="handleOpenSearch">
@@ -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',

src/views/modules/base/resi.vue

@@ -12,11 +12,12 @@
                    @click="handleAdd">新增</el-button>
         <el-button class="diy-button--export"
                    size="small"
-                   @click="handleExportModule('room')">下载人口模板</el-button>
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload ref="upload"
                    class="upload-demo"
                    action="uploadUlr"
                    :limit="1"
+                   :accept="'.xls,xlsx'"
                    :with-credentials="true"
                    :show-file-list="false"
                    :auto-upload="true"
@@ -277,7 +278,7 @@ export default {
     return {
       exportBtn: false,
       exportBtnTitle: '导出',
-      importBtnTitle: '导入人员数据',
+      importBtnTitle: '导入',
       importLoading: false,
       rowVisible: false,
       tableLoading: false,
@@ -659,7 +660,7 @@ export default {
       //     this.$message.error('导入失败')
       //   })
       this.importLoading = false
-      this.importBtnTitle = '导入人员数据'
+      this.importBtnTitle = '导入'
       this.$refs.upload.clearFiles()
     },
     handleClick (tab, event) {

src/views/modules/communityParty/elegant/index.vue

@@ -236,7 +236,7 @@ export default {
   data() {
     return {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-      importBtnTitle: '导入数据',
+      importBtnTitle: '导入',
       importLoading: false,
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -477,7 +477,7 @@ export default {
       //     this.$message.error('导入失败')
       // })
       this.importLoading = false
-      this.importBtnTitle = '导入数据'
+      this.importBtnTitle = '导入'
       this.$refs.upload.clearFiles()
     },
     async handleExport() {

src/views/modules/communityService/dqfwzx/index.vue

@@ -2,23 +2,26 @@
   <div>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button class="diy-button--add"
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
-                   size="small"
+          >新增</el-button
-                   @click="handleAdd">新增</el-button>
+        >
       </div>
 
-      <div class="m-center"
+      <div class="m-center" v-if="tableData.length > 0">
-           v-if="tableData.length > 0">
         <div class="center-left">
           <div class="list">
-            <div @click="currentIndex = index"
+            <div
+              @click="currentIndex = index"
               class="item"
               :class="{ 'z-on': currentIndex == index }"
               :key="'ct' + index"
-                 v-for="(item, index) in tableData">
+              v-for="(item, index) in tableData"
-              <div class="item-btn"
+            >
+              <div
+                class="item-btn"
                 v-if="currentIndex == index"
-                   @click="handleEdit">
+                @click="handleEdit"
+              >
                 修改
               </div>
               <div class="item-name">{{ item.centerName }}</div>
@@ -48,88 +51,107 @@
             >
           </div> -->
 
-          <div id="centerIndexApp"
+          <div id="centerIndexApp" class="div_map"></div>
-               class="div_map"></div>
 
-          <el-table :data="tableData[currentIndex].matterList"
+          <el-table
+            :data="tableData[currentIndex].matterList"
             border
             style="width: 100%"
             class="resi-table"
-                    :max-height="maxTableHeight">
+            :max-height="maxTableHeight"
-            <el-table-column label="序号"
+          >
+            <el-table-column
+              label="序号"
               type="index"
               align="center"
-                             width="50" />
+              width="50"
-            <el-table-column prop="matterName"
+            />
-                             label="事项名称">
+            <el-table-column prop="matterName" label="事项名称">
             </el-table-column>
-            <el-table-column prop="allowTime"
+            <el-table-column prop="allowTime" label="可预约时间	">
-                             label="可预约时间	">
             </el-table-column>
-            <el-table-column fixed="right"
+            <el-table-column
+              fixed="right"
               label="操作"
               align="center"
-                             width="120">
+              width="120"
+            >
               <template slot-scope="scope">
-                <el-button @click="handleOrder(scope.$index)"
+                <el-button
+                  @click="handleOrder(scope.$index)"
                   type="text"
-                           size="small">预约</el-button>
+                  size="small"
+                  >预约</el-button
+                >
 
-                <el-button @click="handleOrderList(scope.$index)"
+                <el-button
+                  @click="handleOrderList(scope.$index)"
                   type="text"
                   size="small"
-                           style="margin-right: 10px; color: #00a7a9">预约记录</el-button>
+                  style="margin-right: 10px; color: #00a7a9"
+                  >预约记录</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
-      <div class="m-hint"
+      <div class="m-hint" v-else>
-           v-else>
+        <el-empty description="暂无内容" :image-size="200"></el-empty>
-        <el-empty description="暂无内容"
-                  :image-size="200"></el-empty>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
+    <el-dialog
+      :visible.sync="formShow"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :title="formTitle"
       width="850px"
       top="5vh"
       class="dialog-h"
-               @closed="handleClose">
+      @closed="handleClose"
-      <edit-form ref="eleEditForm"
+    >
+      <edit-form
+        ref="eleEditForm"
         @dialogCancle="handleClose"
-                 @dialogOk="handleEditSuccess"></edit-form>
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="form2Show"
+    <el-dialog
+      :visible.sync="form2Show"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       title="预约"
       width="850px"
       top="5vh"
       class="dialog-h"
-               @closed="handleCloseForm2">
+      @closed="handleCloseForm2"
-      <order-form ref="eleOrderForm"
+    >
+      <order-form
+        ref="eleOrderForm"
         @dialogCancle="handleCloseForm2"
-                  @dialogOk="handleOrderSuccess"></order-form>
+        @dialogOk="handleOrderSuccess"
+      ></order-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="orderListShow"
+    <el-dialog
+      :visible.sync="orderListShow"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       title="预约记录"
       width="850px"
       top="5vh"
       class="dialog-h"
-               @closed="handleCloseOrderList">
+      @closed="handleCloseOrderList"
-      <order-list ref="eleOrderList"
+    >
-                  @dialogCancle="handleCloseOrderList"></order-list>
+      <order-list
+        ref="eleOrderList"
+        @dialogCancle="handleCloseOrderList"
+      ></order-list>
     </el-dialog>
   </div>
 </template>
@@ -168,7 +190,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 410;
+      return this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -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;

src/views/modules/communityService/sqzzz/index.vue

@@ -54,7 +54,7 @@
         </el-upload>
 
         <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >excel导出</el-button
+          >导出</el-button
         >
       </div>
       <el-table
@@ -203,7 +203,7 @@ export default {
         createTime: ["", ""],
       },
 
-      importBtnTitle: "excel导入",
+      importBtnTitle: "导入",
       importLoading: false,
 
       //积分记录
@@ -293,7 +293,7 @@ export default {
       // })
       //   .then((res) => {
       //     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();
     },
 

src/views/modules/unopen.vue

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div class="m-hint">
+      <div class="wrap">
+        <img src="@/assets/img/unopen-hint.png" alt="" />
+        <span>功能暂未开放</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  components: {},
+  mounted() {},
+  methods: {
+    changeCustomerName(customerName) {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-hint {
+  position: relative;
+  background-color: #ffffff;
+  height: calc(100vh - 150px);
+
+  .wrap {
+    position: absolute;
+    display: block;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 271px;
+    height: 240px;
+    font-size: 20px;
+    line-height: 30px;
+    font-weight: bold;
+    color: #aaa;
+    text-align: center;
+    img {
+      margin-bottom: 10px;
+    }
+  }
+}
+</style>

src/views/pages/index.vue

@@ -5,13 +5,15 @@
         <div class="list">
           <div class="item" @click="handleClickItem(1)">
             <img class="logo" src="@/assets/img/index/logo-1.png" alt="" />
-            <div class="name">党建引领基层治理互联管理平台</div>
+             <!-- 党建引领基层治理互联管理平台 -->
+            <div class="name">数字社区管理平台</div>
             <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
 
           <div class="item z-on" @click="handleClickItem(2)">
             <img class="logo" src="@/assets/img/index/logo-2.png" alt="" />
-            <div class="name">数据分析可视化平台</div>
+             <!-- 数据分析可视化平台 -->
+            <div class="name">数字社区可视化平台</div>
             <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
         </div>
@@ -19,7 +21,7 @@
       <div class="m-footer">
         <div class="login-footer">
           <p>
-            <a href="" target="_blank">{{ $t('login.copyright') }}</a>
+            <a href="http://www.elinkchina.com.cn/" target="_blank">{{ $t('login.copyright') }}</a>
           </p>
         </div>
       </div>