|
@@ -17,34 +17,34 @@
|
|
|
@click="toAdd"
|
|
|
>新增</el-button
|
|
|
>
|
|
|
- <el-table
|
|
|
- :data="tableData"
|
|
|
- border
|
|
|
-
|
|
|
- >
|
|
|
- <el-table-column prop="taskCode" label="任务编号" />
|
|
|
- <el-table-column prop="prodtModel" label="产品型号" />
|
|
|
- <el-table-column prop="operationName" label="工序名称" />
|
|
|
- <el-table-column prop="source" label="采集数据源" />
|
|
|
+ <el-table :data="tableData" border>
|
|
|
+ <el-table-column align="center" prop="taskCode" label="任务编号" />
|
|
|
+ <el-table-column align="center" prop="prodtModel" label="产品型号" />
|
|
|
+ <el-table-column align="center" prop="operationName" label="工序名称" />
|
|
|
+ <el-table-column align="center" prop="source" label="采集数据源" />
|
|
|
<!-- <el-table-column prop="param" label="控制参数" />-->
|
|
|
<!-- <el-table-column prop="chart" label="控制图" />-->
|
|
|
- <el-table-column prop="address" label="预警规则">
|
|
|
- <template #default="{ row }">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- class="btn"
|
|
|
- style="height: 25px"
|
|
|
- link
|
|
|
- @click="toRuler(row)"
|
|
|
- >编辑</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="processCount" label="工序采集点数" />
|
|
|
+ <!-- <el-table-column prop="address" label="预警规则">-->
|
|
|
+ <!-- <template #default="{ row }">-->
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- type="primary"-->
|
|
|
+ <!-- class="btn"-->
|
|
|
+ <!-- style="height: 25px"-->
|
|
|
+ <!-- link-->
|
|
|
+ <!-- @click="toRuler(row)"-->
|
|
|
+ <!-- >编辑</el-button-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ prop="processCount"
|
|
|
+ label="工序采集点数"
|
|
|
+ />
|
|
|
<!-- <el-table-column prop="centralValue" label="中心值" />-->
|
|
|
<!-- <el-table-column prop="upperLimit" label="上限" />-->
|
|
|
<!-- <el-table-column prop="floor" label="下限" />-->
|
|
|
- <el-table-column prop="created" label="创建时间" />
|
|
|
+ <el-table-column align="center" prop="created" label="创建时间" />
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
width="160"
|
|
@@ -97,16 +97,19 @@
|
|
|
<el-form-item label="任务编号" prop="taskCode">
|
|
|
<el-input v-model="formData.taskCode" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="产品型号" prop="Index1">
|
|
|
- <el-select v-model="formData.Index1">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in opInfoData"
|
|
|
- :key="index"
|
|
|
- :label="item.prodtModel"
|
|
|
- :value="index"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
+ <el-form-item label="产品型号" prop="prodtModel">
|
|
|
+ <el-input v-model="formData.prodtModel" />
|
|
|
</el-form-item>
|
|
|
+ <!-- <el-form-item label="产品型号" prop="Index1">-->
|
|
|
+ <!-- <el-select v-model="formData.Index1">-->
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- v-for="(item, index) in opInfoData"-->
|
|
|
+ <!-- :key="index"-->
|
|
|
+ <!-- :label="item.prodtModel"-->
|
|
|
+ <!-- :value="index"-->
|
|
|
+ <!-- />-->
|
|
|
+ <!-- </el-select>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
<el-form-item label="工序名称" prop="Index2">
|
|
|
<el-select v-model="formData.Index2">
|
|
|
<el-option
|
|
@@ -240,7 +243,7 @@ const toRuler = (row) => {
|
|
|
router.push({ name: "SPCrules" });
|
|
|
};
|
|
|
const getData = async (obj) => {
|
|
|
- console.log("222222222222222222")
|
|
|
+ console.log("222222222222222222");
|
|
|
const { data, code } = await getTableData({
|
|
|
...searchRef.value.searchForm,
|
|
|
pageNo: currentOption.page,
|
|
@@ -263,7 +266,7 @@ const rules = {
|
|
|
message: "请输入任务编号",
|
|
|
},
|
|
|
],
|
|
|
- Index1: [
|
|
|
+ prodtModel: [
|
|
|
{
|
|
|
required: true,
|
|
|
message: "请选择产品型号",
|
|
@@ -383,8 +386,8 @@ const reset = () => {
|
|
|
limit: 10,
|
|
|
pageSizes: [10, 20, 30, 40, 50],
|
|
|
};
|
|
|
- console.log(currentOption.value, "currentOption.value")
|
|
|
- console.log("11111111111111111")
|
|
|
+ console.log(currentOption.value, "currentOption.value");
|
|
|
+ console.log("11111111111111111");
|
|
|
};
|
|
|
|
|
|
const resetData = () => {
|
|
@@ -400,10 +403,7 @@ const toSubmit = async () => {
|
|
|
chart: formData.value.chart,
|
|
|
operationCode: opOptions.value[formData.value.Index2].dictValue,
|
|
|
operationName: opOptions.value[formData.value.Index2].dictLabel,
|
|
|
- prodtCode: opInfoData.value[formData.value.Index1].prodtCode,
|
|
|
- prodtModel: opInfoData.value[formData.value.Index1].prodtModel,
|
|
|
- prodtName: opInfoData.value[formData.value.Index1].prodtName,
|
|
|
- unit: opInfoData.value[formData.value.Index1].unit,
|
|
|
+ prodtModel: formData.value.prodtModel,
|
|
|
param: formData.value.param,
|
|
|
source: formData.value.source,
|
|
|
processCount: formData.value.processCount,
|