chore:合并分支

ZhangXianQiang

2024-04-26 319d2d82e78cfaf951178f238e9bb2a9ecafb9c6

 src/views/system/point/index.vue

@@ -32,15 +32,15 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
        >新增</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="primary"-->
<!--          plain-->
<!--          icon="el-icon-plus"-->
<!--          size="mini"-->
<!--          @click="handleAdd"-->
<!--        >新增</el-button>-->
<!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="success"
@@ -49,6 +49,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['point:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -59,6 +60,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['point:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -68,6 +70,7 @@
          icon="el-icon-top"
          size="mini"
          @click="handleImportPoint"
          v-hasPermi="['point:import']"
        >导入点位</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -77,6 +80,7 @@
          icon="el-icon-receiving"
          size="mini"
          @click="handleEditBatch"
          v-hasPermi="['point:edit']"
        >批量修改</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -84,7 +88,10 @@

    <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="点位名称" align="center" prop="pointName" />
      <el-table-column label="点位类型" align="center" prop="pointType" />
      <el-table-column label="标签" align="center" prop="tag" >
        <span>{{important}}</span>
      </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>
@@ -113,12 +120,14 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['point:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['point:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
@@ -137,6 +146,12 @@
      <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="tag">
          <el-select v-model="form.tag"  placeholder="点位标签">
            <el-option label="普通点位" value="普通点位"/>
            <el-option label="重点点位" value="重点点位"/>
          </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>
@@ -249,6 +264,7 @@
      editingIndex: null,
      // 遮罩层
      loading: true,
      important: '重点点位',
      // 选中数组
      ids: [],
      // 非单个禁用