Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-07 0f9f70d05e3739d657f8047675f2b12def44525e

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/system/point/index.vue

 src/views/system/point/index.vue

@@ -80,9 +80,16 @@
    <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="点位名称" prop="pointName" width="200" show-overflow-tooltip/>
      <el-table-column label="标签" align="center" width="90" show-overflow-tooltip>
      <el-table-column label="重点标签" align="center" width="90" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
          <div v-if="scope.row.importantTag === 'important'">重点点位</div>
          <div v-else-if="scope.row.importantTag === 'normal'">普通点位</div>
        </template>
      </el-table-column>
      <el-table-column label="省厅标签" align="center" width="90" show-overflow-tooltip>
        <template slot-scope="scope">
          <div v-if="scope.row.provinceTag === 'province'">省厅点位</div>
          <div v-else-if="scope.row.provinceTag === 'normal'">普通点位</div>
        </template>
      </el-table-column>
      <el-table-column label="点位开始时间" align="center" prop="startTime" width="140">
@@ -117,6 +124,18 @@
      <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="importantTag">
          <el-select v-model="form.importantTag" placeholder="重点标签" clearable>
            <el-option label="重点点位" value="important" />
            <el-option label="普通点位" value="normal" />
          </el-select>
        </el-form-item>
        <el-form-item label="省厅标签" prop="provinceTag">
          <el-select v-model="form.provinceTag" placeholder="省厅标签" clearable>
            <el-option label="省厅点位" value="province" />
            <el-option label="普通点位" value="normal" />
          </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>-->
@@ -387,7 +406,8 @@
        createTime: null,
        updateTime: null,
        deleted: null,
        pointTag: []
        importantTag: null,
        provinceTag: null
      };
      this.resetForm("form");
    },
@@ -419,11 +439,11 @@
      const id = row.id || this.ids
      getPoint(id).then(response => {
        this.form = response.data;
        this.form.pointTag = response.data.pointTags;
        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 = "修改运维点位";
      });
    },