From 6eb8fc58decd99719207412016523a84830784db Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 16 Mar 2022 15:07:02 +0800
Subject: [PATCH 1/7] dd

---
 src/views/modules/communityParty/elegant/index.vue | 1 -
 src/views/modules/workSys/demandCate.vue           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index a3a53089..4422db93 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/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>
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 43593e1a..27b50ae2 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -32,7 +32,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"

From 436d99aac557d87d0326a1cfde796cbadc860084 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Mar 2022 17:15:00 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/people-info.scss             |  16 +-
 src/views/modules/shequ/cpts/fangwu-info.vue |   2 +
 src/views/modules/shequ/cpts/people-more.vue | 257 ++++++++++---------
 src/views/modules/shequ/cpts/xuqiu-info.vue  |   2 +
 4 files changed, 146 insertions(+), 131 deletions(-)

diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index fa0354ca..24428cdd 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -8,11 +8,20 @@
 
     .wrap {
         position: relative;
-        margin: 120px auto;
-        padding: 20px;
-        width: 1000px;
+        margin: 5vh auto;
+        height: 90vh;
+        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;
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index ec0bad72..15babd2f 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/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>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 4fd6debd..f7c47e98 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -1,109 +1,142 @@
 <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
-        :key="'fieldSubList' + index"
-        v-for="(fieldSubList, index) in fieldList"
-      >
-        <div class="list">
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属网格：</span>
-            <span>{{ gridName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属小区：</span>
-            <span>{{ xiaoquName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属楼宇：</span>
-            <span>{{ louName }}-{{ danyuanName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ homeName }}</span>
-          </div>
-          <div class="item" :key="field.itemId" v-for="field in fieldSubList">
-            <span class="item-field">{{ field.label }}：</span>
-
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
-                info[field.columnName] == null
-                  ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      info[field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              info[field.columnName] == null ? "--" : info[field.columnName]
-            }}</span>
-          </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>更多信息</span>
         </div>
 
-        <div class="line"></div>
-      </div>
-
-      <div class="tabs">
         <div
-          class="tab-btn"
-          @click="subStartGroupIndex"
-          v-if="groupList.length > 9"
+          :key="'fieldSubList' + index"
+          v-for="(fieldSubList, index) in fieldList"
         >
-          <img src="@/assets/img/shuju/people/arrow-double-left.png" />
-        </div>
-        <div
-          v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-          class="tab"
-          :class="groupIndex % groupList.length == index ? 'z-on' : ''"
-          :key="'tab' + index"
-          @click="groupIndex = index"
-          v-for="(item, index) in groupList"
-        >
-          {{ item.label }}
+          <div class="list">
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属网格：</span>
+              <span>{{ gridName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属小区：</span>
+              <span>{{ xiaoquName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属楼宇：</span>
+              <span>{{ louName }}-{{ danyuanName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属家庭：</span>
+              <span>{{ homeName }}</span>
+            </div>
+            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
+              <span class="item-field">{{ field.label }}：</span>
+
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  info[field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
+                info[field.columnName] == null ? "--" : info[field.columnName]
+              }}</span>
+            </div>
+          </div>
+
+          <div class="line"></div>
         </div>
-        <div
-          class="tab-btn"
-          @click="addStartGroupIndex"
-          v-if="groupList.length > 9"
-        >
-          <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+
+        <div class="tabs">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
         </div>
-      </div>
 
-      <div
-        :key="'group' + index"
-        v-show="groupIndex % groupList.length == index"
-        v-for="(group, index) in groupList"
-      >
         <div
-          v-if="
-            group.tableName == 'ic_resi_demand' &&
-            Array.isArray(allInfo.ic_resi_demand) &&
-            allInfo.ic_resi_demand.length > 0
-          "
+          :key="'group' + index"
+          v-show="groupIndex % groupList.length == index"
+          v-for="(group, index) in groupList"
         >
           <div
-            class="list"
-            :key="'ic_resi_demand' + infoIndex"
-            v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            v-if="
+              group.tableName == 'ic_resi_demand' &&
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            "
           >
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
+                <span class="item-field">{{ field.label }}：</span>
+                <span
+                  v-if="
+                    field.itemType == 'select' ||
+                    field.itemType == 'radio' ||
+                    field.itemType == 'checkbox' ||
+                    field.itemType == 'cascader'
+                  "
+                  >{{
+                    infoItem[field.columnName] == null
+                      ? "--"
+                      : getOptionLabel(
+                          field.options,
+                          infoItem[field.columnName],
+                          field.itemType
+                        )
+                  }}</span
+                >
+
+                <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="list" v-else>
             <div
               class="item"
               :key="field.itemId"
@@ -118,52 +151,24 @@
                   field.itemType == 'cascader'
                 "
                 >{{
-                  infoItem[field.columnName] == null
+                  !allInfo[group.tableName] ||
+                  allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
                     : getOptionLabel(
                         field.options,
-                        infoItem[field.columnName],
+                        allInfo[group.tableName][0][field.columnName],
                         field.itemType
                       )
                 }}</span
               >
 
               <span v-else>{{
-                infoItem[field.columnName] == null
-                  ? "--"
-                  : infoItem[field.columnName]
-              }}</span>
-            </div>
-          </div>
-        </div>
-        <div class="list" v-else>
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
-            <span class="item-field">{{ field.label }}：</span>
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
                 !allInfo[group.tableName] ||
                 allInfo[group.tableName][0][field.columnName] == null
                   ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      allInfo[group.tableName][0][field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              !allInfo[group.tableName] ||
-              allInfo[group.tableName][0][field.columnName] == null
-                ? "--"
-                : allInfo[group.tableName][0][field.columnName]
-            }}</span>
+                  : allInfo[group.tableName][0][field.columnName]
+              }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -499,8 +504,4 @@ export default {
 };
 </script>
 
-<style
-  lang="scss"
-  src="@/assets/scss/people-info.scss"
-  scoped
-></style>
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
diff --git a/src/views/modules/shequ/cpts/xuqiu-info.vue b/src/views/modules/shequ/cpts/xuqiu-info.vue
index 2e75d5ae..2c378f73 100644
--- a/src/views/modules/shequ/cpts/xuqiu-info.vue
+++ b/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>

From 1d6195be125f2bf0721c8e115f0625fe5b800ed9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Mar 2022 17:16:42 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/importRecord/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index 191bdc54..f4fe8a58 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/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

From c3b07fb011764305db1e8a6e579bdecaef837615 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Mar 2022 17:33:19 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/dqfwzx/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index f5b5b873..dd5e2388 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -81,6 +81,7 @@
                   @click="handleOrder(scope.$index)"
                   type="text"
                   size="small"
+                  style="color: #1c6afd"
                   >预约</el-button
                 >
 
@@ -88,7 +89,7 @@
                   @click="handleOrderList(scope.$index)"
                   type="text"
                   size="small"
-                  style="margin-right: 10px; color: #00a7a9"
+                  style="margin-right: 10px; color: #1c6afd"
                   >预约记录</el-button
                 >
               </template>
@@ -420,14 +421,14 @@ export default {
           top: 5px;
           right: 5px;
           font-size: 14px;
-          color: rgb(235, 192, 4);
+          color: #00a7a9;
           width: 50px;
           line-height: 30px;
           text-align: center;
           cursor: pointer;
           &:hover {
             // text-decoration: underline;
-            color: rgb(250, 208, 23);
+            color: #00a7a9;
           }
         }
         .item-name {

From 9d08fc75f4524e3d824788dc9300dc349553a7a9 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 17 Mar 2022 08:53:40 +0800
Subject: [PATCH 5/7] dd

---
 src/views/modules/base/resi.vue               |  9 ++-
 .../modules/communityParty/elegant/index.vue  | 68 +++++++++++++++----
 .../communityService/measure/index.vue        |  8 +--
 .../modules/communityService/sqzzz/index.vue  |  8 ++-
 src/views/modules/workSys/demandCate.vue      |  9 +++
 src/views/modules/workSys/resiCate.vue        | 12 +++-
 6 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 63dce11e..b65d924a 100644
--- a/src/views/modules/base/resi.vue
+++ b/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
-        .post(url, params)
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 4422db93..425ff0ad 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -381,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
-        .post(url, params)
+      // app.ajax.exportFilePost(
+      //   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)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var url = window.URL.createObjectURL(blob)
-            var aLink = document.createElement('a')
-            aLink.style.display = 'none'
-            aLink.href = url
-            aLink.setAttribute('download', fileName)
-            document.body.appendChild(aLink)
-            aLink.click()
-            document.body.removeChild(aLink) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
+            this.download(res.data, fileName)
+            // console.log('filename', fileName)
+            // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            // var url = window.URL.createObjectURL(blob)
+            // var aLink = document.createElement('a')
+            // aLink.style.display = 'none'
+            // aLink.href = url
+            // aLink.setAttribute('download', fileName)
+            // document.body.appendChild(aLink)
+            // aLink.click()
+            // document.body.removeChild(aLink) //下载完成移除元素
+            // window.URL.revokeObjectURL(url) //释放掉blob对象
           } else this.$message.error('下载失败')
         })
         .catch(err => {
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 859982f6..90604829 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/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
-              >
+              <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</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
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 5053a856..84fd534f 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -241,8 +241,12 @@ export default {
       
 
       let params = {}
-      await this.$http
-        .post(url, params)
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           // this.download(res.data, title + '.xls')
           if (res.headers["content-disposition"]) {
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 27b50ae2..b7ea8618 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/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>
@@ -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
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 0d150e89..a7b25239 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/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

From 3456b15ab70065fac3621ae2cc513169026df447 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 17 Mar 2022 09:33:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=984?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/search.scss                |  2 +-
 src/views/modules/shequ/cpts/scroll-notice.vue     |  4 ++--
 .../warning/components/screen-table/index.vue      | 14 +++++---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss
index 370c50fe..d6f0a6d1 100644
--- a/src/assets/scss/modules/search.scss
+++ b/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 {
diff --git a/src/views/modules/shequ/cpts/scroll-notice.vue b/src/views/modules/shequ/cpts/scroll-notice.vue
index 6945dacc..ce7495c7 100644
--- a/src/views/modules/shequ/cpts/scroll-notice.vue
+++ b/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%);
     }
   }
 }
diff --git a/src/views/modules/warning/components/screen-table/index.vue b/src/views/modules/warning/components/screen-table/index.vue
index 6f0da3ed..9bb54453 100644
--- a/src/views/modules/warning/components/screen-table/index.vue
+++ b/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 {
-          width: 249px;
-          height: 172px;
-        }
+        font-size: 20px;
+        color: #999999;
+        text-align: center;
       }
     }
   }

From 19d045351e1e063f53a147f974198210daad39bc Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 17 Mar 2022 09:43:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=B1=BB=E5=88=AB=E5=88=86=E6=9E=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/personCategory.scss          | 2 +-
 src/views/modules/visual/basicinfo/personCategory/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss
index ddf1da35..4c578bcd 100644
--- a/src/assets/scss/modules/visual/personCategory.scss
+++ b/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;
diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue
index 8d6607fa..0323e79a 100644
--- a/src/views/modules/visual/basicinfo/personCategory/index.vue
+++ b/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>