返修标记

懒羊羊

2024-01-24 5fc5876a94dcbd5e9a9fb91f5e3c01211e9c2d96

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

@@ -10,38 +10,38 @@
            @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="扫码对象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,62 +50,62 @@
            @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="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"
@@ -170,14 +170,14 @@

      <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="主键id" align="center" prop="id" />-->
        <el-table-column label="产品系列" align="center" prop="productSeries">

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

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

        </el-table-column>
        <el-table-column label="轴名称" align="center" prop="axisName">
@@ -189,10 +189,10 @@
        <el-table-column label="瓦名称" align="center" prop="tileName">

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

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

        </el-table-column>
        <el-table-column label="轴值" align="center" prop="axisValue">
@@ -204,14 +204,16 @@
        <el-table-column label="瓦颜色" align="center" prop="tileColor">

        </el-table-column>
        <el-table-column label="创建用户" align="center" prop="createUser">
<!--        <el-table-column label="创建用户" align="center" prop="createUser">-->

        </el-table-column>
        <el-table-column label="更改用户" align="center" prop="updateUser">
<!--        </el-table-column>-->
<!--        <el-table-column label="更改用户" align="center" prop="updateUser">-->

        </el-table-column>
<!--        </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 +249,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="1000px" 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,11 +273,11 @@
        <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">
          <el-input v-model="form.axisParameterNoPosition" placeholder="请输入轴参数位置" />
        </el-form-item>
        <el-form-item label="颈参数数位置" prop="neckParameterPosition">
          <el-input v-model="form.neckParameterPosition" placeholder="请输入颈参数数位置" />
        <el-form-item label="颈参数位置" prop="neckParameterPosition">
          <el-input v-model="form.neckParameterPosition" placeholder="请输入颈参数位置" />
        </el-form-item>
        <el-form-item label="轴值" prop="axisValue">
          <el-input v-model="form.axisValue" placeholder="请输入轴值" />
@@ -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="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 {
      // 遮罩层