配瓦规则颜色设置

cl

2024-02-02 e0a2b80807cc52e80bf632adba9cfcb6357025aa

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

@@ -10,38 +10,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
<!--        <el-form-item label="扫码对象1" prop="scanObject1">-->
<!--          <el-input-->
<!--            v-model="queryParams.scanObject1"-->
<!--            placeholder="请输入扫码对象1"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="扫码对象2" prop="scanObject2">-->
<!--          <el-input-->
<!--            v-model="queryParams.scanObject2"-->
<!--            placeholder="请输入扫码对象2"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="轴名称" prop="axisName">-->
<!--          <el-input-->
<!--            v-model="queryParams.axisName"-->
<!--            placeholder="请输入轴名称"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="颈名称" prop="neckName">-->
<!--          <el-input-->
<!--            v-model="queryParams.neckName"-->
<!--            placeholder="请输入颈名称"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->

        <el-form-item label="瓦名称" prop="tileName">
          <el-input
            v-model="queryParams.tileName"
@@ -50,73 +19,29 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
<!--        <el-form-item label="轴参数数位置" prop="axisParameterNoPosition">-->
<!--          <el-input-->
<!--            v-model="queryParams.axisParameterNoPosition"-->
<!--            placeholder="请输入轴参数数位置"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="颈参数数位置" prop="neckParameterPosition">-->
<!--          <el-input-->
<!--            v-model="queryParams.neckParameterPosition"-->
<!--            placeholder="请输入颈参数数位置"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="轴值" prop="axisValue">-->
<!--          <el-input-->
<!--            v-model="queryParams.axisValue"-->
<!--            placeholder="请输入轴值"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="颈值" prop="neckValue">-->
<!--          <el-input-->
<!--            v-model="queryParams.neckValue"-->
<!--            placeholder="请输入颈值"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="瓦颜色" prop="tileColor">-->
<!--          <el-input-->
<!--            v-model="queryParams.tileColor"-->
<!--            placeholder="请输入瓦颜色"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input-->
<!--            v-model="queryParams.createUser"-->
<!--            placeholder="请输入创建用户"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="更改用户" prop="updateUser">-->
<!--          <el-input-->
<!--            v-model="queryParams.updateUser"-->
<!--            placeholder="请输入更改用户"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->

        <el-form-item label="状态" prop="state">
          <el-input
            v-model="queryParams.state"
            placeholder="请输入状态"
            clearable
            @keyup.enter.native="handleQuery"
          />
          <el-select v-model="queryParams.state" placeholder="请选择状态" clearable>
            <el-option
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item style="float: right">
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
        <el-form-item  label="颈名称" prop="neckName">
          <el-input v-model="queryParams.neckName" placeholder="请输入颈名称" clearable @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label="轴名称" prop="axisName">
          <el-input v-model="queryParams.axisName" placeholder="请输入轴名称" clearable @keyup.enter.native="handleQuery"/>
        </el-form-item>
      </el-form>
    </el-card>
@@ -171,38 +96,30 @@
      <el-table border v-loading="loading" :data="tileMatchRulesList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
<!--        <el-table-column label="主键id" align="center" prop="id" />-->
        <el-table-column label="产品系列" align="center" prop="productSeries">

        <el-table-column label="产品系列" align="center" prop="productSeries" width="90">
        </el-table-column>
        <el-table-column label="扫码对象1" align="center" prop="scanObject1">

        <el-table-column label="扫码对象1" align="center" prop="scanObject1" width="90">
        </el-table-column>
        <el-table-column label="扫码对象2" align="center" prop="scanObject2">

        <el-table-column label="扫码对象2" align="center" prop="scanObject2" width="90">
        </el-table-column>
        <el-table-column label="轴名称" align="center" prop="axisName">

        </el-table-column>
        <el-table-column label="颈名称" align="center" prop="neckName">

        </el-table-column>
        <el-table-column label="瓦名称" align="center" prop="tileName">

        </el-table-column>
        <el-table-column label="轴参数位置" align="center" prop="axisParameterNoPosition" width="160">

        <el-table-column label="轴参数位置" align="center" prop="axisParameterNoPosition" width="90">
        </el-table-column>
        <el-table-column label="颈参数位置" align="center" prop="neckParameterPosition" width="160">

        <el-table-column label="颈参数位置" align="center" prop="neckParameterPosition" width="90">
        </el-table-column>
        <el-table-column label="轴值" align="center" prop="axisValue">

        </el-table-column>
        <el-table-column label="颈值" align="center" prop="neckValue">

        </el-table-column>
        <el-table-column label="瓦颜色" align="center" prop="tileColor">

        <el-table-column label="瓦颜色" align="center" prop="tileColor" >
          <template slot-scope="scope">
            <dict-tag :options="dict.type.colour_hex" :value="scope.row.tileColor" :style="{ backgroundColor: scope.row.tileColor }"/>
          </template>
        </el-table-column>
<!--        <el-table-column label="创建用户" align="center" prop="createUser">-->

@@ -211,7 +128,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">
@@ -247,12 +166,12 @@
    />

    <!-- 添加或修改配瓦规则对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-form ref="form"  inline :model="form" :rules="rules" label-width="80px">
        <el-form-item label="产品系列" prop="productSeries">
          <el-input v-model="form.productSeries" placeholder="请输入产品系列" />
        </el-form-item>
@@ -271,10 +190,10 @@
        <el-form-item label="瓦名称" prop="tileName">
          <el-input v-model="form.tileName" placeholder="请输入瓦名称" />
        </el-form-item>
        <el-form-item label="轴参数位置" prop="axisParameterNoPosition">
          <el-input v-model="form.axisParameterNoPosition" placeholder="请输入轴参数位置" />
        <el-form-item label="轴参数位置" prop="axisParameterNoPosition"  label-width="120">
          <el-input v-model="form.axisParameterNoPosition" placeholder="请输入轴参数位置"  />
        </el-form-item>
        <el-form-item label="颈参数位置" prop="neckParameterPosition">
        <el-form-item label="颈参数位置" prop="neckParameterPosition"  label-width="120">
          <el-input v-model="form.neckParameterPosition" placeholder="请输入颈参数位置" />
        </el-form-item>
        <el-form-item label="轴值" prop="axisValue">
@@ -283,17 +202,37 @@
        <el-form-item label="颈值" prop="neckValue">
          <el-input v-model="form.neckValue" placeholder="请输入颈值" />
        </el-form-item>
        <el-form-item label="瓦颜色" prop="tileColor">
<!--        <el-form-item label="瓦颜色" prop="tileColor">
          <el-input v-model="form.tileColor" placeholder="请输入瓦颜色" />
        </el-form-item>-->
<!--        <el-form-item label="瓦颜色" prop="tileColor" required>
          <el-color-picker v-model="form.tileColor" size="medium"></el-color-picker>
        </el-form-item>-->
        <el-form-item label="瓦颜色" prop="tileColor">
          <el-select v-model="form.tileColor" placeholder="请选择状态">
            <el-option
              v-for="dict in dict.type.colour_hex"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="创建用户" prop="createUser">
          <el-input v-model="form.createUser" placeholder="请输入创建用户" />
        </el-form-item>
        <el-form-item label="更改用户" prop="updateUser">
          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />
        </el-form-item>
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input v-model="form.createUser" placeholder="请输入创建用户" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="更改用户" prop="updateUser">-->
<!--          <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,8 +248,10 @@

export default {
  name: "TileMatchRules",
  dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable','colour_hex'],
  data() {
    return {
      advancedShowSearch: false,
      // 遮罩层
      loading: true,
      titleName: "",
@@ -356,6 +297,36 @@
        id: [
          { required: true, message: "主键id不能为空", trigger: "blur" }
        ],
        productSeries: [
          { required: true, message: "产品系列不能为空", trigger: "blur" }
        ],
        axisName: [
          { required: true, message: "轴名称不能为空", trigger: "blur" }
        ],
        neckName: [
          { required: true, message: "颈名称不能为空", trigger: "blur" }
        ],
        tileName: [
          { required: true, message: "瓦名称不能为空", trigger: "blur" }
        ],
        axisParameterNoPosition: [
          { required: true, message: "轴参数位置不能为空", trigger: "blur" }
        ],
        neckParameterPosition: [
          { required: true, message: "颈参数位置不能为空", trigger: "blur" }
        ],
        axisValue: [
          { required: true, message: "轴值不能为空", trigger: "blur" }
        ],
        neckValue: [
          { required: true, message: "颈值不能为空", trigger: "blur" }
        ],
        tileColor: [
          { required: true, message: "瓦值不能为空", trigger: "blur" }
        ],
        state: [
          { required: true, message: "状态不能为空", trigger: "blur" }
        ]
      }
    };
  },
@@ -363,6 +334,9 @@
    this.getList();
  },
  methods: {
    advancedQuery(){
      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
    },
    /** 查询配瓦规则列表 */
    getList() {
      this.loading = true;