Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-24 a36d141236c0e06af4da16e8247d30915b197e32

 jcdm-ui/src/views/main/da/tileMatchRules/index.vue

@@ -211,7 +211,9 @@

<!--        </el-table-column>-->
        <el-table-column label="状态" align="center" prop="state">

          <template slot-scope="scope">
            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
          </template>
        </el-table-column>
        <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope">
@@ -293,7 +295,14 @@
          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />
        </el-form-item>
        <el-form-item label="状态" prop="state">
          <el-input v-model="form.state" placeholder="请输入状态" />
          <el-select v-model="form.state" placeholder="请选择状态">
            <el-option
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            ></el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -309,6 +318,7 @@

export default {
  name: "TileMatchRules",
  dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
  data() {
    return {
      // 遮罩层