合并冲突

shuishen

2022-07-29 d6a0abe9024f87fc517a2b71df0f17c5cadc41a0

 src/views/remote/remote.vue

@@ -1,358 +1,361 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="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.remote_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
    </avue-crud>
  </basic-container>
    <basic-container>
        <avue-crud
            :option="option"
            :table-loading="loading"
            :data="data"
            :page.sync="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.remote_delete"
                    @click="handleDelete"
                >删 除</el-button>
            </template>
        </avue-crud>
    </basic-container>
</template>

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

export default {
  data() {
    return {
      form: {},
      query: {},
      loading: true,
      page: {
        pageSize: 10,
        currentPage: 1,
        total: 0
      },
      selectionList: [],
      option: {
        height: 'auto',
        calcHeight: 30,
        tip: false,
        searchShow: true,
        border: true,
        index: true,
        viewBtn: true,
        selection: true,
        align: "center",
        dialogClickModal: false,
        searchMenuSpan:3,
        column: [
          {
            label: "预览图",
            prop: "reTp",
            type: "upload",
            labelWidth: 145,
            dataType: "string",
            span: 24,
            limit: 5,
            listType: "picture-card",
            tip: "建议上传手机横屏拍摄的照片，宽高比16:9，最多上传5张",
            canvasOption: {
              text: "",
              ratio: 1.0,
    data () {
        return {
            form: {},
            query: {},
            loading: true,
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0
            },
            propsHttp: {
              res: "data",
              url: "url"
            selectionList: [],
            option: {
                height: 'auto',
                calcHeight: 30,
                tip: false,
                searchShow: true,
                border: true,
                index: true,
                viewBtn: true,
                selection: true,
                align: "center",
                dialogClickModal: false,
                searchMenuSpan: 3,
                column: [
                    {
                        label: "预览图",
                        prop: "reTp",
                        type: "upload",
                        labelWidth: 145,
                        dataType: "string",
                        span: 24,
                        limit: 5,
                        listType: "picture-card",
                        tip: "建议上传手机横屏拍摄的照片，宽高比16:9，最多上传5张",
                        canvasOption: {
                            text: "",
                            ratio: 1.0,
                        },
                        propsHttp: {
                            res: "data",
                            url: "url"
                        },
                        action: "/api/blade-resource/oss/endpoint/put-files"
                    },
                    {
                        label: "专题名称",
                        prop: "reName",
                        search: true,
                        rules: [{
                            required: true,
                            message: "请输入reName",
                            trigger: "blur"
                        }]
                    },
                    {
                        label: "通知时间",
                        prop: "releaseTimeRange",
                        type: "datetime",
                        format: "yyyy-MM-dd hh:mm:ss",
                        valueFormat: "yyyy-MM-dd hh:mm:ss",
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请输入通知时间",
                            trigger: "blur"
                        }]
                    },
                    {
                        label: "遥感时间",
                        prop: "reTime",
                        search: true,
                        searchSpan: 4,
                        type: "datetime",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        rules: [{
                            required: true,
                            message: "请输入遥感时间",
                            trigger: "blur"
                        }]
                    },
                    {
                        label: "拍摄时间",
                        prop: "rePtime",
                        type: "datetime",
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        rules: [{
                            required: true,
                            message: "请输入拍摄时间",
                            trigger: "blur"
                        }]
                    },
                    {
                        label: "是否展示",
                        prop: "reType1",
                        type: "select",
                        searchSpan: 4,
                        addDisplay: false,
                        editDisplay: false,
                        hide: true,
                        search: true,
                        dicData: [
                            {
                                label: "全部",
                                value: ""
                            },
                            {
                                label: "展示",
                                value: "0"
                            },
                            {
                                label: "不展示",
                                value: "1"
                            },
                        ],
                        rules: [{
                            required: true,
                            message: "请输入是否展示",
                            trigger: "reType"
                        }]
                    },
                    {
                        label: "是否展示",
                        prop: "reType",
                        type: "select",
                        dicData: [
                            {
                                label: "展示",
                                value: "0"
                            },
                            {
                                label: "不展示",
                                value: "1"
                            },
                        ],
                        rules: [{
                            required: true,
                            message: "请输入是否展示",
                            trigger: "reType"
                        }]
                    },
                    {
                        label: "服务地址",
                        prop: "reUrl",
                        span: 24,
                        rules: [{
                            required: true,
                            message: "请输入服务地址",
                            trigger: "reType"
                        }]
                    },
                    {
                        label: "介绍",
                        type: "textarea",
                        prop: "reContext",
                        span: 24,
                        rules: [
                            {
                                required: true,
                                message: "请输入介绍",
                                trigger: "blur",
                            },
                        ],
                    },
                ]
            },
            action: "/api/blade-resource/oss/endpoint/put-files"
          },
          {
            label: "专题名称",
            prop: "reName",
            search:true,
            rules: [{
              required: true,
              message: "请输入reName",
              trigger: "blur"
            }]
          },
          {
            label: "通知时间",
            prop: "releaseTimeRange",
            type: "datetime",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            searchRange:true,
            hide: true,
            addDisplay: false,
            editDisplay: false,
            viewDisplay: false,
            search: true,
            rules: [{
              required: true,
              message: "请输入通知时间",
              trigger: "blur"
            }]
          },
          {
            label: "遥感时间",
            prop: "reTime",
            search:true,
            searchSpan:4,
            type: "datetime",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            rules: [{
              required: true,
              message: "请输入遥感时间",
              trigger: "blur"
            }]
          },
          {
            label: "拍摄时间",
            prop: "rePtime",
            type: "datetime",
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            rules: [{
              required: true,
              message: "请输入拍摄时间",
              trigger: "blur"
            }]
          },
          {
            label: "是否展示",
            prop: "reType1",
            type: "select",
            searchSpan:4,
            addDisplay:false,
            editDisplay:false,
            hide:true,
            search:true,
            dicData:[
              {
                label:"全部",
                value:""
              },
              {
                label:"展示",
                value:"0"
              },
              {
                label:"不展示",
                value:"1"
              },
            ],
            rules: [{
              required: true,
              message: "请输入是否展示",
              trigger: "reType"
            }]
          },
          {
            label: "是否展示",
            prop: "reType",
            type: "select",
            dicData:[
              {
                label:"展示",
                value:"0"
              },
              {
                label:"不展示",
                value:"1"
              },
            ],
            rules: [{
              required: true,
              message: "请输入是否展示",
              trigger: "reType"
            }]
          },
          {
            label: "服务地址",
            prop: "reUrl",
            span: 24,
            rules: [{
              required: true,
              message: "请输入服务地址",
              trigger: "reType"
            }]
          },
          {
            label: "介绍",
            type: "textarea",
            prop: "reContext",
            span: 24,
            rules: [
              {
                required: true,
                message: "请输入介绍",
                trigger: "blur",
              },
            ],
          },
        ]
      },
      data: []
    };
  },
  computed: {
    ...mapGetters(["permission"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.remote_add, false),
        viewBtn: this.vaildData(this.permission.remote_view, false),
        delBtn: this.vaildData(this.permission.remote_delete, false),
        editBtn: this.vaildData(this.permission.remote_edit, false)
      };
            data: []
        }
    },
    ids() {
      let ids = [];
      this.selectionList.forEach(ele => {
        ids.push(ele.id);
      });
      return ids.join(",");
    computed: {
        ...mapGetters(["permission"]),
        permissionList () {
            return {
                addBtn: this.vaildData(this.permission.remote_add, false),
                viewBtn: this.vaildData(this.permission.remote_view, false),
                delBtn: this.vaildData(this.permission.remote_delete, false),
                editBtn: this.vaildData(this.permission.remote_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 = {}) {
            const { releaseTimeRange } = this.query
            let values = {
                ...params,
                ...this.query
            }
            if (releaseTimeRange) {
                values = {
                    ...values,
                    releaseTime_datege: releaseTimeRange[0],
                    releaseTime_datelt: releaseTimeRange[1],
                }
                values.releaseTimeRange = null
            }
            this.loading = true
            getList(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()
            })
        }
    }
  },
  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 = {}) {
      const {releaseTimeRange} = this.query;
      let values = {
        ...params,
        ...this.query
      };
      if (releaseTimeRange) {
        values = {
          ...values,
          releaseTime_datege: releaseTimeRange[0],
          releaseTime_datelt: releaseTimeRange[1],
        };
        values.releaseTimeRange = null;
      }
      this.loading = true;
      getList(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>