Merge remote-tracking branch 'origin/master'

zengh

2021-06-23 21e76a22fffcfcb82990c25ef2a9076ed55ae678

Merge remote-tracking branch 'origin/master'

 src/api/feedback/feedback.js

@@ -2,7 +2,19 @@

export const getList = (current, size, params) => {
  return request({
    url: '/api/feedback/feedback/list',
    url: '/api/blade-jfpts/feedback/feedback/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getListReport = (current, size, params) => {
  return request({
    url: '/api/blade-jfpts/feedback/feedback/page',
    method: 'get',
    params: {
      ...params,

 src/router/views/index.js

@@ -311,6 +311,19 @@
                import ( /* webpackChunkName: "views" */ '@/views/article/article')
        }]
    }, {
        path: '/feedbackReport',
        component: Layout,
        redirect: '/feedbackReport/feedbackReport',
        children: [{
            path: 'feedbackReport',
            name: '取证上报',
            meta: {
                i18n: 'feedbackReport'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/feedbackReport/feedbackReport')
        }]
    }, {
        path: '/alarm',
        component: Layout,
        redirect: '/alarm/alarmPage',

 src/views/feedbackReport/feedbackReport.vue

New file
@@ -0,0 +1,283 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               :page="page"
               :permission="permissionList"
               :before-open="beforeOpen"
               v-model="form"
               ref="crud"
               @row-update="rowUpdate"
               @row-save="rowSave"
               @row-del="rowDel"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      <template slot="menuLeft">
        <el-button type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.feedback_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
  import {getListReport, getDetail, add, update, remove} from "@/api/feedback/feedback";
  import {mapGetters} from "vuex";

  export default {
    data() {
      return {
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: false,
          stripe:true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          column: [
            {
              label: "上报人姓名",
              prop: "sname",
              search:true,
              searchLabelWidth:100,
              searchSpan: 5,
              rules: [{
                required: true,
                message: "请输入上报人姓名",
                trigger: "blur"
              }]
            },
            {
              label: "上报地址",
              prop: "place",
              rules: [{
                required: true,
                message: "请输入事发地址",
                trigger: "blur"
              }]
            },
            {
              label: "备注",
              prop: "result",
              rules: [{
                required: true,
                message: "请输入处理结果",
                trigger: "blur"
              }]
            },
            {
              label: "上报时间",
              prop: "stime",
              type: "datetime",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchRange: true,
              search:true,
              searchLabelWidth:100,
              searchSpan: 6,
              rules: [{
                required: true,
                message: "请输入上报时间",
                trigger: "blur"
              }]
            },
            {
              label: "视频",
              prop: "feedbackVideo",
              hide:true,
              viewDisplay:true,
              rules: [{
                required: true,
                message: "请输入视频位置",
                trigger: "blur"
              }]
            },
            {
              label: "照片",
              prop: "feedbackPhoto",
              hide:true,
              viewDisplay:true,
              rules: [{
                required: true,
                message: "请输入照片位置",
                trigger: "blur"
              }]
            },
          ]
        },
        data: []
      };
    },
    computed: {
      ...mapGetters(["permission"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.feedback_add, false),
          viewBtn: this.vaildData(this.permission.feedback_view, true),
          delBtn: this.vaildData(this.permission.feedback_delete, false),
          editBtn: this.vaildData(this.permission.feedback_edit, false)
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    methods: {
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          loading();
          window.console.log(error);
        });
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          loading();
          console.log(error);
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
        }
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(this.ids);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }
        done();
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
      },
      selectionChange(list) {
        this.selectionList = list;
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      currentChange(currentPage){
        this.page.currentPage = currentPage;
      },
      sizeChange(pageSize){
        this.page.pageSize = pageSize;
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {status:1}) {
        const { dateTime } = this.query;
        let values = {
          ...params,
        };

        if (dateTime) {
          values = {
            ...params,
            begTime: dateTime[0],
            endTime: dateTime[1],
            ...this.query,
          };
          values.dateTime = null;
        }
        this.loading = true;
        getListReport(page.currentPage, page.pageSize,values).then(res => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }
    }
  };
</script>

<style>
</style>