hdy
2024-11-22 f4691010c2651a337c47c2fa8cf1d527b12f9737
参数采集配置界面优化
已修改2个文件
188 ■■■■■ 文件已修改
billion-ui/src/views/main/sc/collectionParamConf/index.vue 187 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-ui/src/views/main/sc/opcConf/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-ui/src/views/main/sc/collectionParamConf/index.vue
@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="产品编码" prop="productCode">
      <el-form-item label-width="75px" label="产品编码" prop="productCode">
        <el-input
          v-model="queryParams.productCode"
          placeholder="请输入产品编码"
@@ -9,7 +9,7 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="工位编码" prop="locationCode">
      <el-form-item  label="工位编码" prop="locationCode">
        <el-input
          v-model="queryParams.locationCode"
          placeholder="请输入工位编码"
@@ -17,39 +17,8 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="参数编码" prop="paramCode">
        <el-input
          v-model="queryParams.paramCode"
          placeholder="请输入参数编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="参数名称" prop="paramName">
        <el-input
          v-model="queryParams.paramName"
          placeholder="请输入参数名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="参数集编码" prop="paramSetCode">
        <el-input
          v-model="queryParams.paramSetCode"
          placeholder="请输入参数集编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="参数集名称" prop="paramSetName">
        <el-input
          v-model="queryParams.paramSetName"
          placeholder="请输入参数集名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="采集地址" prop="node">
      <el-form-item  label="采集地址" prop="node">
        <el-input
          v-model="queryParams.node"
          placeholder="请输入采集地址"
@@ -57,58 +26,47 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="单位" prop="unit">
        <el-input
          v-model="queryParams.unit"
          placeholder="请输入单位"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="上限值" prop="paramUpper">
        <el-input
          v-model="queryParams.paramUpper"
          placeholder="请输入上限值"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="下限值" prop="paramLower">
        <el-input
          v-model="queryParams.paramLower"
          placeholder="请输入下限值"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="中心值" prop="paramCentral">
        <el-input
          v-model="queryParams.paramCentral"
          placeholder="请输入中心值"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="显示顺序" prop="orderNum">
        <el-input
          v-model="queryParams.orderNum"
          placeholder="请输入显示顺序"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="是否订阅" prop="subscribe">
        <el-input
          v-model="queryParams.subscribe"
          placeholder="请输入是否订阅"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <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 icon="el-icon-setting" size="mini" @click="toggleAdvancedSearch">高级查询</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
      <transition name="fade">
        <div v-if="advancedSearchVisible" class="advanced-search">
          <el-form-item label="参数编码" prop="paramCode">
            <el-input
              v-model="queryParams.paramCode"
              placeholder="请输入参数编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="参数名称" prop="paramName">
            <el-input
              v-model="queryParams.paramName"
              placeholder="请输入参数名称"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label-width="90px" label="参数集编码" prop="paramSetCode">
            <el-input
              v-model="queryParams.paramSetCode"
              placeholder="请输入参数集编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label-width="90px" label="参数集名称" prop="paramSetName">
            <el-input
              v-model="queryParams.paramSetName"
              placeholder="请输入参数集名称"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </div>
      </transition>
    </el-form>
    <el-row :gutter="10" class="mb8">
@@ -157,9 +115,8 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
    <el-table v-loading="loading" border :data="collectionParamConfList" @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="productCode" />
      <el-table-column label="产品型号" align="center" prop="productType" />
      <el-table-column label="工位编码" align="center" prop="locationCode" />
@@ -173,20 +130,27 @@
      <el-table-column label="上限值" align="center" prop="paramUpper" />
      <el-table-column label="下限值" align="center" prop="paramLower" />
      <el-table-column label="中心值" align="center" prop="paramCentral" />
      <el-table-column label="显示顺序" align="center" prop="orderNum" />
      <el-table-column label="是否订阅" align="center" prop="subscribe" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="是否订阅" align="center" prop="subscribe" >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.subscribe"/>
        </template>
      </el-table-column>
      <el-table-column width="200px" label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            style="width: 72px"
            type="success"
            plain
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['sc:collectionParamConf:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            style="width: 72px"
            type="danger"
            plain
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['sc:collectionParamConf:remove']"
@@ -206,47 +170,47 @@
    <!-- 添加或修改参数采集配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="产品编码" prop="productCode">
        <el-form-item label-width="90px" label="产品编码" prop="productCode">
          <el-input v-model="form.productCode" placeholder="请输入产品编码" />
        </el-form-item>
        <el-form-item label="工位编码" prop="locationCode">
        <el-form-item label-width="90px" label="工位编码" prop="locationCode">
          <el-input v-model="form.locationCode" placeholder="请输入工位编码" />
        </el-form-item>
        <el-form-item label="参数编码" prop="paramCode">
        <el-form-item label-width="90px" label="参数编码" prop="paramCode">
          <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
        </el-form-item>
        <el-form-item label="参数名称" prop="paramName">
        <el-form-item label-width="90px" label="参数名称" prop="paramName">
          <el-input v-model="form.paramName" placeholder="请输入参数名称" />
        </el-form-item>
        <el-form-item label="参数集编码" prop="paramSetCode">
        <el-form-item label-width="90px" label="参数集编码" prop="paramSetCode">
          <el-input v-model="form.paramSetCode" placeholder="请输入参数集编码" />
        </el-form-item>
        <el-form-item label="参数集名称" prop="paramSetName">
        <el-form-item label-width="90px" label="参数集名称" prop="paramSetName">
          <el-input v-model="form.paramSetName" placeholder="请输入参数集名称" />
        </el-form-item>
        <el-form-item label="采集地址" prop="node">
        <el-form-item label-width="90px" label="采集地址" prop="node">
          <el-input v-model="form.node" placeholder="请输入采集地址" />
        </el-form-item>
        <el-form-item label="单位" prop="unit">
        <el-form-item label-width="90px" label="单位" prop="unit">
          <el-input v-model="form.unit" placeholder="请输入单位" />
        </el-form-item>
        <el-form-item label="上限值" prop="paramUpper">
        <el-form-item label-width="90px" label="上限值" prop="paramUpper">
          <el-input v-model="form.paramUpper" placeholder="请输入上限值" />
        </el-form-item>
        <el-form-item label="下限值" prop="paramLower">
        <el-form-item label-width="90px" label="下限值" prop="paramLower">
          <el-input v-model="form.paramLower" placeholder="请输入下限值" />
        </el-form-item>
        <el-form-item label="中心值" prop="paramCentral">
        <el-form-item label-width="90px" label="中心值" prop="paramCentral">
          <el-input v-model="form.paramCentral" placeholder="请输入中心值" />
        </el-form-item>
        <el-form-item label="显示顺序" prop="orderNum">
          <el-input v-model="form.orderNum" placeholder="请输入显示顺序" />
        </el-form-item>
        <el-form-item label="是否订阅" prop="subscribe">
          <el-input v-model="form.subscribe" placeholder="请输入是否订阅" />
        </el-form-item>
        <el-form-item label="删除标志" prop="delFlag">
          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
          <el-radio-group v-model="form.subscribe">
            <el-radio
              v-for="dict in dict.type.sys_yes_no"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -262,8 +226,10 @@
export default {
  name: "CollectionParamConf",
  dicts: ['sys_yes_no'],
  data() {
    return {
      advancedSearchVisible: false,
      // 遮罩层
      loading: true,
      // 选中数组
@@ -313,6 +279,9 @@
    this.getList();
  },
  methods: {
    toggleAdvancedSearch() {
      this.advancedSearchVisible = !this.advancedSearchVisible;
    },
    /** 查询参数采集配置列表 */
    getList() {
      this.loading = true;
billion-ui/src/views/main/sc/opcConf/index.vue
@@ -225,7 +225,6 @@
  methods: {
    toggleAdvancedSearch() {
      this.advancedSearchVisible = !this.advancedSearchVisible;
    },
    /** 查询OPC交互配置列表 */
    getList() {