Merge branch 'dev-220309' into dev

src/assets/scss/modules/search.scss

@@ -228,7 +228,7 @@
                 }
                 .notice-list {
                     // @include toe;
-                    width: 92%;
+                    width: calc(100% - 70px);
                     // height: 24px;
                     // overflow: hidden;
                     a {

src/assets/scss/modules/visual/personCategory.scss

@@ -89,7 +89,7 @@
         }
 
         .item_right {
-          width: 160px;
+          width: 110px;
           display: flex;
           flex-direction: column;
           align-items: space-between;

src/assets/scss/people-info.scss

@@ -8,11 +8,20 @@
 
     .wrap {
         position: relative;
-        margin: 120px auto;
+        margin: 5vh auto;
-        padding: 20px;
+        height: 90vh;
-        width: 1000px;
+        width: 1040px;
         background-color: #fff;
 
+        .wrap2 {
+            box-sizing: border-box;
+            padding: 20px;
+            height: 90vh;
+            width: 1040px;
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
         .title {
             padding: 10px;
             font-size: 22px;
@@ -33,6 +42,7 @@
 
         .btn-close {
             position: absolute;
+            z-index: 2;
             top: -30px;
             right: -30px;
             cursor: pointer;

src/views/modules/base/resi.vue

@@ -48,6 +48,7 @@
                 @selection-change="selectionChange">
         <el-table-column type="selection"
                          fixed="left"
+                         align="center"
                          :selectable="checkSelect"
                          width="55" />
         <el-table-column label="序号"
@@ -489,8 +490,12 @@ export default {
 
 
       let params = {}
-      await this.$http
+      await this.$http({
-        .post(url, params)
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')

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

@@ -66,7 +66,6 @@
           >
           <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
-        
         <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
         
       </div>
@@ -382,28 +381,68 @@ export default {
       this.uploading = true
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
+    download (data, fileName) {
+      console.log('data', data)
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName)
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.style = 'display: none'
+        var url = window.URL.createObjectURL(csvData)
+        a.href = url
+        a.download = fileName
+        a.click()
+        a.remove()
+        window.URL.revokeObjectURL(url)
+      }
+    },
     async handleExportModule () {
       let url = "/resi/partymember/icpartymemberstyle/import/template-download"
       
 
       let params = {}
-      await this.$http
+      // app.ajax.exportFilePost(
-        .post(url, params)
+      //   url,
+      //   params,
+      //   (data, rspMsg) => {
+
+      //     this.download(data, 'a.xls')
+      //   },
+      //   (rspMsg, data) => {
+      //     this.$message.error(rspMsg);
+      //   }
+      // );
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
-          // this.download(res.data, title + '.xls')
+          console.log('res-------dd', res)
           if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
+            this.download(res.data, fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            // console.log('filename', fileName)
-            var url = window.URL.createObjectURL(blob)
+            // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var aLink = document.createElement('a')
+            // var url = window.URL.createObjectURL(blob)
-            aLink.style.display = 'none'
+            // var aLink = document.createElement('a')
-            aLink.href = url
+            // aLink.style.display = 'none'
-            aLink.setAttribute('download', fileName)
+            // aLink.href = url
-            document.body.appendChild(aLink)
+            // aLink.setAttribute('download', fileName)
-            aLink.click()
+            // document.body.appendChild(aLink)
-            document.body.removeChild(aLink) //下载完成移除元素
+            // aLink.click()
-            window.URL.revokeObjectURL(url) //释放掉blob对象
+            // document.body.removeChild(aLink) //下载完成移除元素
+            // window.URL.revokeObjectURL(url) //释放掉blob对象
           } else this.$message.error('下载失败')
         })
         .catch(err => {

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

@@ -2,24 +2,25 @@
   <div>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button class="diy-button--add" size="small" @click="handleAdd"
+        <el-button class="diy-button--add"
-          >新增</el-button
+                   size="small"
-        >
+                   @click="handleAdd">新增</el-button>
       </div>
 
-      <div class="m-center" v-if="tableData.length > 0">
+      <div class="m-center"
+           v-if="tableData.length > 0">
         <div class="center-left">
           <div class="list">
-            <div
+            <div @click="currentIndex = index"
-              @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-btns">
-                <a v-if="currentIndex == index" @click="handleEdit">修改</a>
+                <a v-if="currentIndex == index"
-                <a v-if="currentIndex == index" @click="handleDel">删除</a>
+                   @click="handleEdit">修改</a>
+                <a v-if="currentIndex == index"
+                   @click="handleDel">删除</a>
               </div>
 
               <div class="item-name">{{ item.centerName }}</div>
@@ -49,107 +50,89 @@
             >
           </div> -->
 
-          <div id="centerIndexApp" class="div_map"></div>
+          <div id="centerIndexApp"
+               class="div_map"></div>
 
-          <el-table
+          <el-table :data="tableData[currentIndex].matterList"
-            :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"
-            <el-table-column prop="matterName" label="事项名称">
+                             label="事项名称">
             </el-table-column>
-            <el-table-column prop="allowTime" label="可预约时间	">
+            <el-table-column prop="allowTime"
+                             label="可预约时间	">
             </el-table-column>
-            <el-table-column
+            <el-table-column fixed="right"
-              fixed="right"
                              label="操作"
                              align="center"
-              width="120"
+                             width="120">
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button @click="handleOrder(scope.$index)"
-                  @click="handleOrder(scope.$index)"
                            type="text"
                            size="small"
-                  >预约</el-button
+                           style="color: #1c6afd">预约</el-button>
-                >
 
-                <el-button
+                <el-button @click="handleOrderList(scope.$index)"
-                  @click="handleOrderList(scope.$index)"
                            type="text"
                            size="small"
-                  style="margin-right: 10px; color: #00a7a9"
+                           style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
-                  >预约记录</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
-      <div class="m-hint" v-else>
+      <div class="m-hint"
-        <el-empty description="暂无内容" :image-size="200"></el-empty>
+           v-else>
+        <el-empty description="暂无内容"
+                  :image-size="200"></el-empty>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog
+    <el-dialog :visible.sync="formShow"
-      :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"
+                 @dialogOk="handleEditSuccess"></edit-form>
-      ></edit-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog
+    <el-dialog :visible.sync="form2Show"
-      :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"
+                  @dialogOk="handleOrderSuccess"></order-form>
-      ></order-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog
+    <el-dialog :visible.sync="orderListShow"
-      :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"
-      <order-list
+                  @dialogCancle="handleCloseOrderList"></order-list>
-        ref="eleOrderList"
-        @dialogCancle="handleCloseOrderList"
-      ></order-list>
     </el-dialog>
   </div>
 </template>
@@ -414,29 +397,15 @@ export default {
           position: absolute;
           top: 5px;
           right: 5px;
-          // width: 120px;
-
-          a {
-            display: inline-block;
-            margin-left: 1px;
           font-size: 14px;
-            color: rgb(235, 192, 4);
+          color: #00a7a9;
-            width: 40px;
+          width: 50px;
           line-height: 30px;
           text-align: center;
           cursor: pointer;
-            &:nth-child(2) {
-              color: #aaa;
           &:hover {
             // text-decoration: underline;
-                color: #666;
+            color: #00a7a9;
-              }
-            }
-
-            &:hover {
-              // text-decoration: underline;
-              color: rgb(250, 208, 23);
-            }
           }
         }
 

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

@@ -131,12 +131,10 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="yellow" @click="resetForm('searchForm')"
+              <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-                >重置</el-button
-              >
             </el-form-item>
           </div>
         </el-form>
@@ -145,7 +143,7 @@
     <el-card class="resi-card-table">
      
       <div class="resi-row-btn">
-        <el-button type="success" @click="handleAdd('add')">新增需求</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd('add')">新增</el-button>
       </div>
 
       <el-table

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

@@ -241,8 +241,12 @@ export default {
       
 
       let params = {}
-      await this.$http
+      await this.$http({
-        .post(url, params)
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           // this.download(res.data, title + '.xls')
           if (res.headers["content-disposition"]) {

src/views/modules/importRecord/index.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="resi-container">
     <el-card class="resi-card-table">
-      <div class="resi-row-btn">
+
-        <h2 type="success" size="small">导入记录</h2>
-      </div>
       <el-table
         :data="tableData"
         border

src/views/modules/shequ/cpts/fangwu-info.vue

@@ -202,6 +202,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>

src/views/modules/shequ/cpts/people-more.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-      <div class="title">
-        <span>更多信息</span>
-      </div>
-
       <div class="btn-close" @click="handleClose">
         <img src="@/assets/img/shuju/people/close.png" />
       </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>更多信息</span>
+        </div>
 
         <div
           :key="'fieldSubList' + index"
@@ -137,7 +137,11 @@
             </div>
           </div>
           <div class="list" v-else>
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
+            <div
+              class="item"
+              :key="field.itemId"
+              v-for="field in group.itemList"
+            >
               <span class="item-field">{{ field.label }}：</span>
               <span
                 v-if="
@@ -169,6 +173,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -499,8 +504,4 @@ export default {
 };
 </script>
 
-<style
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
-  lang="scss"
-  src="@/assets/scss/people-info.scss"
-  scoped
-></style>

src/views/modules/shequ/cpts/scroll-notice.vue

@@ -41,7 +41,7 @@ export default {
       let len = this.list.length;
       let beyond = this.beyond;
       return {
-        paddingLeft: beyond ? this.parentClientWidth + "px" : "",
+        // paddingLeft: beyond ? this.parentClientWidth + "px" : "",
         animation: beyond
           ? `move_left_right ${len * 5}s linear 0s infinite`
           : "",
@@ -118,7 +118,7 @@ export default {
       transform: translateX(0%);
     }
     to {
-      transform: translateX(-80%);
+      transform: translateX(-100%);
     }
   }
 }

src/views/modules/shequ/cpts/xuqiu-info.vue

@@ -219,6 +219,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>

src/views/modules/visual/basicinfo/personCategory/index.vue

@@ -49,7 +49,7 @@
               <div class="item_left">较上月</div>
               <div class="item_right">
                 <div class="item_right_row">
-                  <div class="item_right_title">新人员增加</div>
+                  <div class="item_right_title">增加</div>
                   <div>
                     <span v-if=" item.immigration!==0">{{ "+" }}</span>
                     <span>{{  item.immigration }}</span>
@@ -58,7 +58,7 @@
                 </div>
 
                 <div class="item_right_row row2">
-                  <div class="item_right_title">原人员减少</div>
+                  <div class="item_right_title">减少</div>
                   <div>
                     <span v-if=" item.emigration!==0">{{ "-" }}</span>
                     <span>{{  item.emigration }}</span>

src/views/modules/warning/components/screen-table/index.vue

@@ -60,10 +60,7 @@
           </div>
           <screen-loading v-if="visibleLoading">加载中</screen-loading>
           <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
-            <img
+            暂无数据
-              src="@/assets/img/modules/visual/noData.png"
-              class="no-data-img"
-            />
           </div>
         </div>
       </div>
@@ -377,14 +374,13 @@ export default {
       // 暂无数据
       .no-data {
         width: 100%;
-        height: calc(100% - 50px);
+        height: calc(100vh - 650px);
         display: flex;
         align-items: center;
         justify-content: center;
-        &-img {
+        font-size: 20px;
-          width: 249px;
+        color: #999999;
-          height: 172px;
+        text-align: center;
-        }
       }
     }
   }

src/views/modules/workSys/demandCate.vue

@@ -5,6 +5,7 @@
              class="search-card">
       <div>
         <el-form :inline="true"
+                  ref="searchForm"
                  :model="form"
                  class="demo-form-inline">
           <el-form-item label="需求分类">
@@ -25,6 +26,9 @@
                        size="small"
                        @click="handleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -32,7 +36,7 @@
       <div class="resi-row-btn">
         <el-button class="diy-button--add"
                    size="small"
-                   @click="handleAdd('1', 'add')">新增分类</el-button>
+                   @click="handleAdd('1', 'add')">新增</el-button>
       </div>
 
       <el-table :data="tableData"
@@ -220,6 +224,11 @@ export default {
       }
       return _val || row[item.columnName]
     },
+    resetForm(formName) {
+      
+      this.form.firstCategoryCode = ''
+      this.handleSearch();
+    },
     handleSearch (val) {
       console.log('searchhh--', val)
       this.currentPage = 1

src/views/modules/workSys/resiCate.vue

@@ -2,7 +2,7 @@
   <div v-if="pageLoading" class="resi-container">
     <el-card ref="searchCard" class="search-card">
       <div >
-        <el-form :inline="true" :model="form" class="demo-form-inline">
+        <el-form ref="searchForm" :inline="true" :model="form" class="demo-form-inline">
           <el-form-item label="是否预警">
             <el-select
               v-model="isWarn"
@@ -38,6 +38,10 @@
           <el-form-item>
             <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+          
         </el-form>
       </div>
     </el-card>
@@ -335,6 +339,12 @@ export default {
       }
       return _val || row[item.columnName]
     },
+    resetForm(formName) {
+      
+      this.isWarn = ''
+      this.level = ''
+      this.handleSearch();
+    },
     handleSearch(val) {
       console.log('searchhh--', val)
       this.currentPage = 1