Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-06 9e8d1bd0b6fb495920921214775b84d490e032a3

 src/views/system/point/index.vue

@@ -29,37 +29,42 @@
          v-hasPermi="['point:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
        <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport"
                   v-hasPermi="['point:export']">导出点位</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-popover>
          <p>导入点位只做更新操作</p>
          <div class="bottom_">
            <el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="运维单位">
            <p>导入点位只做更新操作</p>
          </div>
          <div class="bottom_">
            <el-switch
              v-model="needUpdateUnit"
              active-text="修改运维单位/时间"
              inactive-text="不修改运维单位/时间">
            </el-switch>
          </div>
          <div class="bottom_" v-show="needUpdateUnit">
            <el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="更换运维单位">
              <el-option v-for="unit in unitList" :key="unit.id" :label="unit.value" :value="unit.id"></el-option>
            </el-select>
          </div>
          <div class="bottom_">
          <div class="bottom_" v-show="needUpdateUnit">
            <el-select @change="showTimeRange" v-model="contractId" size="small" placeholder="运维合同" :disabled="! importUnitId">
              <el-option v-for="(time, index) in timeList" :key="index" :label="time.name" :value="time.id"></el-option>
            </el-select>
            <span style="margin-left: 10px;color: #8a8989" v-show="importUnitId">该单位有{{timeList.length}}个合同</span>
          </div>
          <div class="bottom_">
          <div class="bottom_" v-show="needUpdateUnit">
            <el-date-picker
              :disabled="! contractId"
              size="small"
              v-model="ywTimes"
              type="daterange"
              range-separator="至"
              start-placeholder="运维开始时间"
              end-placeholder="运维结束时间">
              start-placeholder="更换运维时间"
              end-placeholder="更换运维时间">
            </el-date-picker>
          </div>
          <div class="bottom_">
            <el-checkbox v-model="provinceTag">省厅</el-checkbox>
            <el-checkbox v-model="importantCommandImageTag">重点指挥图像</el-checkbox>
          </div>
          <div class="bottom_">
            <el-upload
@@ -76,10 +81,10 @@
            </el-upload>
          </div>
          <div>
            <el-button class="bottom_" type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile || ! this.ywTimes || this.ywTimes.length < 2"  @click="handleImport"
            <el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
                       v-hasPermi="['point:import']">导入</el-button>
          </div>
          <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">导入点位</el-button>
          <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">导入点位</el-button>
        </el-popover>
      </el-col>
<!--      <el-col :span="1.5">-->
@@ -98,9 +103,9 @@
          <div>{{ getTagText(scope.row) }}</div>
        </template>
      </el-table-column>
      <el-table-column label="点位开始时间" align="center" prop="startTime" width="140">
      <el-table-column label="运维开始时间" align="center" prop="startTime" width="140">
      </el-table-column>
      <el-table-column label="点位结束时间" align="center" prop="endTime" width="140">
      <el-table-column label="运维结束时间" align="center" prop="endTime" width="140">
      </el-table-column>
      <el-table-column label="运维单位" align="center" prop="unitName" />
      <el-table-column label="监管部门" align="center" prop="deptName" />
@@ -119,57 +124,82 @@
      @pagination="getList" />

    <!-- 添加运维点位对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
        <el-form-item label="点位名称" prop="pointName">
          <el-input v-model="form.pointName" placeholder="请输入点位名称" />
        </el-form-item>
        <el-form-item label="重点标签" prop="importantTag">
          <el-select v-model="form.importantTag" placeholder="重点标签" clearable>
            <el-option label="重点点位" :value="true" />
            <el-option label="普通点位" :value="false" />
          </el-select>
        </el-form-item>
        <el-form-item label="省厅标签" prop="provinceTag">
          <el-select v-model="form.provinceTag" placeholder="省厅标签" clearable>
            <el-option label="省厅点位" :value="true" />
            <el-option label="普通点位" :value="false" />
          </el-select>
        </el-form-item>
        <el-form-item label="重点指挥图像标签" prop="importantCommandImageTag">
          <el-select v-model="form.importantCommandImageTag" placeholder="重点指挥图像标签" clearable>
            <el-option label="重点指挥图像点位" :value="true" />
            <el-option label="普通点位" :value="false" />
          </el-select>
        </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="deptId">
          <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
            :props="{ checkStrictly: true }">
          </el-cascader>
        </el-form-item>
        <el-form-item label="运维单位" prop="unitId">
          <el-select v-model="form.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
            size="small"
            v-model="timezone"
            type="daterange"
            range-separator="至"
            start-placeholder="运维开始时间"
            end-placeholder="运维结束时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="点位备注" prop="remark">
          <el-input type="textarea" v-model="form.remark"/>
        </el-form-item>
      </el-form>
    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
      <div style="display: flex;flex-direction: row">
        <div style="flex: 5; border-right: 1px solid #d3d3d3; padding-right: 10px">
          <el-form ref="form" :model="form" :rules="rules" label-width="130px">
            <el-form-item label="点位名称" prop="pointName">
              <el-input v-model="form.pointName" placeholder="请输入点位名称" />
            </el-form-item>
            <el-form-item label="监管部门" prop="deptId">
              <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
                           :props="{ checkStrictly: true }">
              </el-cascader>
            </el-form-item>
            <el-form-item label="运维单位" prop="unitId">
              <el-select v-model="form.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
                size="small"
                v-model="timezone"
                type="daterange"
                range-separator="至"
                start-placeholder="运维开始时间"
                end-placeholder="运维结束时间">
              </el-date-picker>
            </el-form-item>
            <el-form-item label="点位备注" prop="remark">
              <el-input type="textarea" v-model="form.remark"/>
            </el-form-item>
          </el-form>
        </div>
        <div style="flex: 5">
          <el-form ref="form" :model="form" :rules="rules" label-width="130px">
            <el-form-item label="重点:" prop="importantTag">
              <el-switch
                v-model="form.importantTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="重点点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
            <el-form-item label="省厅:" prop="provinceTag">
              <el-switch
                v-model="form.provinceTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="省厅点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
            <el-form-item label="部级:" prop="deptTag">
              <el-switch
                v-model="form.deptTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="部级点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
            <el-form-item label="重点指挥图像:" prop="importantCommandImageTag">
              <el-switch
                v-model="form.importantCommandImageTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="重点指挥图像点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
          </el-form>

        </div>
      </div>

      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -212,9 +242,10 @@

export default {
  name: "Point",
  dicts: ['point_tag'],
  dicts: ['point_tag', 'area_code'],
  data() {
    return {
      needUpdateUnit: false,
      importantTag: false,
      provinceTag: false,
      importantCommandImageTag: false,
@@ -303,12 +334,13 @@
      let text = '';

      // 检查每个标签，如果为true，则添加到text中
      if (row.importantTag) text += '重点点位 ';
      if (row.provinceTag) text += '省厅点位 ';
      if (row.importantCommandImageTag) text += '重点指挥图像 ';

      if (row.importantTag) text += '重点点位、';
      if (row.provinceTag) text += '省厅点位、';
      if (row.importantCommandImageTag) text += '重点指挥图像、';
      if (row.deptTag) text += '部级、';
      text === '' ? '普通点位' : text
      // 返回拼接后的文本和固定文字
      return text ==='' ? '普通点位' : text
      return text.replace(/、$/, '')
    },
    getUnitContractTime(unitId) {
      this.ywTimes = []
@@ -333,19 +365,14 @@
    },
    // 点位导入
    handleImport() {
      if (! this.ywTimes || this.ywTimes.length < 2) {
        this.$message.error("请选择运维时间")
        return
      }
      this.upload =true;
      let formData = new FormData()
      formData.append("file", this.importFile)
      formData.append("startTime", this.ywTimes[0])
      formData.append("endTime", this.ywTimes[1])
      formData.append("provinceTag", this.provinceTag)
      formData.append("importantTag", this.importantTag)
      formData.append("importantCommandImageTag", this.importantCommandImageTag)
      importData(formData, this.importUnitId).then(res => {
      formData.append("startTime", this.ywTimes[0] ? this.ywTimes[0] : '')
      formData.append("endTime", this.ywTimes[1] ? this.ywTimes[1] : '')
      formData.append("unitId", this.importUnitId ? this.importUnitId : -1)
      formData.append("needUpdateUnit", this.needUpdateUnit)
      importData(formData).then(res => {
        this.$message.success("导入成功")
        this.upload = false
        this.getList()
@@ -434,8 +461,9 @@
        createTime: null,
        updateTime: null,
        deleted: null,
        importantTag: null,
        provinceTag: null
        importantTag: false,
        provinceTag: false,
        deptTag: false,
      };
      this.resetForm("form");
    },
@@ -523,7 +551,7 @@
<style scoped>
.bottom_ {
  width: 100%;
  margin-bottom: 5px;
  margin-bottom: 8px;
}
.col-item {
  margin: 5px 0;