Merge remote-tracking branch 'origin/master'

cl

9 天以前 4574d451284e3d8d23dfabae97f0804cf292c357

Merge remote-tracking branch 'origin/master'

 jcdm-ui/src/views/main/bs/workshop/index.vue

@@ -1,39 +1,39 @@
<template>
  <div class="app-container">
    <el-card class="box-card">
<!--      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
<!--        <el-form-item label="车间编码" prop="workshopCode">-->
<!--          <el-input-->
<!--            v-model="queryParams.workshopCode"-->
<!--            placeholder="请输入车间编码"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="车间名称" prop="workshopName">-->
<!--          <el-input-->
<!--            v-model="queryParams.workshopName"-->
<!--            placeholder="请输入车间名称"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item style="float: right">-->
<!--          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
<!--&lt;!&ndash;          <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>&ndash;&gt;-->
<!--          <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>-->
      <div>
        <div id="printMe">
          <div ref="canvasWrapper" id="canvasWrapper"></div>
          <p>1111</p>
        </div>
        <el-button @click="print">打印</el-button>
        <el-button @click="test1">生成二维码</el-button>
      </div>
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
        <el-form-item label="车间编码" prop="workshopCode">
          <el-input
            v-model="queryParams.workshopCode"
            placeholder="请输入车间编码"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="车间名称" prop="workshopName">
          <el-input
            v-model="queryParams.workshopName"
            placeholder="请输入车间名称"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </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>
<!--      <div>-->
<!--        <div id="printMe">-->
<!--          <div ref="canvasWrapper" id="canvasWrapper"></div>-->
<!--          <p>1111</p>-->
<!--        </div>-->
<!--        <el-button @click="print">打印</el-button>-->
<!--        <el-button @click="test1">生成二维码</el-button>-->
<!--      </div>-->
    </el-card>

    <el-card style="margin-top: 10px" class="box-card">

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

@@ -26,30 +26,30 @@
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="采集参数ID" prop="collectParameterId">-->
<!--            <el-input-->
<!--              v-model="queryParams.collectParameterId"-->
<!--              placeholder="请输入采集参数ID"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="采集参数名称" prop="collectParameterName">-->
<!--            <el-input-->
<!--              v-model="queryParams.collectParameterName"-->
<!--              placeholder="请输入采集参数名称"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="是否作为对比参数" prop="contrastParameterFlag">-->
<!--            <el-input-->
<!--              v-model="queryParams.contrastParameterFlag"-->
<!--              placeholder="请输入是否作为对比参数"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
          <el-form-item label-width="120" label="采集参数ID" prop="collectParameterId">
            <el-input
              v-model="queryParams.collectParameterId"
              placeholder="请输入采集参数ID"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label-width="140" label="采集参数名称" prop="collectParameterName">
            <el-input
              v-model="queryParams.collectParameterName"
              placeholder="请输入采集参数名称"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="对比参数" prop="contrastParameterFlag">
            <el-input
              v-model="queryParams.contrastParameterFlag"
              placeholder="请输入是否作为对比参数"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
<!--          <el-form-item label="采集参数类型" prop="collectParameterType">-->
<!--            <el-select v-model="queryParams.collectParameterType" placeholder="请选择采集参数类型" clearable>-->
<!--              <el-option-->
@@ -60,14 +60,14 @@
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
          <el-form-item label="产品编码" prop="productCode">
            <el-input
              v-model="queryParams.productCode"
              placeholder="请输入产品编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
<!--          <el-form-item label="产品编码" prop="productCode">-->
<!--            <el-input-->
<!--              v-model="queryParams.productCode"-->
<!--              placeholder="请输入产品编码"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </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-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -125,64 +125,64 @@
        <el-table border v-loading="loading" :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" width="150" prop="productCode">
<!--          <el-table-column label="产品编码" align="center" width="150" prop="productCode">-->
<!--          </el-table-column>-->
          <el-table-column label="工序编号" align="center" width="110" prop="processesCode">
          </el-table-column>
          <el-table-column label="产品型号" align="center" prop="productModel">
          <el-table-column label="采集参数ID" align="center" width="130" prop="collectParameterId">
          </el-table-column>
          <el-table-column label="工序编号" align="center" width="80" prop="processesCode">
          <el-table-column label="采集参数名称" width="250" align="center" prop="collectParameterName">
          </el-table-column>
          <el-table-column label="工序名称" width="150" align="center" prop="processesName">
          </el-table-column>
          <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress">
          <el-table-column label="采集地址" align="center" width="300" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence">
          </el-table-column>
          <el-table-column label="设备" width="150" align="center" prop="device">
          <el-table-column label="是否作为对比参数" align="center" width="130" prop="contrastParameterFlag">
          </el-table-column>
          <el-table-column label="项目" align="center" prop="project">
          </el-table-column>
<!--          <el-table-column label="项目" align="center" prop="project">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="参数集编码" align="center" width="130" prop="parameterSetCode">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="参数集名称" align="center" width="160" prop="parameterSetName">-->
<!--          </el-table-column>-->
          <el-table-column label="参数编码" align="center" width="200" prop="collectParameterId">
          </el-table-column>
          <el-table-column label="参数名称" align="center" width="200" prop="collectParameterName">
          </el-table-column>
<!--          <el-table-column label="参数编码" align="center" width="200" prop="collectParameterId">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="参数名称" align="center" width="200" prop="collectParameterName">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="是否作为对比参数" align="center" prop="contrastParameterFlag">-->
<!--          </el-table-column>-->
          <el-table-column label="参数类型" align="center" width="130" prop="collectParameterType">
          </el-table-column>
          <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit">
          </el-table-column>
          <el-table-column label="精度" align="center" prop="accuracy">
          </el-table-column>
          <el-table-column label="数组长度" align="center" prop="arrayLength">
          </el-table-column>
<!--          <el-table-column label="参数类型" align="center" width="130" prop="collectParameterType">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="精度" align="center" prop="accuracy">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="数组长度" align="center" prop="arrayLength">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="数据描述" align="center" width="160" prop="Descriptives">
          </el-table-column>-->
          <el-table-column label="上限值" align="center" prop="paramUpper">
          </el-table-column>
          <el-table-column label="下限值" align="center" prop="paramLower">
          </el-table-column>
          <el-table-column label="中心值" align="center" prop="paramCentral">
          </el-table-column>
          <el-table-column label="采集频率" width="107" align="center" prop="acquisitionFrequency">
          </el-table-column>
          <el-table-column label="业务需求部门" width="155" align="center" prop="demandDepartment">
<!--          <el-table-column label="上限值" align="center" prop="paramUpper">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="下限值" align="center" prop="paramLower">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="中心值" align="center" prop="paramCentral">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="采集频率" width="107" align="center" prop="acquisitionFrequency">-->
<!--          </el-table-column>-->
          <el-table-column label="电芯号" align="center" prop="keyNum">
          </el-table-column>
          <el-table-column label="是否采集" align="center" prop="whetherToCollect">
          </el-table-column>
          <el-table-column label="备注" :show-overflow-tooltip='true' align="center" width="160" prop="remarks">
          <el-table-column label="备注" :show-overflow-tooltip='true' align="center" prop="remarks">
          </el-table-column>
          <el-table-column label="创建用户" align="center" prop="createUser">
          </el-table-column>
          <el-table-column label="创建时间" align="center" width="160" prop="createTime">
          </el-table-column>
          <el-table-column label="更改用户" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="更改时间" align="center" width="160" prop="updateTime">
          </el-table-column>
<!--          <el-table-column label="创建用户" align="center" prop="createUser">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="创建时间" align="center" width="160" prop="createTime">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="更改用户" align="center" prop="updateUser">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="更改时间" align="center" width="160" prop="updateTime">-->
<!--          </el-table-column>-->
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button

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

@@ -2,6 +2,14 @@
  <div class="app-container">
    <el-card class="box-card">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label-width="120" label="供应商名称" prop="remarks">
            <el-input
              v-model="queryParams.remarks"
              placeholder="请输入供应商名称"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="厂商代码" prop="mfCode">
            <el-input
              v-model="queryParams.mfCode"
@@ -10,7 +18,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="产品类型代码" prop="proTypeCode">
          <el-form-item label-width="120" label="产品类型代码" prop="proTypeCode">
            <el-input
              v-model="queryParams.proTypeCode"
              placeholder="请输入产品类型代码"