新增页面-数据采集-数据采集、数据预警

src/api/portal/GATHER/GATHER.js

@@ -51,3 +51,12 @@ export function delGATHER(id) {
     method: 'get'
   })
 }
+
+
+// 获取可采集的数据
+export function getInfoByColl(id) {
+  return request({
+    url: '/gather/getInfoByColl/' + id,
+    method: 'get'
+  })
+}

src/api/portal/GATHERWARNING/GATHERWARNING.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询数据采集预警列表
+export function listGATHERWARNING(query) {
+  return request({
+    url: '/gather/WARNING/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据采集预警所有列表
+export function listAllGATHERWARNING(query) {
+  return request({
+    url: '/gather/WARNING/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据采集预警详细
+export function getGATHERWARNING(id) {
+  return request({
+    url: '/gather/WARNING/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增数据采集预警
+export function addGATHERWARNING(data) {
+  return request({
+    url: '/gather/WARNING/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改数据采集预警
+export function updateGATHERWARNING(data) {
+  return request({
+    url: '/gather/WARNING/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除数据采集预警
+export function delGATHERWARNING(id) {
+  return request({
+    url: '/gather/WARNING/remove/' + id,
+    method: 'get'
+  })
+}

src/views/GATHER/index.vue

@@ -165,9 +165,45 @@
 
     <!-- 添加或修改数据采集对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <el-tabs v-model="activeName"  type="border-card" @tab-click="handleClick">
-        <el-tab-pane v-for="(item,index) in 10" :key="index+'tabs'" :label="'用户管理'+index" :name="'index'+index" >
-          {{ item }}
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="(item, index) in tabList"
+          :key="index + 'tabs'"
+          :label="item.normName"
+          :name="item.normName"
+        >
+          <el-form :model="form" label-width="150px">
+            <!-- :rules="rules" ref="form" -->
+            <el-form-item
+              v-for="(listItem, listIndex) in form.feeLists"
+              :key="listItem.normfeeId"
+              :label="listItem.normfeeName"
+              v-if="listItem.normId == item.normId"
+              :required="true"
+            >
+            <!-- 这里科研失败！想动态绑定校验规则的 -->
+            <!-- :prop="listItem.normfeeId" -->
+            <!-- :rules="rules.listItem.normfeeId" -->
+              <el-input
+                v-model="listItem.collCalue"
+                :placeholder="'请输入' + listItem.normfeeName"
+              ></el-input>
+            </el-form-item>
+          </el-form>
+
+          <!-- 这里是第二种写法 -->
+          <!-- <el-form :model="form" label-width="150px">
+            <el-form-item
+              v-for="(listItem, listIndex) in item.list"
+              :key="listIndex + 'item.list'"
+              :label="listItem.normfeeName"
+            >
+              <el-input
+                v-model="listItem.collCalue"
+                :placeholder="'请输入' + listItem.normfeeName"
+              ></el-input>
+            </el-form-item>
+          </el-form> -->
         </el-tab-pane>
       </el-tabs>
       <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -246,13 +282,16 @@ import {
   delGATHER,
   addGATHER,
   updateGATHER,
+  getInfoByColl,
 } from "@/api/portal/GATHER/GATHER.js";
 
 export default {
   name: "GATHER",
   data() {
     return {
-      activeName:'',
+      tabList: [],
+      feeLists: [],
+      activeName: "",
       //数据类型(0=量化指标数据,1=月报表数据)
       typeList: [
         { label: "量化指标数据", value: "0" },
@@ -316,42 +355,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" },
-        ],
-        type: [
-          {
-            required: true,
-            message: "数据类型(0=量化指标数据,1=月报表数据)不能为空",
-            trigger: "change",
-          },
-        ],
-        month: [{ required: true, message: "月份不能为空", trigger: "blur" }],
-        collStatus: [
-          {
-            required: true,
-            message: "采集状态(0=未采集,1=已采集)不能为空",
-            trigger: "blur",
-          },
-        ],
-        reportStatus: [
-          {
-            required: true,
-            message: "上报状态(0=未上报,=1已上报)不能为空",
-            trigger: "blur",
-          },
-        ],
-        approveStatus: [
-          {
-            required: true,
-            message: "审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)不能为空",
-            trigger: "blur",
-          },
-        ],
+        // id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
       },
     };
   },
@@ -359,6 +363,7 @@ export default {
     this.getList();
   },
   methods: {
+    handleClick(tab, event) {},
     /** 查询数据采集列表 */
     getList() {
       this.loading = true;
@@ -411,33 +416,89 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      // this.reset();
+      this.tabList = []
+      this.form = []
       const id = row.id || this.ids;
-      getGATHER(id).then((response) => {
-        this.form = response.data;
+      getInfoByColl(id).then((response) => {
+        //深拷贝，而不是拷贝地址
+        this.form = JSON.parse(JSON.stringify(response.data));
         this.open = true;
         this.title = "修改数据采集";
+        //深拷贝，而不是拷贝地址
+        this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
+        let dataList = response.data.feeLists;
+        //去重获取tab
+        //遍历如果遇到相同的id则删掉
+        for (var i = 0; i < this.tabList.length - 1; i++) {
+          //设置激活的tab
+          if (i == 0) {
+            this.activeName = this.tabList[0].normName;
+          }
+          for (var j = i + 1; j < this.tabList.length; j++) {
+            if (this.tabList[i].normId == this.tabList[j].normId) {
+              this.tabList.splice(j, 1);
+              //因为数组长度减小1，所以直接 j++ 会漏掉一个元素，所以要 j--
+              j--;
+            }
+          }
+        }
+        
+
+        // 这里科研失败！想动态绑定校验规则的
+        //遍历设置表单校验  我好困
+        // for (const i in this.form.feeLists) {
+        //   this.$set(this.rules,this.form.feeLists[i].normfeeId,[
+        //     {  required: true, message: this.form.feeLists[i].normfeeName+"不能为空", trigger: "blur"  }
+        //   ])
+        // }
+
+        // console.log(this.rules);
+
+
+
+        //这里是第二种写法
+        //获取分类ID相同的子集
+        // for (let index = 0; index < this.tabList.length; index++) {
+        //   this.$set(this.tabList[index],'list',[])
+        //   for (let i = 0; i < dataList.length; i++) {
+        //     if (dataList[i].normId == this.tabList[index].normId) {
+        //       this.tabList[index].list.push(dataList[i]);
+        //     }
+        //   }
+        // }
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateGATHER(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addGATHER(this.form).then((response) => {
+      for (const i in this.form.feeLists) {
+        if(this.form.feeLists[i].collCalue == '' || this.form.feeLists[i].collCalue == null){
+          return this.$message({
+          message: this.form.feeLists[i].normName+' - '+this.form.feeLists[i].normfeeName+' 未填写！',
+          type: 'warning'
+        });
+        }
+      }
+      addGATHER(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
-          }
-        }
-      });
+
+
+      // this.$refs["form"].validate((valid) => {
+      //   if (valid) {
+      //     if (this.form.id != null) {
+      //       updateGATHER(this.form).then((response) => {
+      //         this.$modal.msgSuccess("修改成功");
+      //         this.open = false;
+      //         this.getList();
+      //       });
+      //     } else {
+           
+      //     }
+      //   }
+      // });
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/GATHERWARNING/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="数据类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择数据类型"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in typeList"
+            :key="dict.value + 'typeList'"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="GATHERWARNINGList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column label="数据类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type == 0">量化指标数据</span>
+          <span v-else-if="scope.row.type == 1">月报表数据</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常详细数据值" align="center" prop="errValue">
+        <template slot-scope="scope">
+          {{ scope.row.errValue }}
+        </template>
+      </el-table-column>
+      <el-table-column label="处置人" align="center" prop="dealBy">
+        <template slot-scope="scope">
+          {{ scope.row.dealBy }}
+        </template>
+      </el-table-column>
+      <el-table-column label="处置时间" align="center" prop="dealTime">
+        <template slot-scope="scope">
+          {{ scope.row.dealTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="取消人" align="center" prop="cancelBy">
+        <template slot-scope="scope">
+          {{ scope.row.cancelBy }}
+        </template>
+      </el-table-column>
+      <el-table-column label="取消时间" align="center" prop="cancelTime">
+        <template slot-scope="scope">
+          {{ scope.row.cancelTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark">
+        <template slot-scope="scope">
+          {{ scope.row.remark }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:GATHERWARNING:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:GATHERWARNING:remove']"
+            >解除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改数据采集预警对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="数据类型(0=量化指标数据,1=月报表数据)" prop="type">
+          <el-select v-model="form.type" placeholder="请选择数据类型(0=量化指标数据,1=月报表数据)" filterable>
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+:value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form> -->
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listGATHERWARNING,
+  getGATHERWARNING,
+  delGATHERWARNING,
+  addGATHERWARNING,
+  updateGATHERWARNING,
+} from "@/api/portal/GATHERWARNING/GATHERWARNING.js";
+
+export default {
+  name: "GATHERWARNING",
+  data() {
+    return {
+      typeList: [
+        { label: "要闻咨量化指标数据询", value: "0" },
+        { label: "月报表数据", value: "1" },
+      ],
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 数据采集预警表格数据
+      GATHERWARNINGList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        type: null,
+        getherId: null,
+        getherfeeId: null,
+        errValue: null,
+        dealBy: null,
+        dealTime: null,
+        cancelBy: null,
+        cancelTime: null,
+        remark: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message: "数据类型(0=量化指标数据,1=月报表数据)不能为空",
+            trigger: "change",
+          },
+        ],
+        getherId: [
+          { required: true, message: "异常数据id不能为空", trigger: "blur" },
+        ],
+        getherfeeId: [
+          {
+            required: true,
+            message: "异常详细数据id不能为空",
+            trigger: "blur",
+          },
+        ],
+        errValue: [
+          {
+            required: true,
+            message: "异常详细数据值不能为空",
+            trigger: "blur",
+          },
+        ],
+        dealBy: [
+          { required: true, message: "处置人不能为空", trigger: "blur" },
+        ],
+        dealTime: [
+          { required: true, message: "处置时间不能为空", trigger: "blur" },
+        ],
+        cancelBy: [
+          { required: true, message: "取消人不能为空", trigger: "blur" },
+        ],
+        cancelTime: [
+          { required: true, message: "取消时间不能为空", trigger: "blur" },
+        ],
+        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询数据采集预警列表 */
+    getList() {
+      this.loading = true;
+      listGATHERWARNING(this.queryParams).then((response) => {
+        this.GATHERWARNINGList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        type: null,
+        getherId: null,
+        getherfeeId: null,
+        errValue: null,
+        dealBy: null,
+        dealTime: null,
+        cancelBy: null,
+        cancelTime: null,
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加数据采集预警";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getGATHERWARNING(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改数据采集预警";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGATHERWARNING(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGATHERWARNING(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除数据采集预警编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delGATHERWARNING(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/GATHERWARNING/export",
+        {
+          ...this.queryParams,
+        },
+        `GATHERWARNING_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>