沼气

package-lock.json

@@ -2590,6 +2590,14 @@
       "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=",
       "dev": true
     },
+    "axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
     "babel-eslint": {
       "version": "10.1.0",
       "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-10.1.0.tgz?cache=0&sync_timestamp=1611946213770&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-eslint%2Fdownload%2Fbabel-eslint-10.1.0.tgz",
@@ -5816,8 +5824,7 @@
     "follow-redirects": {
       "version": "1.14.1",
       "resolved": "https://registry.nlark.com/follow-redirects/download/follow-redirects-1.14.1.tgz?cache=0&sync_timestamp=1620555246888&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.14.1.tgz",
-      "integrity": "sha1-2RFN7Qoc/dM04WTmZirQK/2R/0M=",
-      "dev": true
+      "integrity": "sha1-2RFN7Qoc/dM04WTmZirQK/2R/0M="
     },
     "for-in": {
       "version": "1.0.2",

package.json

@@ -9,16 +9,17 @@
   },
   "dependencies": {
     "ant-design-vue": "^1.7.6",
+    "axios": "^0.21.1",
     "core-js": "^3.6.5",
+    "echarts": "^5.1.1",
+    "echarts-gl": "^2.0.4",
+    "element-resize-detector": "^1.2.2",
     "element-ui": "^2.15.3",
     "less-loader": "7",
     "mapbox-gl": "1.13.1",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
-    "vuex": "^3.4.0",
-    "echarts": "^5.1.1",
-    "echarts-gl": "^2.0.4",
-    "element-resize-detector": "^1.2.2"
+    "vuex": "^3.4.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

src/components/statusControl/index.vue

@@ -4,8 +4,8 @@
       <li
         v-for="(item, index) in list"
         :key="index"
-        :class="{ acitive: value === item.key }"
-        @click="onStatusChange(item.key)"
+        :class="{ acitive: value.key === item.key }"
+        @click="onStatusChange(item)"
       >
         {{ item.value }}
       </li>
@@ -16,32 +16,34 @@
 <script>
 // #144683
 export default {
-  name: "statusControl",
+  name: 'statusControl',
   props: {
     list: {
       type: Array,
       default: function () {
-        return [];
-      },
+        return []
+      }
     },
     statusStyle: {
       type: [Object, String],
-      default: "",
+      default: ''
     },
     value: {
-      type: String,
-      default: "",
-    },
+      type: Object,
+      default: function () {
+        return {}
+      }
+    }
   },
   data() {
-    return {};
+    return {}
   },
   methods: {
-    onStatusChange(key) {
-      this.$emit("input", key);
-    },
-  },
-};
+    onStatusChange(item) {
+      this.$emit('input', item)
+    }
+  }
+}
 </script>
 
 <style scoped lang="less">

src/pages/methaneUpgrade/index.vue

@@ -15,21 +15,6 @@
               label="地区"
               align="center"
             ></el-table-column>
-            <!-- <el-table-column
-              prop="name"
-              label="年末累积(处)"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="name"
-              label="年末累积(处)"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="name"
-              label="年末累积(处)"
-              align="center"
-            ></el-table-column> -->
             <el-table-column
               prop="name"
               label="年末累积(处)"
@@ -114,8 +99,8 @@
 </template>
 
 <script>
+import request from '../../api/layer'
 import DateWidget from '../../components/DateWidget/DateWidget.vue'
-// import PartInfo from '../../components/PartInfo/PartInfo.vue'
 import Echart from '../../components/Echart/Echarts.vue'
 import PartWrap from '../../components/PartWrap/PartWrap.vue'
 import StatusControl from '@/components/statusControl/index.vue'
@@ -124,13 +109,15 @@ export default {
   name: 'MethaneUpgrade',
   data() {
     return {
+      thisYear: '2015',
       statusControlList: [
+        { key: 'all', value: '汇总' },
         { key: 'small', value: '小型沼气工程' },
         { key: 'middle', value: '中型沼气工程' },
         { key: 'big', value: '大型沼气工程' },
         { key: 'ExtraLarge', value: '特大型沼气工程' }
       ],
-      statusValue: 'small',
+      statusValue: { key: 'all', value: '汇总' },
       thisTable: '供气户数',
       echart3_option: {
         xAxis: {
@@ -190,7 +177,32 @@ export default {
     MethaneMap,
     StatusControl
   },
-  methods: {}
+  mounted() {
+    this.getYearRange()
+  },
+  methods: {
+    async getYearRange() {
+      let res = await request.aggregation('ra_biogas', {
+        groupFields: ['year'],
+        aggregates: [
+          ['year', 'max'],
+          ['year', 'min']
+        ]
+      })
+      console.log(res)
+    },
+    async get() {
+      let res = await request.query('ra_biogas', {
+        filter: [
+          'all',
+          ['=', 'pcode', '10'],
+          ['=', 'year', this.thisYear],
+          ['=', 'type', this.statusValue.value]
+        ]
+      })
+      console.log(res)
+    }
+  }
 }
 </script>