Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

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

@@ -426,6 +426,7 @@ export default {
     },
     resetForm(formName) {
       this.$refs[formName].resetFields()
+      this.handleSearch()
     },
     handleAdd() {
       this.dialogVisible = true

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

@@ -637,12 +637,13 @@ export default {
       this.searchForm.reportStartTime = ''
       this.searchForm.reportEndTime = ''
       this.searchForm.wantServiceStartTime = ''
-      this.searchForm.wantServiceTime = ''
+      this.searchForm.wantServiceEndTime = ''
       this.searchForm.categoryCode = ''
       this.searchForm.level = ''
       this.reportTime = ''
       this.serviceTime = ''
       this.$refs[formName].resetFields()
+      this.handleSearch()
     },
     handleCateCHange(val) {
       console.log('val', val)

src/views/modules/visual/communityParty/community.vue

@@ -10,7 +10,9 @@
       <div class="second-title">
         <div class="second-title-label">党建单位分类统计</div>
         <div class="second-select">
-          <el-select v-model="serviceMatter" clearable placeholder="请选择" @change="handleSelectChange">
+          <el-select v-model="serviceMatter" clearable placeholder="请选择" 
+          @change="handleSelectChange"
+          @clear="handleSelectChange">
             <el-option
               v-for="item in unitList"
               :key="item.value"
@@ -28,7 +30,8 @@
             end-placeholder="结束日期"
             prefix-icon="el-icon-caret-bottom"
             value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleSelectChange">
+            @change="handleSelectChange"
+            @clear="handleSelectChange">
           </el-date-picker>
         </div>
       </div>
@@ -203,7 +206,7 @@ export default {
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
 
       let params = {
-        parentCategoryCode: ''
+        parentCategoryCode: '1010'
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -295,7 +298,7 @@ export default {
   .second-select {
     margin: 0 10px 0 40px;
     ::v-deep .el-input {
-      width: 120px;
+      width: 180px;
       height: 36px;
       .el-input__inner {
         height: 100%;

src/views/modules/workSys/demandCate.vue

@@ -428,10 +428,20 @@ export default {
 
 <style lang="scss" scoped>
 .resi-container .resi-card-table {
-  ::v-deep .el-table th {
+  ::v-deep .el-table {
-    color: #fff;
+    th  {
-    background-color: rgba(33, 149, 254, 1);
+      color: #fff;
-    // border-right: 1px solid rgba(33, 149, 254, 1);
+      background-color: rgba(33, 149, 254, 1);
+    }
+    
+    .cell {
+      
+      span:nth-of-type(3) {
+        display: inline-block;
+        width: 90%;
+        word-break: break-all;
+      }
+    }
   }
 }
 .resi-table {