m-代码优化样式修改代码整合

src/views/dataReport/components/addedFarmers.vue

@@ -0,0 +1,350 @@
+<template>
+  <el-dialog
+    title="农户管理"
+    :visible.sync="dialogVisible"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @close="handleClose"
+    width="700px"
+  >
+    <el-form
+      ref="baseForm"
+      class="base-form"
+      label-position="right"
+      label-width="95px"
+      :model="baseForm"
+      :rules="rules"
+      size="small"
+    >
+      <el-row>
+        <el-col :span="24" style="background:#F5F7FA;padding-top:20px;margin-bottom:20px;">
+          <el-form-item label="所属区域" prop="productName">
+            <el-row>
+              <el-col :span="24" style="padding-right:5%">
+                <el-select placeholder="请选择区域" style="width:100%">
+                </el-select>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-col>
+            <el-row class="area">
+              <el-col :span="5">
+                <label>总面积：</label>65446亩
+              </el-col>
+              <el-col :span="5">
+                <label>总水权：</label>65446m³
+              </el-col>
+              <el-col :span="7" style="width:27%">
+                <label>亩产水权：</label>65446亩/m³
+              </el-col>
+              <el-col :span="6">
+                <label>剩余水权：</label>65446m³
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="12">
+            <el-form-item label="农户编号" prop="sourceinfoId">
+              <el-row>
+                <el-col>
+                  <el-input
+                    v-model="baseForm.sourceinfoId"
+                    filterable
+                    style="width: 100%"
+                    placeholder="8位数字（不能重复）自动生成"
+                  >
+                  </el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="农户姓名" prop="sourceinfoId">
+                <el-row>
+                  <el-col>
+                    <el-input
+                      v-model="baseForm.sourceinfoId"
+                      filterable
+                      style="width: 100%"
+                      placeholder="8位数字（不能重复）自动生成"
+                    >
+                    </el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="12">
+            <el-form-item label="身份证号" prop="sourceinfoId">
+              <el-row>
+                <el-col>
+                  <el-input
+                    v-model="baseForm.sourceinfoId"
+                    filterable
+                    style="width: 100%"
+                    placeholder="8位数字（不能重复）自动生成"
+                  >
+                  </el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="sourceinfoId">
+                <el-row>
+                  <el-col>
+                    <el-input
+                      v-model="baseForm.sourceinfoId"
+                      filterable
+                      style="width: 100%"
+                      placeholder="8位数字（不能重复）自动生成"
+                    >
+                    </el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="12">
+            <el-form-item label="土地面积" prop="sourceinfoId">
+              <el-row>
+                <el-col style="position:relative">
+                  <el-input
+                    v-model="baseForm.sourceinfoId"
+                    filterable
+                    style="width: 90%"
+                    placeholder="8位数字（不能重复）自动生成"
+                  >
+                  </el-input>
+                  <span style="position:absolute;margin-left:10px">亩</span>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+            <el-col :span="12">
+            <el-form-item label="水权" prop="sourceinfoId">
+              <el-row>
+                <el-col>
+                  <el-input
+                    v-model="baseForm.sourceinfoId"
+                    filterable
+                    style="width: 100%"
+                    placeholder="请输入水权"
+                  >
+                  </el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div style="text-align: right">
+      <el-button type="info" plain @click="resetForm('baseForm')"
+        >取消</el-button
+      >
+      <el-button
+        type="primary"
+        @click="submitForm('baseForm')"
+        :disabled="dialogSubmitLoading"
+        :loading="dialogSubmitLoading"
+        >确定</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { assign } from 'lodash-es';
+import { UPLOAD_TYPE_MAP } from '@/utils/constants';
+export default {
+  name: 'addedFarmers',
+  props: {
+    data: {
+      default() {
+        return {};
+      }
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      imageUploadType: UPLOAD_TYPE_MAP.FARMING_RECORD,
+      dialogSubmitLoading: false,
+      dialogVisible: false,
+      textarea: '',
+      baseForm: {
+        productValue: '',
+        productName: '',
+        stockAmount: '',
+        goodsUnit: '',
+        goodsSpecValue: '',
+        imageArr1: [],
+        supplierId: '',
+        imageArr2: []
+      },
+      productList: [],
+      syinfoList: [],
+      processList: [],
+      hasFetched: false,
+      landList: [], //基地列表
+      rules: {
+        stockAmount: [
+          { required: true, message: '请选择负责人', trigger: 'blur' }
+        ],
+        sourceinfoId: [
+          { required: true, message: '请选择管辖范围', trigger: 'blur' }
+        ],
+        productName: [
+          { required: true, message: '请输入协会名称', trigger: 'blur' }
+        ],
+        supplierId: [
+          { required: false, message: '请输入协会介绍', trigger: 'blur' }
+        ],
+        goodsSpecValue: [
+          { required: true, message: '请选择规格', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  computed: {
+    goodsUnitLable: function () {
+    }
+  },
+  watch: {
+    visible(val) {
+      if (val !== this.dialogVisible) {
+        this.dialogVisible = val;
+        if (val) {
+          assign(this.baseForm, this.data);
+          if (!this.hasFetched) {
+            this.getProductList();
+            this.getSyinfoList();
+            this.getProcessList();
+            this.hasFetched = true;
+          }
+        }
+      }
+    },
+    data: {
+      deep: true,
+      handler(val) {
+        // console.log(val)
+        assign(this.baseForm, val);
+        // console.log(this.baseForm)
+      }
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    getProductList() {
+    },
+    getSyinfoList() {
+    },
+    getProcessList() {
+    },
+    goProductsPage() {
+      this.handleClose();
+      this.$router.push({
+        path: '/Products',
+        query: {}
+      });
+    },
+    goSourceInfoPage() {
+      this.handleClose();
+      this.$router.push({
+        path: '/sourceInfo',
+        query: {
+          type: 'add'
+        }
+      });
+    },
+    goProcessPage() {
+      this.handleClose();
+      this.$router.push({
+        path: '/basicsettings/process',
+        query: {}
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.resetFormData();
+      this.dialogVisible = false;
+    },
+    resetFormData() {
+      this.baseForm = {};
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        console.log(valid)
+      })
+    },
+
+    handleClose() {
+      this.$emit('update:visible', false);
+      this.resetForm('baseForm');
+    },
+    handleSuccess() {
+      this.resetForm('baseForm');
+      this.$emit('update:visible', false);
+      this.$emit('success');
+    },
+    handleKeyUp(target, key) {
+      target[key] = target[key].match(/\d+(\.\d{0,2})?/)
+        ? target[key].match(/\d+(\.\d{0,2})?/)[0]
+        : '';
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.input-number {
+  width: 100%;
+}
+.area{
+  margin:0 0 20px 20px;
+  label{
+    color:#999;
+    font-weight: 400;
+    font-size: 14px;
+  }
+}
+.base-form {
+  max-height: 70vh;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 0 20px;
+}
+.history{
+  text-align: right;
+  line-height: 32px;
+  span{
+    color:rgb(20, 164, 120);
+    cursor: pointer;
+  }
+}
+</style>
+<style lang="css" scoped>
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #ebeef5;
+}
+</style>

src/views/dataReport/components/dataReportLeft.vue

@@ -11,6 +11,7 @@
 </template>
 <script>
   export default {
+    name: 'dataReportLeft',
     data() {
       return {
         data: [{

src/views/dataReport/components/report.vue

@@ -98,7 +98,7 @@ import BTable from '@/components/Table/index.vue';
 import { assign, omit } from 'lodash-es';
 
 export default {
-  name:"waterManage",
+  name:"report",
   props: {
     columns:{
       type: Array,

src/views/dataReport/intakeWaterAnalysis.vue

@@ -2,14 +2,14 @@
   <div>
     <el-row style="height: 100%" v-loading="loading">
       <el-col
-        :span="6"
+        :span="4"
       >
       <el-card style="margin:5%;height: 100%; overflow-y: auto">
         <data-report-left></data-report-left>
       </el-card>
       </el-col>
       <el-col
-        :span="18"
+        :span="20"
         style="padding: 20px; height: 100%"
       >
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -30,11 +30,6 @@
                 >查询</el-button
               > 
             </template>
-            <el-button
-              type="primary"
-              size="small"
-              slot="headerRight"
-            >新增协会</el-button>
           </Report>
         </el-tab-pane>
         <el-tab-pane label="季报表" name="second">
@@ -53,7 +48,6 @@
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from './components/dataReportLeft.vue'
 import Report from './components/report.vue'
-import { assign, omit } from 'lodash-es';
 
 export default {
   name:"waterManage",

src/views/dataReport/saveWaterAnalysis.vue

@@ -92,16 +92,18 @@
         </el-card>
       </el-col>
     </el-row>
+    <added-farmers :visible.sync="associationManageShow"/>
   </div>
 </template>
 
 <script>
 import BTable from '@/components/Table/index.vue';
+import AddedFarmers from './components/addedFarmers.vue'
 import { assign, omit } from 'lodash-es';
 
 export default {
   name:"waterManage",
-  components: { BTable},
+  components: { BTable,AddedFarmers },
   data() {
     return {
       imgUrl: '',

src/views/dataReport/waterConsumption.vue

@@ -2,14 +2,14 @@
   <div>
     <el-row style="height: 100%" v-loading="loading">
       <el-col
-        :span="6"
+        :span="4"
       >
       <el-card style="margin:5%;height: 100%; overflow-y: auto">
         <data-report-left></data-report-left>
       </el-card>
       </el-col>
       <el-col
-        :span="18"
+        :span="20"
         style="padding: 20px; height: 100%"
       >
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -30,11 +30,11 @@
                 >查询</el-button
               > 
             </template>
-            <el-button
+            <!-- <el-button
               type="primary"
               size="small"
               slot="headerRight"
-            >新增协会</el-button>
+            >新增协会</el-button> -->
           </Report>
         </el-tab-pane>
         <el-tab-pane label="季报表" name="second">
@@ -53,7 +53,6 @@
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from './components/dataReportLeft.vue'
 import Report from './components/report.vue'
-import { assign, omit } from 'lodash-es';
 
 export default {
   name:"waterManage",

src/views/gisShow/components/dataReportLeft.vue

@@ -11,6 +11,7 @@
 </template>
 <script>
   export default {
+    name: 'dataReportLeft',
     data() {
       return {
         data: [{

src/views/gisShow/components/echartsGradient.vue

@@ -4,9 +4,9 @@
 
 <script>
 import * as echarts from 'echarts';
-require('echarts/theme/macarons') // echarts theme
 
 export default {
+  name: 'echartsGradient',
   props: {
     className: {
       type: String,

src/views/gisShow/components/mapContainer.vue

@@ -15,6 +15,10 @@ import shuijing from '../assets/shuijing.svg'
       zoom: {
         type: Number,
         default: 16
+      },
+      positions: {
+        type: Array,
+        default: () => []
       }
     },
     data() {
@@ -31,6 +35,12 @@ import shuijing from '../assets/shuijing.svg'
         },
         deep: true,
       },
+      positions: {
+        handler(val){
+          this.initMap()
+        },
+        deep: true
+      }
     },
     methods: {
       initMap() {
@@ -43,14 +53,14 @@ import shuijing from '../assets/shuijing.svg'
         });
         this.map = map
         var layers = [new AMap.TileLayer.Satellite(), new AMap.TileLayer.RoadNet()];
-        const positions = [{
-          lng: 115.857194, 
-          lat: 34.041573
-        },{
-          lng: 115.850, 
-          lat: 34.041573
-        }]
-        positions.forEach(item => {
+        // const positions = [{
+        //   lng: 115.857194, 
+        //   lat: 34.041573
+        // },{
+        //   lng: 115.850, 
+        //   lat: 34.041573
+        // }]
+        this.positions.forEach(item => {
           const { lng, lat } = item
           const icons = new AMap.Icon({
             image: shuijing, //自定义图标路径

src/views/gisShow/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div style="width: 100%;height:100%">
-    <map-container :center="center" :zoom="zoom" @handlerRecomposeShow="recomposeShowHandler"/>
+    <map-container
+      :center="center"
+      :zoom="zoom"
+      @handlerRecomposeShow="recomposeShowHandler"
+      :positions="positions"
+    />
     <div class="left">
       <el-row :getters="20">
         <el-col
@@ -8,10 +13,9 @@
           v-for="item in bottom_left"
           :key="item.title"
           class="item_style"
-          @click="handlerLeft"
         >
           <span :class="item.styleClass"></span>
-          <p>{{item.title}}</p>
+          <p @click="handlerLeft">{{item.title}}</p>
         </el-col>
       </el-row>
     </div>
@@ -27,6 +31,7 @@
   import rightEquipmentVue from './components/rightEquipment.vue';
   import MapContainer from './components/mapContainer.vue'
   export default {
+    name: 'gisShow',
     data() {
       return {
         bottom_left:[{
@@ -49,6 +54,13 @@
         state: {
           keyWord: ""
         },
+        positions: [{
+          lng: 115.857194, 
+          lat: 34.041573
+        },{
+          lng: 115.850, 
+          lat: 34.041573
+        }],
         map: null,
         recomposeShow: false,
         address: '',
@@ -64,7 +76,7 @@
     },
     methods:{
       handlerLeft() {
-
+        this.positions = this.positions.splice(0,1)
       },
       recomposeShowHandler(flag) {
         this.recomposeShow = flag

src/views/gisShow/mixins/resize.js

@@ -1,56 +0,0 @@
-import { debounce } from '@/utils'
-
-export default {
-  data() {
-    return {
-      $_sidebarElm: null,
-      $_resizeHandler: null
-    }
-  },
-  mounted() {
-    this.initListener()
-  },
-  activated() {
-    if (!this.$_resizeHandler) {
-      // avoid duplication init
-      this.initListener()
-    }
-
-    // when keep-alive chart activated, auto resize
-    this.resize()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  },
-  deactivated() {
-    this.destroyListener()
-  },
-  methods: {
-    // use $_ for mixins properties
-    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
-    $_sidebarResizeHandler(e) {
-      if (e.propertyName === 'width') {
-        this.$_resizeHandler()
-      }
-    },
-    initListener() {
-      this.$_resizeHandler = debounce(() => {
-        this.resize()
-      }, 100)
-      window.addEventListener('resize', this.$_resizeHandler)
-
-      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    destroyListener() {
-      window.removeEventListener('resize', this.$_resizeHandler)
-      this.$_resizeHandler = null
-
-      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    resize() {
-      const { chart } = this
-      chart && chart.resize()
-    }
-  }
-}

src/views/home/assets/home.scss

@@ -0,0 +1,71 @@
+::v-deep.el-row{
+  display: flex;
+  justify-content: flex-start;
+  margin-bottom: 20px;
+  .el-col-4{
+    width: 20%;
+  }
+}
+.pie-container{
+  position: relative;
+  width: 100%;
+  height: 100%;
+  .pie-right{
+    position: absolute;
+    top: 33%;
+    left: 60%;
+    .pie-item{
+      margin: 15px 0;
+      color: #333;
+      font-variant-numeric: lining-nums tabular-nums;
+      font-family: Source Han Sans CN VF;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 400;
+      span{
+        &:first-child{
+          display: inline-block;
+          width: 120px;
+          text-align: right;
+        }
+        &:nth-child(2){
+          display: inline-block;
+          width: 100px;
+          text-align: right;
+        }
+      }
+    }
+  }
+}
+.card{
+  width: 100%;
+  display: inline-flex;
+  padding: 18px 24px 18px 24px;
+  align-items: center;
+  border-radius: 4px;
+  background: #F5F7FA;
+  img{
+    margin-right:15px;
+  }
+  .card_content_right{
+    span{
+      color: #999;
+      font-variant-numeric: lining-nums tabular-nums;
+      font-family: Source Han Sans CN VF;
+      font-size: 14px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 22px;
+    }
+    div{
+      color: #333;
+      font-variant-numeric: lining-nums tabular-nums;
+      font-family: Source Han Sans CN VF;
+      font-size: 32px;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 22px;
+      margin-top:16px;
+    }
+  }
+}

src/views/home/components/echartsGradient.vue

@@ -6,6 +6,7 @@
 import * as echarts from 'echarts';
 
 export default {
+  name:'echartsGradient',
   props: {
     className: {
       type: String,
@@ -17,7 +18,7 @@ export default {
     },
     height: {
       type: String,
-      default: '300px'
+      default: '390px'
     }
   },
   data() {

src/views/home/components/echartsPie.vue

@@ -4,11 +4,9 @@
 
 <script>
 import * as echarts from 'echarts';
-require('echarts/theme/macarons') // echarts theme
-import resize from '../mixins/resize'
 
 export default {
-  mixins: [resize],
+  name:'echartsPie',
   props: {
     className: {
       type: String,
@@ -20,7 +18,7 @@ export default {
     },
     height: {
       type: String,
-      default: '300px'
+      default: '390px'
     }
   },
   data() {
@@ -71,7 +69,7 @@ export default {
         series: [
           {
             type: 'pie',
-            radius: ['50%', '70%'],
+            radius: ['40%', '55%'],
             center: ['25%', '50%'],
             label: {
               position: 'center',

src/views/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px">
     <el-card>
       <el-select
         placeholder="区域选择"
@@ -20,7 +20,7 @@
       ></el-option>
       </el-select>
     </el-card>
-    <el-card>
+    <el-card style="margin: 16px 0">
       <el-row :gutter="20"
         v-for="item in list"
         :key="item"
@@ -42,7 +42,7 @@
     <el-row :gutter="20">
       <el-col :span="10">
         <el-card class="pie-container">
-          <echartsPieVue/>
+          <echartsPieVue />
           <div class="pie-right">
             <div class="pie-item">
               <span>额定水量：</span>
@@ -142,75 +142,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep.el-row{
-  display: flex;
-  justify-content: flex-start;
-  margin-bottom: 20px;
-  .el-col-4{
-    width: 20%;
-  }
-}
-.pie-container{
-  position: relative;
-  width: 100%;
-  height: 100%;
-  .pie-right{
-    position: absolute;
-    top: 30%;
-    left: 60%;
-    .pie-item{
-      margin: 10px 0;
-      color: #333;
-      font-variant-numeric: lining-nums tabular-nums;
-      font-family: Source Han Sans CN VF;
-      font-size: 16px;
-      font-style: normal;
-      font-weight: 400;
-      span{
-        &:first-child{
-          display: inline-block;
-          width: 120px;
-          text-align: right;
-        }
-        &:nth-child(2){
-          display: inline-block;
-          width: 100px;
-          text-align: right;
-        }
-      }
-    }
-  }
-}
-.card{
-  width: 100%;
-  display: inline-flex;
-  padding: 18px 24px 18px 24px;
-  align-items: center;
-  border-radius: 4px;
-  background: #F5F7FA;
-  img{
-    margin-right:15px;
-  }
-  .card_content_right{
-    span{
-      color: #999;
-      font-variant-numeric: lining-nums tabular-nums;
-      font-family: Source Han Sans CN VF;
-      font-size: 14px;
-      font-style: normal;
-      font-weight: 400;
-      line-height: 22px;
-    }
-    div{
-      color: #333;
-      font-variant-numeric: lining-nums tabular-nums;
-      font-family: Source Han Sans CN VF;
-      font-size: 32px;
-      font-style: normal;
-      font-weight: 500;
-      line-height: 22px;
-      margin-top:16px;
-    }
-  }
-}
+@import './assets/home.scss'
 </style>

src/views/home/mixins/resize.js

@@ -1,56 +0,0 @@
-import { debounce } from '@/utils'
-
-export default {
-  data() {
-    return {
-      $_sidebarElm: null,
-      $_resizeHandler: null
-    }
-  },
-  mounted() {
-    this.initListener()
-  },
-  activated() {
-    if (!this.$_resizeHandler) {
-      // avoid duplication init
-      this.initListener()
-    }
-
-    // when keep-alive chart activated, auto resize
-    this.resize()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  },
-  deactivated() {
-    this.destroyListener()
-  },
-  methods: {
-    // use $_ for mixins properties
-    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
-    $_sidebarResizeHandler(e) {
-      if (e.propertyName === 'width') {
-        this.$_resizeHandler()
-      }
-    },
-    initListener() {
-      this.$_resizeHandler = debounce(() => {
-        this.resize()
-      }, 100)
-      window.addEventListener('resize', this.$_resizeHandler)
-
-      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    destroyListener() {
-      window.removeEventListener('resize', this.$_resizeHandler)
-      this.$_resizeHandler = null
-
-      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    resize() {
-      const { chart } = this
-      chart && chart.resize()
-    }
-  }
-}

src/views/infrastructure/components/dataReportLeft.vue

@@ -11,6 +11,7 @@
 </template>
 <script>
   export default {
+    name: 'dataReportLeft',
     data() {
       return {
         data: [{

src/views/infrastructure/components/ladderLikeWaterPrice.vue

@@ -0,0 +1,125 @@
+<template>
+  <el-row>
+    <el-col :span="24">
+      <el-form-item
+        v-for="(item,index) in list"
+        :key="item.serial"
+        :label="item.label">
+        <el-row>
+          <el-col :span="24">
+            <el-row>
+              <el-col :span="4">
+                <el-input disabled/>
+              </el-col>
+              <el-col :span="2" style="display: flex;align-items:center">
+                <div class="divider_center"></div>
+              </el-col>
+              <el-col :span="4" style="display:flex;align-items:center">
+                <el-input/>
+              </el-col>
+              <el-col :span="2">
+                <span style="margin:0 10px;">吨</span>
+              </el-col>
+              <el-col :span="8" style="display:flex">
+                <el-input style="width: 50%;margin-right:10px;"/>元/吨
+              </el-col>
+              <el-col :span="2" v-if="item.isCanDelete">
+                <span style="margin: 0 10px;">
+                  <i class="el-icon-delete-solid delete-icon" @click="() => handlerDeleteIcon(index)"></i>
+                </span>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <div class="add" @click="handlerShowThree" v-if="!shouldShowThree">
+        <i class="el-icon-circle-plus-outline add-icon"></i>
+        添加
+      </div>
+    </el-col>
+  </el-row>
+</template>
+<script>
+export default {
+  name: 'ladderLikeWaterPrice',
+  props:[ 'type','list' ],
+  data() {
+    return {
+      shouldShowThree: false,
+    }
+  },
+  methods: {
+    handlerDeleteIcon(index){
+      this.shouldShowThree = false
+      this.list.splice(index,1)
+    },
+    // 关闭第三阶梯
+    handlerHideThree() {
+      this.shouldShowThree = false
+    },
+    // 打开第三阶梯
+    handlerShowThree() {
+      this.$emit("addShow",this.type)
+      // this.list.push({
+      //   serial:3,
+      //   label: '第3阶梯水价',
+      //   isCanDelete: true,
+      //   isShow: true
+      // })
+      this.shouldShowThree = true
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item__label{
+  text-align: left !important;
+}
+::v-deep .el-tooltip__popper.is-dark {
+	background: #eeeeee;
+}
+
+::v-deep .el-popper.is-customized .el-popper__arrow::before {
+	background: #eeeeee;
+}
+.add{
+  width: 100%;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  border-radius: 4px;
+  border: 1px solid #14A478;
+  color:#14A478;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  cursor: pointer;
+  .add-icon{
+    font-size: 16px;
+    margin-right:2px;
+  }
+}
+.delete-icon{
+  font-size: 24px;
+  color:#FF5951;
+  margin-top:5px;
+  cursor: pointer;
+}
+h3{
+  color: #303133;
+  font-family: Source Han Sans CN VF;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 24px;
+}
+.divider_center{
+  width:100%;
+  height: 1px;
+  margin-top:16px;
+  margin: 16px 15px 0 15px;
+  background: #DCDFE6;
+}
+</style>

src/views/infrastructure/components/recompose.vue

@@ -88,6 +88,7 @@
 <script>
 import { assign } from 'lodash-es';
 export default {
+  name: 'recompose',
   props: {
     data: {
       default() {

src/views/infrastructure/components/setAnnualWaterRight.vue

@@ -19,18 +19,17 @@
       ref="baseForm"
       class="base-form"
       label-position="right"
-      label-width="125px"
+      label-width="100px"
       :model="baseForm"
       :rules="rules"
       size="small"
     >
     <el-row>
       <el-col :span="24">
-        <el-form-item label="所属区域：">
+        <el-form-item label="所属区域">
           <el-row>
             <el-col :span="24">
               <el-select style="width: 100%" placeholder="请选择您的行政区">
-
               </el-select>
             </el-col>
           </el-row>
@@ -40,125 +39,59 @@
     <el-row>
       <h3>水价</h3>
       <el-col :span="24">
-        <el-form-item label="水价计费方式：">
+        <el-form-item label="水价计费方式">
           <el-row>
-            <el-col :span="24">
-              <el-radio v-model="radio" label="1">备选项</el-radio>
-              <el-radio v-model="radio" label="2">备选项</el-radio>
-            </el-col>
-          </el-row>
-        </el-form-item>
-        <el-form-item label="第1阶梯水价：">
-          <el-row>
-            <el-col :span="24">
-              <el-row>
-                <el-col :span="4">
-                  <el-input disabled/>
-                </el-col>
-                <el-col :span="2" style="display: flex;align-items:center">
-                  <div class="divider_center"></div>
-                </el-col>
-                <el-col :span="4" style="display:flex;align-items:center">
-                  <el-input/>
-                </el-col>
-                <el-col :span="2">
-                  <span style="margin:0 10px;">吨</span>
-                </el-col>
-                <el-col :span="8" style="display:flex">
-                  <el-input style="width: 50%;margin-right:10px;"/>元/吨
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-form-item>
-        <el-form-item label="第2阶梯水价：">
-          <el-row>
-            <el-col :span="24">
-              <el-row>
-                <el-col :span="4">
-                  <el-input disabled/>
-                </el-col>
-                <el-col :span="2" style="display: flex;align-items:center">
-                  <div class="divider_center"></div>
-                </el-col>
-                <el-col :span="4" style="display:flex;align-items:center">
-                  <el-input/>
-                </el-col>
-                <el-col :span="2">
-                  <span style="margin:0 10px;">吨</span>
-                </el-col>
-                <el-col :span="8" style="display:flex">
-                  <el-input style="width: 50%;margin-right:10px;"/>元/吨
-                </el-col>
-                <el-col :span="2" v-if="!shouldShowThree">
-                  <span style="margin: 0 10px;">
-                    <i class="el-icon-delete-solid delete-icon"></i>
-                  </span>
-                </el-col>
-              </el-row>
+            <el-col :span="18">
+              <el-radio v-model="constantWaterPrice" label="1">恒定水价</el-radio>
+              <el-radio v-model="constantWaterPrice" label="2">阶梯水价</el-radio>
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="第3阶梯水价：" v-if="shouldShowThree">
+        <el-form-item label="水价" v-if="constantWaterPrice == 1">
           <el-row>
-            <el-col :span="24">
-              <el-row>
-                <el-col :span="4">
-                  <el-input disabled/>
-                </el-col>
-                <el-col :span="2" style="display: flex;align-items:center">
-                  <div class="divider_center"></div>
-                </el-col>
-                <el-col :span="4" style="display:flex;align-items:center">
-                  <el-input/>
-                </el-col>
-                <el-col :span="2">
-                  <span style="margin:0 10px;">吨</span>
-                </el-col>
-                <el-col :span="8" style="display:flex">
-                  <el-input style="width: 50%;margin-right:10px;"/>元/吨
-                </el-col>
-                <el-col :span="2">
-                  <span style="margin: 0 10px;">
-                    <i class="el-icon-delete-solid delete-icon" @click="deleteIcon"></i>
-                  </span>
-                </el-col>
-              </el-row>
+            <el-col :span="18">
+              <el-input style="width: 50%" />
             </el-col>
           </el-row>
         </el-form-item>
-        <div class="add" @click="handlerShowThree" v-if="!shouldShowThree">
-          <i class="el-icon-circle-plus-outline add-icon"></i>
-          添加
-        </div>
+        <ladderLikeWaterPrice
+          v-else
+          :type="'water'"
+          @addShow="addShowHandler"
+          :list="waterlist"
+        />
       </el-col>
     </el-row>
-    
     <el-row>
       <h3>电价</h3>
       <el-col :span="24">
-        <el-form-item label="电价计费方式：">
+        <el-form-item label="电价计费方式">
           <el-row>
             <el-col :span="18">
-              <el-radio v-model="radio" label="1">备选项</el-radio>
-              <el-radio v-model="radio" label="2">备选项</el-radio>
+              <el-radio v-model="ladderLikeWaterPrice" label="1">恒定电价</el-radio>
+              <el-radio v-model="ladderLikeWaterPrice" label="2">阶梯电价</el-radio>
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="电价（元/度）：">
+        <el-form-item label="电价" v-if="ladderLikeWaterPrice == 1">
           <el-row>
             <el-col :span="18">
-              <el-input style="width: 100%">
-
-              </el-input>
+              <el-input style="width: 50%" />
+              <span style="display:inline-block;margin-left:5px">元/度</span>
             </el-col>
           </el-row>
         </el-form-item>
+        <ladderLikeWaterPrice 
+          v-else
+          :type="'electricity'"
+          @addShow="addShowHandler"
+          :list="electricitylist"
+        />
       </el-col>
     </el-row>
     </el-form>
 
-    <div style="text-align: right">
+    <div style="text-align: right;margin-top: 20px;">
       <el-button type="info" plain @click="resetForm('baseForm')"
         >取消</el-button
       >
@@ -175,6 +108,7 @@
 
 <script>
 import { assign } from 'lodash-es';
+import ladderLikeWaterPrice from './ladderLikeWaterPrice.vue'
 export default {
   name: 'setAnnualWaterRight',
   props: {
@@ -188,20 +122,38 @@ export default {
       default: false
     }
   },
+  components: {
+    ladderLikeWaterPrice
+  },
   data() {
     return {
-      shouldShowThree: false,
       dialogSubmitLoading: false,
+      waterlist: [{
+        serial:1,
+        label: '第1阶梯水价',
+        isCanDelete: false,
+      },{
+        serial:2,
+        label: '第2阶梯水价',
+        isCanDelete: false,
+      }],
+      electricitylist: [{
+        serial:1,
+        label: '第1阶梯电价',
+        isCanDelete: false,
+      },{
+        serial:2,
+        label: '第2阶梯电价',
+        isCanDelete: false,
+      }],
+      constantWaterPrice:'2',
+      ladderLikeWaterPrice:'1',
       dialogVisible: false,
       baseForm: {
-        productValue: '',
         productName: '',
         stockAmount: '',
-        goodsUnit: '',
         goodsSpecValue: '',
-        imageArr1: [],
         supplierId: '',
-        imageArr2: []
       },
       hasFetched: false,
       rules: {
@@ -243,16 +195,22 @@ export default {
     }
   },
   methods: {
-    deleteIcon(){
-      this.shouldShowThree = false
-    },
-    // 关闭第三阶梯
-    handlerHideThree() {
-      this.shouldShowThree = false
-    },
-    // 打开第三阶梯
-    handlerShowThree() {
-      this.shouldShowThree = true
+    addShowHandler(type) {
+      if(type === 'water') {
+        this.waterlist.push({
+          serial:3,
+          label: '第3阶梯水价',
+          isCanDelete: true,
+          isShow: true
+        })
+      }else {
+        this.electricitylist.push({
+          serial:3,
+          label: '第3阶梯电价',
+          isCanDelete: true,
+          isShow: true
+        })
+      }
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
@@ -267,7 +225,6 @@ export default {
         console.log(valid)
       })
     },
-
     handleClose() {
       this.$emit('update:visible', false);
       this.resetForm('baseForm');
@@ -278,42 +235,9 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label{
-  text-align: left !important;
-}
-::v-deep .el-tooltip__popper.is-dark {
-	background: #eeeeee;
+  text-align: right !important;
 }
 
-::v-deep .el-popper.is-customized .el-popper__arrow::before {
-	background: #eeeeee;
-}
-.add{
-  width: 100%;
-  height: 32px;
-  line-height: 32px;
-  text-align: center;
-  border-radius: 4px;
-  border: 1px solid #14A478;
-  color:#14A478;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 14px;
-  cursor: pointer;
-  .add-icon{
-    font-size: 16px;
-    margin-right:2px;
-  }
-}
-.delete-icon{
-  font-size: 24px;
-  color:#FF5951;
-  margin-top:5px;
-  cursor: pointer;
-}
-.input-number {
-  width: 100%;
-}
 .item_tooltip{
   position: absolute;
   top: 25px;
@@ -328,13 +252,6 @@ h3{
   font-weight: 700;
   line-height: 24px;
 }
-.divider_center{
-  width:100%;
-  height: 1px;
-  margin-top:16px;
-  margin: 16px 15px 0 15px;
-  background: #DCDFE6;
-}
 .base-form {
   max-height: 70vh;
   overflow-y: auto;
@@ -347,3 +264,15 @@ h3{
   border-bottom: 1px solid #ebeef5;
 }
 </style>
+<style>
+.el-tooltip__popper.is-dark {
+	background: rgba(0,0,0,0.5);
+}
+
+.el-tooltip__popper[x-placement^=right] .popper__arrow{
+  border-right-color:#888;
+}
+.el-tooltip__popper[x-placement^=right] .popper__arrow::after{
+  border-right-color:#888;
+}
+</style>

src/views/infrastructure/components/setPreferenc.vue

@@ -78,6 +78,7 @@
 <script>
 import { assign } from 'lodash-es';
 export default {
+  name: 'setPreferenc',
   props: {
     data: {
       default() {

src/views/infrastructure/deviceSetup.vue

@@ -109,6 +109,7 @@ import setPreferencs from './components/setPreferenc.vue'
 import { assign, omit } from 'lodash-es';
 
 export default {
+  name: 'deviceSetup',
   components: { BTable,DataReportLeft,setPreferencs },
   data() {
     return {

src/views/infrastructure/waterElectricityPriceSetting.vue

@@ -8,7 +8,6 @@
         <el-card style="height: 100%; overflow-y: auto">
           <el-col :span="24" class="elrow-main__col-top">
             <div>
-              
               <el-select
                 placeholder="行政区域（全国）"
               >
@@ -25,14 +24,14 @@
                 >查询</el-button
               >
             </div>
-            <div class="top-left">
+            <!-- <div class="top-left">
               <el-button
                 type="primary"
                 size="small"
                 @click="addAssociation"
                 >新增
                 </el-button
-              ></div>
+            ></div> -->
           </el-col>
           <el-col :span="24" class="elrow-main__col-bottom">
             <img v-if="imgUrl" :src="imgUrl" />
@@ -75,7 +74,7 @@
                   :underline="false"
                   type="primary"
                   style="margin-right: 10px"
-                  @click="download(scope.row)"
+                  @click="editAssociation(scope.row)"
                   >修改</el-link
                 >
                 <el-link
@@ -102,6 +101,7 @@ import { assign, omit } from 'lodash-es';
 import setAnnualWaterRight from './components/setAnnualWaterRight.vue'
 
 export default {
+  name: 'waterElectricityPriceSetting',
   components: { BTable,setAnnualWaterRight },
   data() {
     return {
@@ -173,7 +173,7 @@ export default {
   },
   created() {},
   methods: {
-    addAssociation() {
+    editAssociation() {
       this.associationManageShow = true
     },
     loadData(parameter) {

src/views/infrastructure/waterEstablishment.vue

@@ -101,6 +101,7 @@ import recompose from './components/recompose.vue'
 import { assign, omit } from 'lodash-es';
 
 export default {
+  name: 'waterEstablishment',
   components: { BTable,setAnnualWaterRight, recompose,waterPriceSetting },
   data() {
     return {

src/views/monitoringMamage/components/IrrigationRecord.vue

@@ -83,6 +83,7 @@ import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 import LeftImg from '../assets/img.svg'
 import BTable from '@/components/Table'
 export default {
+  name: 'IrrigationRecord',
   props: {
     data: {
       default() {

src/views/monitoringMamage/components/dataReportLeft.vue

@@ -11,6 +11,7 @@
 </template>
 <script>
   export default {
+   name: 'dataReportLeft',
     data() {
       return {
         data: [{

src/views/monitoringMamage/components/echartsPie.vue

@@ -6,6 +6,7 @@
 import * as echarts from 'echarts';
 
 export default {
+  name: 'echartsPie',
   props: {
     className: {
       type: String,

src/views/monitoringMamage/components/realTimeMonitor.vue

@@ -125,6 +125,7 @@ import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 import LeftImg from '../assets/img.svg'
 import BTable from '@/components/Table'
 export default {
+  name: 'realTimeMonitor',
   props: {
     data: {
       default() {

src/views/monitoringMamage/index.vue

@@ -175,6 +175,7 @@ import IrrigationRecord from './components/IrrigationRecord.vue';
 import { assign, omit } from 'lodash-es';
 
 export default {
+  name: 'monitoringMamage',
   components: { BTable,DataReportLeft,EchartsPie,realTimeMonitor,IrrigationRecord },
   data() {
     return {

src/views/peasantHouseholdManage/components/IrrigationRecord.vue

@@ -83,6 +83,7 @@ import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 import LeftImg from '../assets/img.svg'
 import BTable from '@/components/Table'
 export default {
+  name: 'IrrigationRecord',
   props: {
     data: {
       default() {

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -17,10 +17,10 @@
       size="small"
     >
       <el-row>
-        <el-col :span="24">
+        <el-col :span="24" style="background:#F5F7FA;padding-top:20px;margin-bottom:20px;">
           <el-form-item label="所属区域" prop="productName">
             <el-row>
-              <el-col :span="24">
+              <el-col :span="24" style="padding-right:5%">
                 <el-select placeholder="请选择区域" style="width:100%">
                 </el-select>
               </el-col>
@@ -28,13 +28,13 @@
           </el-form-item>
           <el-col>
             <el-row class="area">
-              <el-col :span="6">
+              <el-col :span="5">
                 <label>总面积：</label>65446亩
               </el-col>
-              <el-col :span="6">
+              <el-col :span="5">
                 <label>总水权：</label>65446m³
               </el-col>
-              <el-col :span="6">
+              <el-col :span="7" style="width:27%">
                 <label>亩产水权：</label>65446亩/m³
               </el-col>
               <el-col :span="6">
@@ -172,6 +172,7 @@
 import { assign } from 'lodash-es';
 import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 export default {
+  name: 'addedFarmers',
   props: {
     data: {
       default() {
@@ -234,9 +235,6 @@ export default {
         if (val) {
           assign(this.baseForm, this.data);
           if (!this.hasFetched) {
-            this.getProductList();
-            this.getSyinfoList();
-            this.getProcessList();
             this.hasFetched = true;
           }
         }
@@ -245,44 +243,11 @@ export default {
     data: {
       deep: true,
       handler(val) {
-        // console.log(val)
         assign(this.baseForm, val);
-        // console.log(this.baseForm)
       }
     }
   },
-  created() {},
-  mounted() {},
   methods: {
-    getProductList() {
-    },
-    getSyinfoList() {
-    },
-    getProcessList() {
-    },
-    goProductsPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/Products',
-        query: {}
-      });
-    },
-    goSourceInfoPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/sourceInfo',
-        query: {
-          type: 'add'
-        }
-      });
-    },
-    goProcessPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/basicsettings/process',
-        query: {}
-      });
-    },
     resetForm(formName) {
       this.$refs[formName].resetFields();
       this.resetFormData();
@@ -296,21 +261,10 @@ export default {
         console.log(valid)
       })
     },
-
     handleClose() {
       this.$emit('update:visible', false);
       this.resetForm('baseForm');
     },
-    handleSuccess() {
-      this.resetForm('baseForm');
-      this.$emit('update:visible', false);
-      this.$emit('success');
-    },
-    handleKeyUp(target, key) {
-      target[key] = target[key].match(/\d+(\.\d{0,2})?/)
-        ? target[key].match(/\d+(\.\d{0,2})?/)[0]
-        : '';
-    }
   }
 };
 </script>

src/views/peasantHouseholdManage/components/dataReportLeft.vue

@@ -11,6 +11,7 @@
 </template>
 <script>
   export default {
+    name: 'dataReportLeft',
     data() {
       return {
         data: [{

src/views/peasantHouseholdManage/components/farmerManagement.vue

@@ -209,6 +209,7 @@ import BTable from '@/components/Table/index.vue';
 import { assign, omit } from 'lodash-es';
 import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 export default {
+  name: 'farmerManagement',
   props: {
     data: {
       default() {

src/views/peasantHouseholdManage/components/report.vue

@@ -96,7 +96,7 @@ import BTable from '@/components/Table/index.vue';
 import { assign, omit } from 'lodash-es';
 
 export default {
-  name:"waterManage",
+  name:"report",
   components: { BTable},
   data() {
     return {

src/views/peasantHouseholdManage/index.vue

@@ -131,6 +131,7 @@ import FarmerManagement from './components/farmerManagement.vue';
 import IrrigationRecord from './components/IrrigationRecord.vue';
 
 export default {
+  name: 'peasantHouseholdManage',
   components: { BTable,DataReportLeft,AddedFarmers,FarmerManagement,IrrigationRecord },
   data() {
     return {

src/views/waterCardManage/components/addedICCard.vue

@@ -1,11 +1,11 @@
 <template>
   <el-dialog
-    title="协会管理"
+    title="IC卡信息"
     :visible.sync="dialogVisible"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     @close="handleClose"
-    width="1200px"
+    width="660px"
   >
     <el-form
       ref="baseForm"
@@ -20,7 +20,7 @@
         <el-col :span="24">
           <el-form-item label="用户名：" prop="productName">
             <el-row :gutter="5">
-              <el-col :span="18">
+              <el-col :span="23">
                 <el-input
                   placeholder="请输入用户名"
                   v-model="textarea">
@@ -33,7 +33,7 @@
         <el-col :span="24">
           <el-form-item label="用户名：" prop="sourceinfoId">
             <el-row :gutter="5">
-              <el-col :span="18">
+              <el-col :span="23">
                 <el-input
                   disabled
                   v-model="baseForm.sourceinfoId"
@@ -52,7 +52,7 @@
         <el-col :span="24">
           <el-form-item label="IC卡号：" prop="stockAmount">
             <el-row :gutter="5">
-              <el-col :span="18">
+              <el-col :span="23">
                 <el-select
                   v-model="baseForm.sourceinfoId"
                   filterable
@@ -77,7 +77,7 @@
         <el-col :span="24">
           <el-form-item label="卡类状态：" prop="supplierId">
             <el-row :gutter="5">
-              <el-col :span="18">
+              <el-col :span="23">
                 <el-select
                   v-model="baseForm.sourceinfoId"
                   filterable
@@ -101,7 +101,7 @@
         <el-col :span="24">
           <el-form-item label="余额：" prop="supplierId">
             <el-row :gutter="5">
-              <el-col :span="18">
+              <el-col :span="23">
                 <el-input
                   disabled
                   v-model="textarea">
@@ -132,6 +132,7 @@
 import { assign } from 'lodash-es';
 import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 export default {
+  name: 'addedICCard',
   props: {
     data: {
       default() {

src/views/waterCardManage/components/dataDetail.vue

@@ -127,6 +127,7 @@ import BTable from '@/components/Table/index.vue';
 import { assign } from 'lodash-es';
 import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 export default {
+  name: 'dataDetail',
   props: {
     data: {
       default() {

src/views/waterCardManage/components/dataReportLeft.vue

@@ -11,6 +11,7 @@
 </template>
 <script>
   export default {
+    name: 'dataReportLeft',
     data() {
       return {
         data: [{

src/views/waterCardManage/components/rechargeCard.vue

@@ -140,6 +140,7 @@ import weixinAction from '../assets/weixin_action.svg'
 import zhifubao from '../assets/zhifubao.svg'
 import weixinRightBottom from '../assets/weixin_right_bottom.svg'
 export default {
+  name: 'rechargeCard',
   props: {
     data: {
       default() {

src/views/waterCardManage/components/report.vue

@@ -96,7 +96,7 @@ import BTable from '@/components/Table/index.vue';
 import { assign, omit } from 'lodash-es';
 
 export default {
-  name:"waterManage",
+  name:"report",
   components: { BTable},
   data() {
     return {

src/views/waterCardManage/index.vue

@@ -149,6 +149,7 @@ import RechargeCard from './components/rechargeCard.vue';
 import DataDetail from './components/dataDetail.vue';
 
 export default {
+  name: 'waterCardManage',
   components: { BTable,DataReportLeft,AddedICCard,RechargeCard,DataDetail, DataDetail },
   data() {
     return {

src/views/waterManage/component/associationManage.vue

@@ -49,14 +49,17 @@
                   >
                   </el-option>
                 </el-select>
-                <el-input
-                  type="textarea"
-                  style="margin-top:10px"
-                  :autosize="{ minRows: 2}"
-                  placeholder="请选择管辖范围"
-                  disabled
-                  v-model="textarea">
-                </el-input>
+                <div class="areatText" type="">
+                  <el-tag closable>
+                    标签一
+                  </el-tag>
+                  <el-tag closable>
+                    标签一
+                  </el-tag>
+                  <el-tag closable>
+                    标签一
+                  </el-tag>
+                </div>
               </el-col>
             </el-row>
           </el-form-item>
@@ -98,8 +101,7 @@
                   placeholder="请输入协会介绍"
                   maxlength="500"
                   show-word-limit
-                  v-model="textarea">
-                </el-input>
+                  v-model="textarea" />
               </el-col>
             </el-row>
           </el-form-item>
@@ -126,6 +128,7 @@
 import { assign } from 'lodash-es';
 import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 export default {
+  name:'associationManage',
   props: {
     data: {
       default() {
@@ -142,6 +145,7 @@ export default {
       imageUploadType: UPLOAD_TYPE_MAP.FARMING_RECORD,
       dialogSubmitLoading: false,
       dialogVisible: false,
+      textareaArea: '',
       baseForm: {
         productValue: '',
         productName: '',
@@ -176,10 +180,6 @@ export default {
       }
     };
   },
-  computed: {
-    goodsUnitLable: function () {
-    }
-  },
   watch: {
     visible(val) {
       if (val !== this.dialogVisible) {
@@ -187,9 +187,6 @@ export default {
         if (val) {
           assign(this.baseForm, this.data);
           if (!this.hasFetched) {
-            this.getProductList();
-            this.getSyinfoList();
-            this.getProcessList();
             this.hasFetched = true;
           }
         }
@@ -198,44 +195,11 @@ export default {
     data: {
       deep: true,
       handler(val) {
-        // console.log(val)
         assign(this.baseForm, val);
-        // console.log(this.baseForm)
       }
     }
   },
-  created() {},
-  mounted() {},
   methods: {
-    getProductList() {
-    },
-    getSyinfoList() {
-    },
-    getProcessList() {
-    },
-    goProductsPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/Products',
-        query: {}
-      });
-    },
-    goSourceInfoPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/sourceInfo',
-        query: {
-          type: 'add'
-        }
-      });
-    },
-    goProcessPage() {
-      this.handleClose();
-      this.$router.push({
-        path: '/basicsettings/process',
-        query: {}
-      });
-    },
     resetForm(formName) {
       this.$refs[formName].resetFields();
       this.resetFormData();
@@ -254,21 +218,21 @@ export default {
       this.$emit('update:visible', false);
       this.resetForm('baseForm');
     },
-    handleSuccess() {
-      this.resetForm('baseForm');
-      this.$emit('update:visible', false);
-      this.$emit('success');
-    },
-    handleKeyUp(target, key) {
-      target[key] = target[key].match(/\d+(\.\d{0,2})?/)
-        ? target[key].match(/\d+(\.\d{0,2})?/)[0]
-        : '';
-    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-tag{
+  margin-right: 5px;
+}
+.areatText{
+  width: 100%;
+  height: 100px;
+  border:1px solid #DCDFE6;
+  margin-top: 10px;
+  padding:2% 3%;
+}
 .input-number {
   width: 100%;
 }

src/views/waterMarket/component/waterDeal.vue

@@ -82,6 +82,7 @@
 <script>
 import { assign } from 'lodash-es';
 export default {
+  name:'waterDeal',
   props: {
     data: {
       default() {

src/views/waterMarket/index.vue

@@ -110,6 +110,7 @@ import { assign, omit } from 'lodash-es';
 import WaterDeal from './component/waterDeal.vue'
 
 export default {
+  name:'waterMarket',
   components: { BTable,WaterDeal},
   data() {
     return {
@@ -155,11 +156,6 @@ export default {
           prop: 'phone',
           customRender: '',
           align: 'center'
-        },
-        {
-          label: '操作',
-          customRender: 'operate',
-          align: 'center'
         }
       ]
     };

src/views/waterSubsidy/components/newPolicy.vue

@@ -69,6 +69,7 @@
 import { assign } from 'lodash-es';
 import { UPLOAD_TYPE_MAP } from '@/utils/constants';
 export default {
+  name:'newPolicy',
   props: {
     data: {
       default() {

src/views/waterSubsidy/index.vue

@@ -96,6 +96,7 @@ import newPolicy from './components/newPolicy.vue'
 import { assign, omit } from 'lodash-es';
 
 export default {
+  name:'waterSubsidy',
   components: { BTable,newPolicy },
   data() {
     return {