统计

4 years ago · 06a54e9dfc
2 changed files with 39 additions and 213 deletions
--- a/epmet-oper-web/src/views/modules/dataExport/operStatic.vue
+++ b/epmet-oper-web/src/views/modules/dataExport/operStatic.vue
@ -23,8 +23,9 @@
            </el-form-item>
            <el-form-item label="所属组织"
                          :label-width="labelWidth">
-              <el-cascader v-model="tableParams.agencyId"
+              <el-cascader v-model="agencyIdArray"
                           style="width:480px"
+                           :key="iscascaderShow"
                           :options="options"
                           :props="optionProps"
                           clearable></el-cascader>
@ -38,7 +39,8 @@
                <el-radio v-model="tableParams.type"
                          label="Interval">区间新增值</el-radio>

-                <el-date-picker v-if="tableParams.type==='Interval'"
+                <el-date-picker style="margin-left:30px"
+                                v-if="tableParams.type==='Interval'"
                                v-model="timeArray"
                                type="daterange"
                                range-separator="至"
@ -49,7 +51,8 @@
                                end-placeholder="结束日期">
                </el-date-picker>

-                <el-date-picker v-if="tableParams.type==='end'"
+                <el-date-picker style="margin-left:30px"
+                                v-if="tableParams.type==='end'"
                                v-model="endTimeModel"
                                @change="handleEndTimeChange"
                                :picker-options="pickerOptions"
@ -106,15 +109,15 @@ export default {

      tableData: [],

-
      downloadLoading: false,

      //查询条件标题宽度
      labelWidth: '70px',

-      options: [
-      ],
+      options: [],
+      agencyIdArray: [],
      customerList: [],
+      iscascaderShow: 0,

      optionProps: {
        value: 'agencyId',
@ -123,6 +126,7 @@ export default {
        checkStrictly: true
      },

+
      pickerOptions: { //控制时间范围
        disabledDate (time) {
          return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
@ -130,8 +134,8 @@ export default {
      },

      // 列表相关
-      // tableUrl: '/data/aggregator/datastats/operatedata',
-      tableUrl: 'http://yapi.elinkservice.cn/mock/102/data/aggregator/datastats/operatedata',
+      tableUrl: '/data/aggregator/datastats/operatedata',
+      // tableUrl: 'http://yapi.elinkservice.cn/mock/102/data/aggregator/datastats/operatedata',
      tableParams: {
        customerId: '', //客户Id	
        agencyId: '', //所选组织Id 	
@ -162,7 +166,6 @@ export default {
  },
  mounted () {
    this.initData()
-    console.log(customerId)
  },
  computed: {
    tableHeight () {
@ -201,7 +204,6 @@ export default {
        this.tableParams.isPage = true
        this.$refs.table.loadData()
      }
-
    },

    //获取客户列表
@ -258,11 +260,15 @@ export default {
      const url = '/gov/org/customeragency/agencylist'
      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'

-      const params = {}
+      const params = {
+        customerId: this.tableParams.customerId
+      }
      const { data, code, msg } = await requestPost(url, params)
      if (code === 0) {
-
+        ++this.iscascaderShow
        this.options = []
+        this.agencyIdArray.length = []
+        this.tableParams.agencyId = ''
        if (data) {
          this.options.push(data)
        }
@ -272,7 +278,8 @@ export default {
      }
    },
    validate () {
-      if (!this.tableParams.customerId) {
+
+      if (!this.tableParams.customerId || this.agencyIdArray.length == 0) {
        this.$message.info("请选择客户和组织")
        return false
      }
@ -282,14 +289,16 @@ export default {
        return false
      }

+      this.tableParams.agencyId = this.agencyIdArray[this.agencyIdArray.length - 1]
+
      return true
    },

    //导出表格
    async loadOutTableData () {
-      // if (!this.validate()) {
-      //   return false
-      // }
+      if (!this.validate()) {
+        return false
+      }
      let title = this.agencyName

      if (this.tableParams.type === 'Interval') {
@ -302,7 +311,7 @@ export default {
      const url = "/data/aggregator/datastats/operateexport"
      // const url = "http://yapi.elinkservice.cn/mock/102/data/aggregator/datastats/operateexport"
      this.tableParams.isPage = false
-      this.tableParams.agencyId = '30705f91f1295ae77d372b868596a5e7'
+      // this.tableParams.agencyId = '30705f91f1295ae77d372b868596a5e7'
      // this.tableParams = {
      //   "customerId": "613cc61a6b8ce4c70d21bd413dac72cc",
      //   "agencyId": "30705f91f1295ae77d372b868596a5e7",
@ -325,16 +334,6 @@ export default {
        }
      );

-
-      // const { data, code, msg } = await requestPost(url, this.tableParams)
-      // if (code === 0) {
-      //   this.tableData = data
-      //   this.download(data, title + '.xls')
-      //   // this.handleDownload()
-
-      // } else {
-      //   this.$message.error(msg)
-      // }
    },


--- a/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue
@ -95,196 +95,14 @@ export default {
      formShow: false,

      optionProps: {
+        checkStrictly: true,
+        expandTrigger: 'hover',
        value: 'agencyId',
        label: 'agencyName',
        children: 'subAgencyList',
-        checkStrictly: true
+
      },
-      options: [
-        {
-          agencyId: 'zhinan',
-          agencyName: '指南',
-          subAgencyList: [{
-            agencyId: 'shejiyuanze',
-            agencyName: '设计原则',
-            subAgencyList: [{
-              agencyId: 'yizhi',
-              agencyName: '一致'
-            }, {
-              agencyId: 'fankui',
-              agencyName: '反馈'
-            }, {
-              agencyId: 'xiaolv',
-              agencyName: '效率'
-            }, {
-              agencyId: 'kekong',
-              agencyName: '可控'
-            }]
-          }, {
-            agencyId: 'daohang',
-            agencyName: '导航',
-            subAgencyList: [{
-              agencyId: 'cexiangdaohang',
-              agencyName: '侧向导航'
-            }, {
-              agencyId: 'dingbudaohang',
-              agencyName: '顶部导航'
-            }]
-          }]
-        },
-        {
-          agencyId: 'zujian',
-          agencyName: '组件',
-          subAgencyList: [{
-            agencyId: 'basic',
-            agencyName: 'Basic',
-            subAgencyList: [{
-              agencyId: 'layout',
-              agencyName: 'Layout 布局'
-            }, {
-              agencyId: 'color',
-              agencyName: 'Color 色彩'
-            }, {
-              agencyId: 'typography',
-              agencyName: 'Typography 字体'
-            }, {
-              agencyId: 'icon',
-              agencyName: 'Icon 图标'
-            }, {
-              agencyId: 'button',
-              agencyName: 'Button 按钮'
-            }]
-          }, {
-            agencyId: 'form',
-            agencyName: 'Form',
-            subAgencyList: [{
-              agencyId: 'radio',
-              agencyName: 'Radio 单选框'
-            }, {
-              agencyId: 'checkbox',
-              agencyName: 'Checkbox 多选框'
-            }, {
-              agencyId: 'input',
-              agencyName: 'Input 输入框'
-            }, {
-              agencyId: 'input-number',
-              agencyName: 'InputNumber 计数器'
-            }, {
-              agencyId: 'select',
-              agencyName: 'Select 选择器'
-            }, {
-              agencyId: 'cascader',
-              agencyName: 'Cascader 级联选择器'
-            }, {
-              agencyId: 'switch',
-              agencyName: 'Switch 开关'
-            }, {
-              agencyId: 'slider',
-              agencyName: 'Slider 滑块'
-            }, {
-              agencyId: 'time-picker',
-              agencyName: 'TimePicker 时间选择器'
-            }, {
-              agencyId: 'date-picker',
-              agencyName: 'DatePicker 日期选择器'
-            }, {
-              agencyId: 'datetime-picker',
-              agencyName: 'DateTimePicker 日期时间选择器'
-            }, {
-              agencyId: 'upload',
-              agencyName: 'Upload 上传'
-            }, {
-              agencyId: 'rate',
-              agencyName: 'Rate 评分'
-            }, {
-              agencyId: 'form',
-              agencyName: 'Form 表单'
-            }]
-          }, {
-            agencyId: 'data',
-            agencyName: 'Data',
-            subAgencyList: [{
-              agencyId: 'table',
-              agencyName: 'Table 表格'
-            }, {
-              agencyId: 'tag',
-              agencyName: 'Tag 标签'
-            }, {
-              agencyId: 'progress',
-              agencyName: 'Progress 进度条'
-            }, {
-              agencyId: 'tree',
-              agencyName: 'Tree 树形控件'
-            }, {
-              agencyId: 'pagination',
-              agencyName: 'Pagination 分页'
-            }, {
-              agencyId: 'badge',
-              agencyName: 'Badge 标记'
-            }]
-          }, {
-            agencyId: 'notice',
-            agencyName: 'Notice',
-            subAgencyList: [{
-              agencyId: 'alert',
-              agencyName: 'Alert 警告'
-            }, {
-              agencyId: 'loading',
-              agencyName: 'Loading 加载'
-            }, {
-              agencyId: 'message',
-              agencyName: 'Message 消息提示'
-            }, {
-              agencyId: 'message-box',
-              agencyName: 'MessageBox 弹框'
-            }, {
-              agencyId: 'notification',
-              agencyName: 'Notification 通知'
-            }]
-          }, {
-            agencyId: 'navigation',
-            agencyName: 'Navigation',
-            subAgencyList: [{
-              agencyId: 'menu',
-              agencyName: 'NavMenu 导航菜单'
-            }, {
-              agencyId: 'tabs',
-              agencyName: 'Tabs 标签页'
-            }, {
-              agencyId: 'breadcrumb',
-              agencyName: 'Breadcrumb 面包屑'
-            }, {
-              agencyId: 'dropdown',
-              agencyName: 'Dropdown 下拉菜单'
-            }, {
-              agencyId: 'steps',
-              agencyName: 'Steps 步骤条'
-            }]
-          }, {
-            agencyId: 'others',
-            agencyName: 'Others',
-            subAgencyList: [{
-              agencyId: 'dialog',
-              agencyName: 'Dialog 对话框'
-            }, {
-              agencyId: 'tooltip',
-              agencyName: 'Tooltip 文字提示'
-            }, {
-              agencyId: 'popover',
-              agencyName: 'Popover 弹出框'
-            }, {
-              agencyId: 'card',
-              agencyName: 'Card 卡片'
-            }, {
-              agencyId: 'carousel',
-              agencyName: 'Carousel 走马灯'
-            }, {
-              agencyId: 'collapse',
-              agencyName: 'Collapse 折叠面板'
-            }]
-          }]
-        }
-      ],
+      options: [],
      categoryList: [],


@ -386,7 +204,16 @@ export default {
      this.endLoading()
    },

+    agencyChange (item) {
+      if (item.length > 0) {
+        // this.tableParams.agencyId = item[item.length - 1]
+      }
+    },
    loadData () {
+      if (this.tableParams.agencyId.length > 0) {
+        this.tableParams.agencyId = this.tableParams.agencyId[this.tableParams.agencyId.length - 1]
+      }
+
      this.$refs.table.loadData()
    },