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

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

@@ -355,7 +355,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
-              @blur="handelBlurServiceTime"
+              @change="handelBlurServiceTime"
               >
             </el-date-picker>
           </el-form-item>
@@ -375,6 +375,7 @@
       <div class="resi-btns">
         <el-button size="small" @click="handlerCancle">取消</el-button>
         <el-button
+          v-if="!disabled"
           type="primary"
           size="small"
           :loading="btnLoading"
@@ -686,9 +687,9 @@ export default {
     },
     handelBlurServiceTime(val) {
       console.log('val', val)
-      if (val.value.length > 0) {
-        this.form.serviceStartTime = val.value[0]
-        this.form.serviceEndTime = val.value[1]
+      if (val.length > 0) {
+        this.form.serviceStartTime = val[0]
+        this.form.serviceEndTime = val[1]
       }
       
     },

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

@@ -156,6 +156,7 @@ export default {
         // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
       ],
       noInit: false,
+      noEduInit: false,
       selectAgency: null,
       ageTotalCount: 0,
       eduTotalCount: 0,
@@ -533,13 +534,13 @@ export default {
       this.pieEduOptions.series[1].data = this.eduItem
       // this.$refs.pieChart.hideLoading()
       this.$refs.eduChart.setOption(this.pieEduOptions)
-      if (this.noInit) {
+      if (this.noEduInit) {
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
 
         this.getEduList(_arr[0], orgType, _code)
       }
-      this.noInit = true
+      this.noEduInit = true
       
 
     },

src/views/modules/visual/measure/service.vue

@@ -323,7 +323,7 @@ export default {
             stack: 'total',
             // barWidth: 20,
             label: {
-              show: true
+              show: false
             },
             emphasis: {
               focus: 'series'