zhangzengfei
2022-11-25 610a3c14abbd833de453bf4fe4dc0ce771482681
完善数据上报
1个文件已删除
3个文件已修改
455 ■■■■■ 已修改文件
src/views/dataReport/components/alarmPush.vue 401 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataReport/components/dataReport.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataReport/components/reportDownload.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataReport/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataReport/components/alarmPush.vue
File was deleted
src/views/dataReport/components/dataReport.vue
@@ -1,21 +1,21 @@
<template>
  <div style="padding: 20px;">
    <el-tabs v-model="activeName">
    <el-tabs v-model="activeName" @tab-click="handleClick">
      <el-tab-pane name="reportDownload">
        <span slot="label"><i class="el-icon-s-home"></i> 自定义报表</span>
        <reportDownload :activeName.sync="activeName" @aaa="aaa" :tableData.sync="tableData"></reportDownload>
        <reportDownload :activeName.sync="activeName" @commit="getFormList" :tableData.sync="tableData"></reportDownload>
      </el-tab-pane>
      <el-tab-pane name="point">
      <el-tab-pane name="formList">
        <span slot="label"><i class="el-icon-s-platform"></i> 报表下载</span>
        <div>
          <el-table :data="tableData" stripe style="width: 100%">
            <el-table-column prop="formName" label="报表名称" width="180"> </el-table-column>
            <el-table-column prop="formType" label="报表类型" width="180"> </el-table-column>
            <el-table-column prop="createTime" label="创建时间" width="280"> </el-table-column>
            <el-table-column prop="formName" label="报表名称"> </el-table-column>
            <el-table-column prop="formType" label="报表类型"> </el-table-column>
            <el-table-column prop="createTime" label="创建时间"> </el-table-column>
            <!-- <el-table-column prop="createTime" label="创建时间"> </el-table-column> -->
            <el-table-column label="操作">
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <a :href="scope.row.url">{{ scope.row.url }}</a>
                <a :href="scope.row.url">{{ "下载" }}</a>
              </template>
            </el-table-column>
          </el-table>
@@ -43,15 +43,11 @@
<script>
import reportDownload from "./reportDownload.vue"
// import point from "./point.vue"
// import alarmPush from "./alarmPush.vue"
import { addAreaTreeData, reportFormGetExport } from "@/api/area"
export default {
  components: {
    reportDownload
    // point,
    // alarmPush
  },
  data() {
    return {
@@ -69,32 +65,33 @@
  methods: {
    refrash(page) {
      this.page = page
      this.lookUp()
      this.getFormList()
    },
    handleSizeChange(size) {
      this.size = size
      this.lookUp()
      this.getFormList()
    },
    async aaa() {
    async getFormList() {
      // console.log(row, "|row")
      let query = {
        FormType: "",
        KeyWords: "",
        StartTime: "",
        EndTime: "",
        Page: 10,
        Size: 1
        Page: this.page,
        Size: this.size
      }
      let res = await reportFormGetExport(query)
      this.tableData = res.data.list
      this.total = res.data.total
      console.log(res, "r22222222222es")
    },
    handleClick(tab,event) {
      console.log(tab, event)
      if (tab.name == "formList") {
        this.getFormList()
      }
    }
    // handleClick(row) {
    //   console.log(row, "row")
    // }
  }
}
</script>
src/views/dataReport/components/reportDownload.vue
@@ -133,15 +133,10 @@
          }
          reportFormExportForm(query).then((res) => {
            console.log(res, "res")
            this.$emit("update:tableData", res.data.list)
            this.$emit("aaa")
            this.$emit("update:activeName", "point")
            // this.$emit("update:tableData", res.data.list)
            this.$emit("commit")
            this.$emit("update:activeName", "formList")
          })
          // let res = await reportFormExportForm(query)
          // console.log(this.activeName, "activeName")
          // this.$emit("update:titles", this.ruleForm.titles)
          // console.log(this.activeName, "activeName")
        } else {
          console.log("error submit!!")
          return false
src/views/dataReport/index.vue
@@ -22,9 +22,7 @@
<script>
import IndexHeader from "@/components/IndexHeader"
// import DevList from "@/views/report/components/DevList"
import dataReport from "./components/dataReport.vue"
// import SettingBox from "@ /views/report/components/SettingBox"
import Footer from "@/components/Footer"
export default {