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

src/views/components/editResi.vue

@@ -19,7 +19,7 @@
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
                   <el-select v-model.trim="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
-                  clearable class="resi-cell-select"
+                  clearable class="resi-cell-select" @change="handleChangeGrid"
                   >
                     <el-option
                       v-for="item in optionsG"
@@ -36,7 +36,7 @@
               <el-form-item prop="VILLAGE_ID" label="所属小区" required>
                 <div class="resi-cell-value">
                   <el-select v-model.trim="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
-                  clearable class="resi-cell-select"
+                  clearable class="resi-cell-select" @change="handleChangeV"
                   >
                     <el-option
                       v-for="item in optionsV"

src/views/components/resiForm.vue

@@ -330,13 +330,15 @@ export default {
     }
     let initForm = (obj, arr) => {
       let _form = {}
-      // console.log('formInfo', obj)
+      console.log('formInfo---arr', arr)
       if (Object.keys(obj).length > 0) {
         _form = { ...obj }
         return _form
       }
       arr.forEach(item => {
+
         if (item.multiSelect) _form[item.columnName] = []
+        else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
         else _form[item.columnName] = ''
 
         // if (item.optionSourceType === 'remote') {
@@ -371,7 +373,12 @@ export default {
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
-    let tempFormList = [ ...this.formList ]
+    let tempFormList = [ ...this.formList ].map(item => {
+      return {
+        ...item,
+        isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false
+      }
+    })
     let constForm = {
       ...form,
       GRID_ID: '',

src/views/modules/visual/cpts/analyse.vue

@@ -83,7 +83,7 @@
 
         <div class="analys-col analys-col-wr analys-col-more list-wr"
              id="scroll-wr">
-          <div class="cate-list cate-list-child">
+          <div class="cate-list cate-list-child" :style="'padding-top:' + computedPd(tempList)">
             <div v-for="(item, index) in tempList"
                  :key="index"
                  class="cate-row">
@@ -275,12 +275,19 @@ export default {
       }
       return statusObj[status]
     },
+    computedPd(list) {
+      if (this.sourceTab == 'group') return '60px'
+      if (list.length == 1) return '330px'
+      else if (list.length == 2) return '240px'
+      else return '60px'
+    },
     handleTabs (type) {
       if (type === 'group') this.tempList = [...this.singleList]
       else if (type === 'event') this.tempList = [...this.moreList]
       this.sourceTab = type
       const _dom = document.getElementById('scroll-wr')
       _dom.scrollTop = 0
+      this.computedPd(this.tempList)
     },
     handleProject (item) {
       this.$emit('project', item)