Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-18 f18ff6df94830a0147f372f031fa94ab5402ead8

 src/views/system/point/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="点位名称" prop="pointName">
        <el-input
          v-model="queryParams.pointName"
@@ -39,7 +39,6 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['x:point:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -50,7 +49,6 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['x:point:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -61,18 +59,25 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['x:point:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          icon="el-icon-top"
          size="mini"
          @click="handleExport"
          v-hasPermi="['x:point:export']"
        >导出</el-button>
          @click="handleImportPoint"
        >导入点位</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-receiving"
          size="mini"
          @click="handleEditBatch"
        >批量修改</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -90,7 +95,15 @@
          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="运维单位" align="center" prop="unitId" />
      <el-table-column label="运维单位" align="center" prop="unitName" />
      <el-table-column label="监管部门" align="center" prop="deptName" />
      <el-table-column label="运维类别" align="center" prop="category">
        <template slot-scope="scope">
          <div v-if="scope.row.category === 1">视频监控</div>
          <div v-else-if="scope.row.category === 2">车辆识别</div>
          <div v-else-if="scope.row.category === 3">人脸识别</div>
        </template>
      </el-table-column>
      <el-table-column label="运维状态" align="center" prop="status" />
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -100,14 +113,12 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['x:point:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['x:point:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
@@ -122,83 +133,27 @@
    />

    <!-- 添加运维点位对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
      <el-form ref="form" :model="tempForm" :rules="rules" label-width="120px">
        <el-form-item label="点位名称" prop="pointName">
          <el-input v-model="tempForm.pointName" placeholder="请输入点位名称" />
        </el-form-item>
        <el-form-item label="运维单位" prop="unitId">
          <el-select v-model="tempForm.unitId"  placeholder="运维单位">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="点位时区" prop="timezone">
          <el-date-picker
            @change="dateChange"
            v-model="tempForm.timezone"
            type="daterange"
            align="right"
            unlink-panels
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <div style="display: flex;flex-direction: row-reverse">
            <el-button @click="nextAdd" type="primary" plain>继续添加</el-button>
          </div>
        </el-form-item>
        <div class="point-row" v-for="(point,index) in tempFormList">
            <div class="row-item">
              <el-input :disabled="editingIndex!==index" v-model="point.pointName" placeholder="点位名称"></el-input>
            </div>
            <div class="row-item">
              <el-select :disabled="editingIndex!==index" v-model="point.unitId"  placeholder="运维单位">
                <el-option
                  v-for="item in unitList"
                  :key="item.id"
                  :label="item.value"
                  :value="item.id">
                </el-option>
              </el-select>
            </div>
            <div class="row-item">
              <el-date-picker
                :disabled="editingIndex!==index"
                v-model="point.timezone"
                type="daterange"
                align="right"
                unlink-panels
                range-separator="至"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              >
              </el-date-picker>
            </div>
            <div  class="row-item">
              <el-button v-show="editingIndex!==index" @click="editPointItem(index)" type="danger" size="small" plain>修改</el-button>
              <el-button v-show="editingIndex===index" @click="editFinishItem(index)" type="success" size="small" plain>完成</el-button>
            </div>
          </div>
      </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>

    <!-- 修改运维点位对话框 -->
    <el-dialog :title="title" :visible.sync="editOpen" width="500px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="点位名称" prop="pointName">
          <el-input v-model="form.pointName" placeholder="请输入点位名称" />
        </el-form-item>
        <el-form-item label="点位所在地" prop="region">
          <el-cascader v-model="form.region" :options="regionList" placeholder="点位所在地" :props="props" collapse-tags></el-cascader>
        </el-form-item>
        <el-form-item label="设备类型" prop="category">
          <el-select v-model="form.category"  placeholder="设备类型">
            <el-option label="人脸识别" value="2"/>
            <el-option label="视频监控" value="1"/>
            <el-option label="车辆监控" value="3"/>
          </el-select>
        </el-form-item>
        <el-form-item label="监管部门" prop="category">
          <el-select v-model="form.deptName"  placeholder="监管部门">
            <el-option label="省厅" value="省厅"/>
            <el-option label="自贡荣县公安局" value="自贡荣县公安局"/>
            <el-option label="自贡富顺公安局" value="自贡富顺公安局"/>
          </el-select>
        </el-form-item>
        <el-form-item label="运维单位" prop="unitId">
          <el-select v-model="form.unitId"  placeholder="运维单位">
@@ -226,20 +181,70 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="updateCancel">取 消</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 批量修改运维单位 -->
    <el-dialog title="批量修改运维单位" :visible.sync="batchOpen" width="600px" append-to-body>
      <el-form ref="form" :model="batchEditForm" :rules="batchRules" label-width="120px">
        <el-form-item label="点位选择" prop="ids">
          <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="请选择区域" :props="props" collapse-tags></el-cascader>
        </el-form-item>
        <el-form-item label="运维单位" prop="unitId">
          <el-select v-model="batchEditForm.unitId"  placeholder="选择运维单位">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="运维时间段" prop="timezone">
          <el-date-picker
            @change="dateChange"
            v-model="batchEditForm.timezone"
            type="daterange"
            align="right"
            unlink-panels
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          >
          </el-date-picker>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitBatchEdit">确 定</el-button>
        <el-button @click="cancelBatchEdit">取 消</el-button>
      </div>
    </el-dialog>

  </div>
</template>

<script>
import { listPoint, getPoint, delPoint, addPoint, addPointBatch, updatePoint } from "@/api/platform/point";
import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '../../../api/platform/region'

export default {
  name: "Point",
  data() {
    return {
      // 批量修改表单
      batchEditForm: {
        ids: [],
        unitId: null,
        timezone: null,
        startTime: null,
        endTime: null
      },
      // 批量修改弹窗
      batchOpen: false,
      props: { multiple: true },
      regionList: [],
      // 正在修改第几个
      editingIndex: null,
      // 遮罩层
@@ -289,20 +294,62 @@
        pointName: [
          { required: true, message: "点位名称不能为空", trigger: "blur" }
        ],
        timezone: [
          { required: true, message: "点位时区不能为空", trigger: "blur" }
        region: [
          { required: true, message: "点位所在地不能为空", trigger: "change" }
        ],
        unitId: [
          { required: true, message: "运维单位不能为空", trigger: "change" }
        deptName: [
          { required: true, message: "监管部门不能为空", trigger: "change" }
        ],
        category: [
          { required: true, message: "设备类型", trigger: "change" }
        ],
      },
      // 批量表单校验
      batchRules: {
        ids: [
          { required: true, message: "请选择点位", trigger: "change" }
        ]
      }
    };
  },
  created() {
    this.getList();
    this.getUnitSelect();
    this.getCascader();
  },
  methods: {
    // 点位导入
    handleImportPoint() {

    },
    cos(value) {
      console.log(value)
    },
    // 提交批量修改
    submitBatchEdit() {
      this.batchEditForm.ids = this.batchEditForm.ids.map(array => array[array.length - 1]);
      if (this.batchEditForm.timezone) {
        this.batchEditForm.startTime = this.batchEditForm.timezone[0];
        this.batchEditForm.endTime = this.batchEditForm.timezone[1];
      }
    },
    // 取消批量修改
    cancelBatchEdit() {
      this.batchOpen = false;
    },
    // 批量修改
    handleEditBatch() {
      this.batchOpen = true;
    },
    removeRegion(item) {
      this.tempFormList = this.tempFormList.filter(data => data !== item)
    },
    // 获取区县级联
    getCascader() {
      getCascader().then(res => {
        this.regionList = res.data;
      })
    },
    // 点位项修改完成
    editFinishItem(index) {
      this.editingIndex = null;
@@ -327,9 +374,9 @@
    },
    // 继续添加点位
    nextAdd() {
      this.formList.push(this.tempForm);
      this.tempFormList.push(this.tempForm);
      this.tempForm = {};
      let item = {}
      // this.formList.push(item);
      this.tempFormList.push(item);
    },
    getUnitSelect() {
      // 运维单位下拉列表
@@ -367,7 +414,8 @@
        remark: null,
        createTime: null,
        updateTime: null,
        deleted: null
        deleted: null,
        pointDetail: ""
      };
      this.resetForm("form");
    },
@@ -384,7 +432,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.single = selection.length !== 1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
@@ -400,39 +448,31 @@
      getPoint(id).then(response => {
        this.form = response.data;
        this.form.timezone = [this.form.startTime, this.form.endTime]
        this.editOpen = true;
        if (this.form.pointDetail) {
          this.tempFormList = JSON.parse(this.form.pointDetail)
        }
        this.open = true;
        this.title = "修改运维点位";
      });
    },
    /** 提交按钮 */
    submitForm() {
      if (this.formList.length > 0) {
        // 批量增加
        if (this.formList.every(item => !item.hasOwnProperty("id"))) {
          addPointBatch(this.formList).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            // 重置
            this.tempForm = {};
            this.tempFormList = [];
            this.formList = [];
            this.getList();
          });
        }
      }else {
        if (this.form.id != null) {
          updatePoint(this.form).then(response => {
            this.$modal.msgSuccess("修改成功");
            this.editOpen = false;
            this.getList();
          });
        } else {
          addPoint(this.form).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
        }
      if (this.tempFormList) {
        this.form.pointDetail = JSON.stringify(this.tempFormList)
      }
      if (this.form.id != null) {
        updatePoint(this.form).then(response => {
          this.$modal.msgSuccess("修改成功");
          this.open = false;
          this.getList();
        });
      } else {
        addPoint(this.form).then(response => {
          this.$modal.msgSuccess("新增成功");
          this.open = false;
          this.reset()
          this.getList();
        });
      }
    },
    /** 删除按钮操作 */
@@ -443,7 +483,8 @@
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
      }).catch(() => {
      });
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -456,16 +497,11 @@
</script>

<style scoped>
.point-row {
.col-item {
  margin: 5px 0;
  display: flex;
  flex-direction: row;
  align-content: center;
  justify-content: center;
  align-items: center;
}
.row-item {
  margin-right: 5px;
}
.row-item:nth-last-child {
  margin-right: 0;
}
</style>