Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-07 9979b58671ff78026be0bacdc246872e6ed76703

 src/views/system/point/index.vue

@@ -34,12 +34,22 @@
      </el-col>
      <el-col :span="1.5">
        <el-popover>
          <div>
            <el-select v-model="importUnitId" size="small" placeholder="负责单位">
          <div class="bottom_">
            <el-select 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>
          <div class="bottom_">
            <el-date-picker
              size="small"
              v-model="ywTimes"
              type="daterange"
              range-separator="至"
              start-placeholder="运维开始时间"
              end-placeholder="运维结束时间">
            </el-date-picker>
          </div>
          <div class="bottom_">
            <el-upload
              ref="upload"
              class="upload-demo"
@@ -54,7 +64,7 @@
            </el-upload>
          </div>
          <div>
            <el-button type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile"  @click="handleImport" style="width: 100%; margin-top: 5px"
            <el-button class="bottom_" type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile || ! this.ywTimes || this.ywTimes.length < 2"  @click="handleImport"
                       v-hasPermi="['point:import']">导入</el-button>
          </div>
          <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">导入点位</el-button>
@@ -82,15 +92,9 @@
          <div v-else-if="scope.row.provinceTag === 'normal'">普通点位</div>
        </template>
      </el-table-column>
      <el-table-column label="点位开始时间" align="center" prop="startTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
        </template>
      <el-table-column label="点位开始时间" align="center" prop="startTime" width="140">
      </el-table-column>
      <el-table-column label="点位结束时间" align="center" prop="endTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
        </template>
      <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" />
@@ -134,15 +138,25 @@
            :props="{ checkStrictly: true }">
          </el-cascader>
        </el-form-item>
        <el-form-item label="点位标签" prop="pointTag">
          <el-select v-model="form.pointTag" placeholder="点位标签" multiple clearable>
            <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
          </el-select>
        </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 @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
                          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
        <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">
@@ -169,7 +183,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="运维时间段" prop="timezone">
          <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
          <el-date-picker v-model="batchEditForm.timezone" type="daterange" align="right"
                          unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
@@ -194,6 +208,8 @@
  dicts: ['point_tag'],
  data() {
    return {
      timezone: [],
      ywTimes: [],
      fileList: [],
      importFile: null,
      importUrl: '',
@@ -249,9 +265,6 @@
        pointName: [
          { required: true, message: "点位名称不能为空", trigger: "blur" }
        ],
        pointTag: [
          { required: true, message: "点位标签不能为空", trigger: "change" }
        ],
        deptId: [
          { required: true, message: "监管部门不能为空", trigger: "change" }
        ],
@@ -281,12 +294,19 @@
    },
    // 点位导入
    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])
      importData(formData, this.importUnitId).then(res => {
        this.$message.success("导入成功")
        this.upload = false
        this.getList()
      })
    },
    // 点位导出
@@ -339,12 +359,6 @@
      cascader().then(res => {
        this.deptOptions = res.data;
      })
    },

    // 时间选择发生变化
    dateChange() {
      this.tempForm.startTime = this.tempForm.timezone[0];
      this.tempForm.endTime = this.tempForm.timezone[1];
    },
    getUnitSelect() {
      // 运维单位下拉列表
@@ -413,6 +427,7 @@
        this.form = response.data;
        this.form.deptId = response.data.deptIds
        this.form.category = this.form.category + ''
        this.timezone = [response.data.startTime, response.data.endTime]
        this.open = true;
        console.log(this.form)
        this.title = "修改运维点位";
@@ -464,6 +479,10 @@
</script>

<style scoped>
.bottom_ {
  width: 100%;
  margin-bottom: 5px;
}
.col-item {
  margin: 5px 0;
  display: flex;