Skip to content

P
pdczt_qd
Commit 0b8100eb by jiang'yun
Options

修改

parent 943fa7e2
Showing with 501 additions and 212 deletions
src/api/system/ztxxCj.js 0 → 100644
import request from '@/utils/request'
// 查询厂家信息列表
export function listZtxxCj(query) {
return request({
url: '/system/ztxxCj/list',
method: 'get',
params: query
})
}
//厂家下拉框
export function selctListZtxxCj(query) {
return request({
url: '/system/ztxxCj/selctListZtxxCj',
method: 'get',
params: query
})
}
// 查询厂家信息详细
export function getZtxxCj(id) {
return request({
url: '/system/ztxxCj/' + id,
method: 'get'
})
}
// 新增厂家信息
export function addZtxxCj(data) {
return request({
url: '/system/ztxxCj',
method: 'post',
data: data
})
}
// 修改厂家信息
export function updateZtxxCj(data) {
return request({
url: '/system/ztxxCj',
method: 'put',
data: data
})
}
// 删除厂家信息
export function delZtxxCj(id) {
return request({
url: '/system/ztxxCj/' + id,
method: 'delete'
})
}
src/views/efficiencyAnalysis/djxx/detail/components/DataTable copy.vue
......@@ -137,9 +137,9 @@
<el-table-column label="刀翼总数" prop="tzxl01" align="center" min-width="10%" />
<el-table-column label="布齿密度" prop="tzxl02" align="center" min-width="10%" />
<el-table-column label="切削齿尺寸mm" prop="tzxl03" align="center" min-width="10%" />
<el-table-column label="切削齿负前角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="切削齿后倾角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="冠部轮廓" prop="tzxl05" align="center" min-width="10%" />
<el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" />
<!-- <el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" /> -->
</el-table>
</div>
</transition>
......@@ -542,8 +542,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="切削齿负前角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿负前角" clearable style="width: 100%">
<el-form-item label="切削齿后倾角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿后倾角" clearable style="width: 100%">
<el-option v-for="item in t04Options" :key="item.id"
:label="`${item.tzxl}(${item.tzdm})`" :value="item.id" />
</el-select>
......@@ -820,7 +820,7 @@ export default {
{ type: "刀翼总数", target: "t01Options" },
{ type: "布齿密度", target: "t02Options" },
{ type: "切削齿尺寸mm", target: "t03Options" },
{ type: "切削齿负前角°", target: "t04Options" },
{ type: "切削齿后倾角°", target: "t04Options" },
{ type: "冠部轮廓", target: "t05Options" },
{ type: "保径", target: "t06Options" }
];
......
src/views/efficiencyAnalysis/djxx/detail/components/DataTable.vue
......@@ -138,7 +138,7 @@
<el-table-column label="刀翼总数" prop="tzxl01" align="center" min-width="10%" />
<el-table-column label="布齿密度" prop="tzxl02" align="center" min-width="10%" />
<el-table-column label="切削齿尺寸mm" prop="tzxl03" align="center" min-width="10%" />
<el-table-column label="切削齿负前角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="切削齿后倾角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="冠部轮廓" prop="tzxl05" align="center" min-width="10%" />
<el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" />
</el-table>
......@@ -543,8 +543,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="切削齿负前角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿负前角" clearable style="width: 100%">
<el-form-item label="切削齿后倾角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿后倾角" clearable style="width: 100%">
<el-option v-for="item in t04Options" :key="item.id" :label="`${item.tzxl}`"
:value="item.id" />
</el-select>
......@@ -814,7 +814,7 @@ export default {
{ type: "刀翼总数", target: "t01Options" },
{ type: "布齿密度", target: "t02Options" },
{ type: "切削齿尺寸mm", target: "t03Options" },
{ type: "切削齿负前角°", target: "t04Options" },
{ type: "切削齿后倾角°", target: "t04Options" },
{ type: "冠部轮廓", target: "t05Options" },
{ type: "保径", target: "t06Options" }
];
......
src/views/efficiencyAnalysis/djzt/detail/components/DataTable.vue
......@@ -67,7 +67,7 @@
<el-table-column label="刀翼总数" prop="tzxl01" align="center" min-width="10%" />
<el-table-column label="布齿密度" prop="tzxl02" align="center" min-width="10%" />
<el-table-column label="切削齿尺寸mm" prop="tzxl03" align="center" min-width="10%" />
<el-table-column label="切削齿负前角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="切削齿后倾角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="冠部轮廓" prop="tzxl05" align="center" min-width="10%" />
<el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" />
</el-table>
......@@ -345,7 +345,7 @@ export default {
{ type: "刀翼总数", target: "t01Options" },
{ type: "布齿密度", target: "t02Options" },
{ type: "切削齿尺寸mm", target: "t03Options" },
{ type: "切削齿负前角°", target: "t04Options" },
{ type: "切削齿后倾角°", target: "t04Options" },
{ type: "冠部轮廓", target: "t05Options" },
{ type: "保径", target: "t06Options" }
];
......
src/views/efficiencyAnalysis/jcxx/components/DataTable.vue
......@@ -138,7 +138,7 @@
<el-table-column label="刀翼总数" prop="tzxl01" align="center" min-width="10%" />
<el-table-column label="布齿密度" prop="tzxl02" align="center" min-width="10%" />
<el-table-column label="切削齿尺寸mm" prop="tzxl03" align="center" min-width="10%" />
<el-table-column label="切削齿负前角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="切削齿后倾角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="冠部轮廓" prop="tzxl05" align="center" min-width="10%" />
<el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" />
</el-table>
......@@ -550,8 +550,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="切削齿负前角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿负前角" clearable style="width: 100%">
<el-form-item label="切削齿后倾角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿后倾角" clearable style="width: 100%">
<el-option v-for="item in t04Options" :key="item.id" :label="`${item.tzxl}`"
:value="item.id" />
</el-select>
......@@ -831,7 +831,7 @@ export default {
{ type: "刀翼总数", target: "t01Options" },
{ type: "布齿密度", target: "t02Options" },
{ type: "切削齿尺寸mm", target: "t03Options" },
{ type: "切削齿负前角°", target: "t04Options" },
{ type: "切削齿后倾角°", target: "t04Options" },
{ type: "冠部轮廓", target: "t05Options" },
{ type: "保径", target: "t06Options" }
];
......
src/views/engineeringData/jsha/index.vue
......@@ -139,9 +139,9 @@
<el-table-column label="刀翼总数" prop="tzxl01" align="center" min-width="10%" />
<el-table-column label="布齿密度" prop="tzxl02" align="center" min-width="10%" />
<el-table-column label="切削齿尺寸mm" prop="tzxl03" align="center" min-width="10%" />
<el-table-column label="切削齿负前角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="切削齿后倾角°" prop="tzxl04" align="center" min-width="10%" />
<el-table-column label="冠部轮廓" prop="tzxl05" align="center" min-width="10%" />
<el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" />
<!-- <el-table-column label="保径" prop="tzxl06" align="center" min-width="10%" /> -->
</el-table>
</div>
</transition>
......@@ -530,8 +530,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="切削齿负前角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿负前角" clearable style="width: 100%">
<el-form-item label="切削齿后倾角°" prop="t04">
<el-select v-model="form.t04" placeholder="请选择切削齿后倾角" clearable style="width: 100%">
<el-option v-for="item in t04Options" :key="item.id" :label="`${item.tzxl}`" :value="item.id" />
</el-select>
</el-form-item>
......@@ -543,13 +543,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="保径" prop="t06">
<el-select v-model="form.t06" placeholder="请选择保径" clearable style="width: 100%">
<el-option v-for="item in t06Options" :key="item.id" :label="`${item.tzxl}`" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</div>
</el-form>
......@@ -789,9 +789,9 @@ export default {
{ type: "刀翼总数", target: "t01Options" },
{ type: "布齿密度", target: "t02Options" },
{ type: "切削齿尺寸mm", target: "t03Options" },
{ type: "切削齿负前角°", target: "t04Options" },
{ type: "切削齿后倾角°", target: "t04Options" },
{ type: "冠部轮廓", target: "t05Options" },
{ type: "保径", target: "t06Options" }
// { type: "保径", target: "t06Options" }
];
const promises = featureTypes.map(feature =>
......
src/views/scientificDrill/designScheme/components/cjqx copy 2.vue
......@@ -39,7 +39,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -429,12 +429,12 @@ export default {
this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1150,13 +1150,13 @@ export default {
}
});
// 负前角
// 后倾角
['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
console.log(`正在添加负前角(${angle})轨道`);
console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
console.log(`正在添加后倾角(${angle})轨道`);
console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
});
// 保径
......
src/views/scientificDrill/designScheme/components/cjqx copy 3.vue
......@@ -39,7 +39,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -429,12 +429,12 @@ export default {
this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1167,13 +1167,13 @@ export default {
}
});
// 负前角
// 后倾角
['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
console.log(`正在添加负前角(${angle})轨道`);
console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
console.log(`正在添加后倾角(${angle})轨道`);
console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
});
// 保径
......
src/views/scientificDrill/designScheme/components/cjqx copy 4.vue
......@@ -34,7 +34,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -409,12 +409,12 @@ export default {
// this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
// this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
// this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
// this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
// this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
// this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
// this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
// this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
// this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
// this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
// this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
// this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
// this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
// this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
// this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
// this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
// this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1130,13 +1130,13 @@ export default {
// }
// });
// 负前角
// 后倾角
// ['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
// console.log(`正在添加负前角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
// console.log(`正在添加后倾角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
// const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
// addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
// addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
// });
// 保径
......
src/views/scientificDrill/designScheme/components/cjqx copy 5.vue
......@@ -34,7 +34,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -412,12 +412,12 @@ export default {
// this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
// this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
// this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
// this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
// this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
// this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
// this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
// this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
// this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
// this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
// this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
// this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
// this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
// this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
// this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
// this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
// this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1133,13 +1133,13 @@ export default {
// }
// });
// 负前角
// 后倾角
// ['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
// console.log(`正在添加负前角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
// console.log(`正在添加后倾角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
// const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
// addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
// addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
// });
// 保径
......
src/views/scientificDrill/designScheme/components/cjqx copy 6.vue
......@@ -34,7 +34,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -412,12 +412,12 @@ export default {
// this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
// this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
// this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
// this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
// this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
// this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
// this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
// this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
// this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
// this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
// this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
// this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
// this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
// this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
// this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
// this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
// this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1116,13 +1116,13 @@ export default {
// }
// });
// 负前角
// 后倾角
// ['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
// console.log(`正在添加负前角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
// console.log(`正在添加后倾角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
// const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
// addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
// addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
// });
// 保径
......
src/views/scientificDrill/designScheme/components/cjqx copy 正常显示.vue
、<template>
、<template>
......@@ -34,7 +34,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -412,12 +412,12 @@ export default {
// this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
// this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
// this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
// this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
// this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
// this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
// this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
// this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
// this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
// this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
// this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
// this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
// this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
// this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
// this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
// this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
// this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1140,13 +1140,13 @@ export default {
// }
// });
// 负前角
// 后倾角
// ['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
// console.log(`正在添加负前角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
// console.log(`正在添加后倾角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
// const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
// addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
// addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
// });
// 保径
......
src/views/scientificDrill/designScheme/components/cjqx.vue
......@@ -34,7 +34,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
<div style="display: flex; flex-direction: column;">
......@@ -530,12 +530,12 @@ export default {
// this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
// this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
// this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
// this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
// this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
// this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
// this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
// this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
// this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
// this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
// this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
// this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
// this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
// this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
// this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
// this.curveData['保径(常规)'] = this.filterValidData(this.processData(res.bjCgList, '保径(常规)'), '保径(常规)');
// this.curveData['保径(强化)'] = this.filterValidData(this.processData(res.bjZqList, '保径(增强)'), '保径(增强)');
this.curveData['mc'] = [
......@@ -1429,13 +1429,13 @@ export default {
// }
// });
// 负前角
// 后倾角
// ['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
// console.log(`正在添加负前角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
// console.log(`正在添加后倾角(${angle})轨道`);
// console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
// const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
// addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
// addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
// });
// 保径
......
src/views/system/basicInformationOfDrillBit/index.vue
......@@ -60,7 +60,7 @@
:formatter="(row) => getOptionLabel(row.t02, bcmdOptions)" />
<el-table-column prop="t03" label="切削齿尺寸mm" width="150" align="center" show-overflow-tooltip
:formatter="(row) => getOptionLabel(row.t03, qxccOptions)" />
<el-table-column prop="t04" label="切削齿负前角°" width="150" align="center" show-overflow-tooltip
<el-table-column prop="t04" label="切削齿后倾角°" width="150" align="center" show-overflow-tooltip
:formatter="(row) => getOptionLabel(row.t04, qxfnjOptions)" />
<el-table-column prop="t05" label="冠部轮廓" width="150" align="center" show-overflow-tooltip
:formatter="(row) => getOptionLabel(row.t05, gbxzOptions)" />
......@@ -106,7 +106,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="生产厂家" prop="sccj">
<el-input v-model="form.sccj" />
<el-select v-model="form.sccj" clearable filterable style="width: 660px;">
<el-option v-for="item in cjData" :key="item.id" :label="item.mc" :value="item.mc" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="钻头设计型号" prop="ztsjxh">
<el-input v-model="form.ztsjxh" />
</el-form-item>
</el-col>
</el-row>
......@@ -226,7 +233,7 @@
</el-radio-group>
</el-form-item>
</el-collapse-item>
<el-collapse-item title="切削齿负前角°" name="qxfnj">
<el-collapse-item title="切削齿后倾角°" name="qxfnj">
<el-form-item prop="tzdm04">
<el-radio-group v-model="form.tzdm04" style="width:100%">
<el-radio-button v-for="item in qxfnjOptions" :key="item.value" :label="item.value"
......@@ -357,6 +364,7 @@
import { listTzsj } from "@/api/system/jsha";
import { listZtxxJcxx, addZtxxJcxx, updateZtxxJcxx, delZtxxJcxx, getZtxxJcxx } from '@/api/ztxx';
import { getToken } from "@/utils/auth";
import { selctListZtxxCj } from "@/api/system/ztxxCj";
export default {
data() {
const vm = this;
......@@ -459,11 +467,11 @@ export default {
tzxl03: '',
slt03: '',
t03: '', // 切削齿尺寸选项ID
// 切削齿负前角
// 切削齿后倾角
tzdm04: '',
tzxl04: '',
slt04: '',
t04: '', // 切削齿负前角选项ID
t04: '', // 切削齿后倾角选项ID
// 冠部轮廓
tzdm05: '',
tzxl05: '',
......@@ -482,7 +490,7 @@ export default {
detailData: {}, // 详情数据
bcmdOptions: [], // 布齿密度选项
qxccOptions: [], // 切削齿尺寸mm选项
qxfnjOptions: [], // 切削齿负前角°选项
qxfnjOptions: [], // 切削齿后倾角°选项
gbxzOptions: [], // 冠部轮廓选项
bjOptions: [], // 保径选项
bladeCountOptions: [], // 刀翼总数选项
......@@ -549,7 +557,7 @@ export default {
{ required: true, message: '请选择切削齿尺寸', trigger: 'change' }
],
tzdm04: [
{ required: true, message: '请选择切削齿负前角', trigger: 'change' }
{ required: true, message: '请选择切削齿后倾角', trigger: 'change' }
],
tzdm05: [
{ required: true, message: '请选择冠部轮廓', trigger: 'change' }
......@@ -563,7 +571,7 @@ export default {
{ tzdl: '刀翼总数', field: 'bladeCountOptions', codeField: 't01' },
{ tzdl: '布齿密度', field: 'bcmdOptions', codeField: 't02' },
{ tzdl: '切削齿尺寸mm', field: 'qxccOptions', codeField: 't03' },
{ tzdl: '切削齿负前角°', field: 'qxfnjOptions', codeField: 't04' },
{ tzdl: '切削齿后倾角°', field: 'qxfnjOptions', codeField: 't04' },
{ tzdl: '冠部轮廓', field: 'gbxzOptions', codeField: 't05' },
// { tzdl: '保径', field: 'bjOptions', codeField: 't06' }
],
......@@ -571,7 +579,8 @@ export default {
// { label: '刀翼总数', value: '3刀翼', img: 'xxx.png' }
],
// 表格高度，保证超出后出现滚动条
tableHeight: 400
tableHeight: 400,
cjData:[]
}
},
async mounted() {
......@@ -580,13 +589,14 @@ export default {
this.getFeatureOptions('刀翼总数', 'bladeCountOptions'),
this.getFeatureOptions('布齿密度', 'bcmdOptions'),
this.getFeatureOptions('切削齿尺寸mm', 'qxccOptions'),
this.getFeatureOptions('切削齿负前角°', 'qxfnjOptions'),
this.getFeatureOptions('切削齿后倾角°', 'qxfnjOptions'),
this.getFeatureOptions('冠部轮廓', 'gbxzOptions'),
// this.getFeatureOptions('保径', 'bjOptions')
]);
this.onSearch();
// 初始化和监听窗口尺寸，动态设置表格高度
this.updateTableHeight();
this.getCjList();
window.addEventListener('resize', this.updateTableHeight);
},
beforeDestroy() {
......@@ -690,7 +700,7 @@ export default {
this.getFeatureOptions('刀翼总数', 'bladeCountOptions'),
this.getFeatureOptions('布齿密度', 'bcmdOptions'),
this.getFeatureOptions('切削齿尺寸mm', 'qxccOptions'),
this.getFeatureOptions('切削齿负前角°', 'qxfnjOptions'),
this.getFeatureOptions('切削齿后倾角°', 'qxfnjOptions'),
this.getFeatureOptions('冠部轮廓', 'gbxzOptions'),
// this.getFeatureOptions('保径', 'bjOptions')
]);
......@@ -725,7 +735,7 @@ export default {
this.getFeatureOptions('刀翼总数', 'bladeCountOptions'),
this.getFeatureOptions('布齿密度', 'bcmdOptions'),
this.getFeatureOptions('切削齿尺寸mm', 'qxccOptions'),
this.getFeatureOptions('切削齿负前角°', 'qxfnjOptions'),
this.getFeatureOptions('切削齿后倾角°', 'qxfnjOptions'),
this.getFeatureOptions('冠部轮廓', 'gbxzOptions'),
// this.getFeatureOptions('保径', 'bjOptions')
];
......@@ -905,7 +915,7 @@ export default {
case 1: return '刀翼总数';
case 2: return '布齿密度';
case 3: return '切削齿尺寸mm';
case 4: return '切削齿负前角';
case 4: return '切削齿后倾角';
case 5: return '冠部轮廓';
// case 6: return '保径';
default: return '';
......@@ -971,7 +981,14 @@ export default {
img: option ? option.img : ''
}
});
}
},
/** 查询厂家信息列表 */
getCjList() {
this.loading = true;
selctListZtxxCj({}).then(response => {
this.cjData = response.rows;
});
},
}
}
</script>
......
src/views/wellDesign/components/BitDesign.vue
......@@ -33,7 +33,7 @@
尺寸(mm)</div>
<div
style="width: 180px;border-right: 1px solid #000000; border-bottom: 1px solid #000000; display: flex; align-items: center; justify-content: center; font-size: 10px; font-weight: bold; background-color: #f3f8ff;">
负前角(°)</div>
后倾角(°)</div>
</div>
</div>
</div>
......@@ -436,12 +436,12 @@ export default {
this.curveData['尺寸(16)'] = this.filterValidData(this.processData(res.qxcccList16, '尺寸(16)'), '尺寸(16)');
this.curveData['尺寸(19)'] = this.filterValidData(this.processData(res.qxcccList19, '尺寸(19)'), '尺寸(19)');
this.curveData['尺寸(24)'] = this.filterValidData(this.processData(res.qxcccList22, '尺寸(24)'), '尺寸(24)');
this.curveData['负前角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '负前角(15)'), '负前角(15)');
this.curveData['负前角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '负前角(18)'), '负前角(18)');
this.curveData['负前角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '负前角(20)'), '负前角(20)');
this.curveData['负前角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '负前角(25)'), '负前角(25)');
this.curveData['负前角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '负前角(30)'), '负前角(30)');
this.curveData['负前角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '负前角(35)'), '负前角(35)');
this.curveData['后倾角(°)(15)'] = this.filterValidData(this.processData(res.qxcfqj15List, '后倾角(15)'), '后倾角(15)');
this.curveData['后倾角(°)(18)'] = this.filterValidData(this.processData(res.qxcfqj18List, '后倾角(18)'), '后倾角(18)');
this.curveData['后倾角(°)(20)'] = this.filterValidData(this.processData(res.qxcfqj20List, '后倾角(20)'), '后倾角(20)');
this.curveData['后倾角(°)(25)'] = this.filterValidData(this.processData(res.qxcfqj25List, '后倾角(25)'), '后倾角(25)');
this.curveData['后倾角(°)(30)'] = this.filterValidData(this.processData(res.qxcfqj30List, '后倾角(30)'), '后倾角(30)');
this.curveData['后倾角(°)(35)'] = this.filterValidData(this.processData(res.qxcfqj35List, '后倾角(35)'), '后倾角(35)');
this.curveData['mc'] = Array(200).fill(' ');
console.log('数据处理完成');
......@@ -1015,13 +1015,13 @@ export default {
}
});
// 负前角
// 后倾角
['15', '18', '20', '25', '30', '35'].forEach((angle, index) => {
console.log(`正在添加负前角(${angle})轨道`);
console.log(`数据:`, this.curveData[`负前角(°)(${angle})`]);
console.log(`正在添加后倾角(${angle})轨道`);
console.log(`数据:`, this.curveData[`后倾角(°)(${angle})`]);
const styleArray = [styles, styles3, styles2, styles5, styles6, styles3];
addTrackWithCheck(widget, `负前角(°)(${angle})`, styleArray[index], 30);
addTrackWithCheck(widget, `后倾角(°)(${angle})`, styleArray[index], 30);
});
// 添加层位图例
......
src/views/wellDesign/components/BitDesignRecommendation copy 2.vue
......@@ -59,11 +59,11 @@
<div class="chart-title">切削齿尺寸</div>
</div>
<!-- 切削齿负前角 -->
<!-- 切削齿后倾角 -->
<div class="chart-item">
<div ref="bladeChart4" class="chart" style="width: 100%; height: calc((100vh - 240px) / 2);">
</div>
<div class="chart-title">切削齿负前角°</div>
<div class="chart-title">切削齿后倾角°</div>
</div>
<!-- 冠部轮廓 -->
......@@ -128,7 +128,7 @@ export default {
{ parameter: '切削齿尺寸', result: '' },
{ parameter: '布齿密度', result: '' },
{ parameter: '冠状轮廓', result: '' },
{ parameter: '切削齿负前角°', result: '' },
{ parameter: '切削齿后倾角°', result: '' },
{ parameter: '保径', result: '' },
]
......@@ -274,13 +274,13 @@ export default {
console.log('zttjfa推荐数据:', zttjfa);
// 根据新的字段结构使用zttjfa中的推荐值
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿负前角, t05: 冠部轮廓, t06: 保径
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿后倾角, t05: 冠部轮廓, t06: 保径
this.recommendationData = [
{ parameter: '刀翼数', result: '' },
{ parameter: '切削齿尺寸', result: '' },
{ parameter: '布齿密度', result: '' },
{ parameter: '冠状轮廓', result: '' },
{ parameter: '切削齿负前角°', result: '' },
{ parameter: '切削齿后倾角°', result: '' },
{ parameter: '保径', result: '' },
];
......@@ -314,9 +314,9 @@ export default {
this.updateCuttingTeethSizeChart(data.qxccc);
}
// 更新切削齿负前角图表 (blade4 对应 qxcfqj)
// 更新切削齿后倾角图表 (blade4 对应 qxcfqj)
if (data.qxcfqj && this.charts.blade4) {
console.log('更新切削齿负前角图表:', data.qxcfqj);
console.log('更新切削齿后倾角图表:', data.qxcfqj);
this.updateCuttingTeethAngleChart(data.qxcfqj);
}
......@@ -497,20 +497,20 @@ export default {
});
},
// 更新切削齿负前角图表
// 更新切削齿后倾角图表
updateCuttingTeethAngleChart(qxcfqjData) {
if (!qxcfqjData || !qxcfqjData.X || !qxcfqjData.Y) {
console.warn('切削齿负前角图表数据无效:', qxcfqjData);
console.warn('切削齿后倾角图表数据无效:', qxcfqjData);
return;
}
console.log('更新切削齿负前角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
console.log('更新切削齿后倾角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
// 直接使用后台返回的数据
let displayData = [...qxcfqjData.Y]; // 复制原始数据
this.charts.blade4.setOption({
title: { text: '切削齿负前角', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: {
trigger: 'axis',
formatter: '{b}°: {c}%'
......@@ -527,13 +527,13 @@ export default {
},
series: [
{
name: '切削齿负前角',
name: '切削齿后倾角',
type: 'bar',
data: displayData,
itemStyle: {
color: function (params) {
const zttjfa = this.apiData?.zttjfa;
const recommendedValue = zttjfa?.t04 || '15'; // t04是切削齿负前角
const recommendedValue = zttjfa?.t04 || '15'; // t04是切削齿后倾角
if (qxcfqjData.X[params.dataIndex] === recommendedValue) {
return '#FF6B6B';
}
......@@ -711,17 +711,17 @@ export default {
})
}
// 刀翼图表4 - 切削齿负前角
// 刀翼图表4 - 切削齿后倾角
if (this.$refs.bladeChart4) {
this.charts.blade4 = echarts.init(this.$refs.bladeChart4)
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: { trigger: 'axis' },
grid: { top: 40, left: 40, right: 20, bottom: 30 },
xAxis: { type: 'category', data: [4, 5, 6, 7, 8] },
yAxis: { type: 'value', name: '百分' },
series: [
{ name: '切削齿负前角°', type: 'bar', data: [10, 15, 20, 25, 30] }
{ name: '切削齿后倾角°', type: 'bar', data: [10, 15, 20, 25, 30] }
]
})
}
......
src/views/wellDesign/components/BitDesignRecommendation copy 3.vue
......@@ -59,11 +59,11 @@
<div class="chart-title">切削齿尺寸</div>
</div>
<!-- 切削齿负前角 -->
<!-- 切削齿后倾角 -->
<div class="chart-item">
<div ref="bladeChart4" class="chart" style="width: 100%; height: calc((100vh - 240px) / 2);">
</div>
<div class="chart-title">切削齿负前角°</div>
<div class="chart-title">切削齿后倾角°</div>
</div>
<!-- 冠部轮廓 -->
......@@ -128,7 +128,7 @@ export default {
{ parameter: '切削齿尺寸', result: '' },
{ parameter: '布齿密度', result: '' },
{ parameter: '冠状轮廓', result: '' },
{ parameter: '切削齿负前角°', result: '' },
{ parameter: '切削齿后倾角°', result: '' },
{ parameter: '保径', result: '' },
]
......@@ -274,13 +274,13 @@ export default {
console.log('zttjfa推荐数据:', zttjfa);
// 根据新的字段结构使用zttjfa中的推荐值
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿负前角, t05: 冠部轮廓, t06: 保径
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿后倾角, t05: 冠部轮廓, t06: 保径
this.recommendationData = [
{ parameter: '刀翼数', result: '' },
{ parameter: '切削齿尺寸', result: '' },
{ parameter: '布齿密度', result: '' },
{ parameter: '冠状轮廓', result: '' },
{ parameter: '切削齿负前角°', result: '' },
{ parameter: '切削齿后倾角°', result: '' },
{ parameter: '保径', result: '' },
];
......@@ -314,9 +314,9 @@ export default {
this.updateCuttingTeethSizeChart(data.qxccc);
}
// 更新切削齿负前角图表 (blade4 对应 qxcfqj)
// 更新切削齿后倾角图表 (blade4 对应 qxcfqj)
if (data.qxcfqj && this.charts.blade4) {
console.log('更新切削齿负前角图表:', data.qxcfqj);
console.log('更新切削齿后倾角图表:', data.qxcfqj);
this.updateCuttingTeethAngleChart(data.qxcfqj);
}
......@@ -497,20 +497,20 @@ export default {
});
},
// 更新切削齿负前角图表
// 更新切削齿后倾角图表
updateCuttingTeethAngleChart(qxcfqjData) {
if (!qxcfqjData || !qxcfqjData.X || !qxcfqjData.Y) {
console.warn('切削齿负前角图表数据无效:', qxcfqjData);
console.warn('切削齿后倾角图表数据无效:', qxcfqjData);
return;
}
console.log('更新切削齿负前角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
console.log('更新切削齿后倾角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
// 直接使用后台返回的数据
let displayData = [...qxcfqjData.Y]; // 复制原始数据
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: {
trigger: 'axis',
formatter: '{b}°: {c}%'
......@@ -527,13 +527,13 @@ export default {
},
series: [
{
name: '切削齿负前角°',
name: '切削齿后倾角°',
type: 'bar',
data: displayData,
itemStyle: {
color: function (params) {
const zttjfa = this.apiData?.zttjfa;
const recommendedValue = zttjfa?.t04 || '15'; // t04是切削齿负前角
const recommendedValue = zttjfa?.t04 || '15'; // t04是切削齿后倾角
if (qxcfqjData.X[params.dataIndex] === recommendedValue) {
return '#FF6B6B';
}
......@@ -711,17 +711,17 @@ export default {
})
}
// 刀翼图表4 - 切削齿负前角
// 刀翼图表4 - 切削齿后倾角
if (this.$refs.bladeChart4) {
this.charts.blade4 = echarts.init(this.$refs.bladeChart4)
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: { trigger: 'axis' },
grid: { top: 40, left: 40, right: 20, bottom: 30 },
xAxis: { type: 'category', data: [4, 5, 6, 7, 8] },
yAxis: { type: 'value', name: '百分' },
series: [
{ name: '切削齿负前角°', type: 'bar', data: [10, 15, 20, 25, 30] }
{ name: '切削齿后倾角°', type: 'bar', data: [10, 15, 20, 25, 30] }
]
})
}
......
src/views/wellDesign/components/BitDesignRecommendation copy 4.vue
......@@ -31,7 +31,7 @@
<el-table-column prop="toothSize" label="切削齿尺寸" min-width="120px" align="center" />
<el-table-column prop="density" label="布齿密度" min-width="120px" align="center" />
<el-table-column prop="crownProfile" label="冠状轮廓" min-width="120px" align="center" />
<el-table-column prop="negativeAngle" label="切削齿负前角°" min-width="120px" align="center" />
<el-table-column prop="negativeAngle" label="切削齿后倾角°" min-width="120px" align="center" />
<el-table-column label="操作" align="center" fixed="right" width="250px"
class-name="small-padding fixed-width">
<template slot-scope="scope">
......@@ -76,11 +76,11 @@
</div>
<div class="chart-title">切削齿尺寸</div>
</div>
<!-- 切削齿负前角 -->
<!-- 切削齿后倾角 -->
<div class="chart-item">
<div ref="bladeChart4" class="chart" style="width: 100%; height: calc((100vh - 260px) / 2);">
</div>
<div class="chart-title">切削齿负前角°</div>
<div class="chart-title">切削齿后倾角°</div>
</div>
<!-- 冠部轮廓 -->
<div class="chart-item">
......@@ -128,7 +128,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="切削齿负前角°" min-width="140" align="center">
<el-table-column label="切削齿后倾角°" min-width="140" align="center">
<template slot-scope="scope">
<span :class="['status-icon', isMatch(scope.row.t04match) ? 'match' : 'no-match']">
{{ isMatch(scope.row.t04match) ? '✓' : '✗' }}
......@@ -205,7 +205,7 @@ export default {
{ tzdl: '刀翼总数', field: 'tzdm01', imageField: 'slt01', matchField: 't01match' },
{ tzdl: '布齿密度', field: 'tzdm02', imageField: 'slt02', matchField: 't02match' },
{ tzdl: '切削齿尺寸mm', field: 'tzdm03', imageField: 'slt03', matchField: 't03match' },
{ tzdl: '切削齿负前角°', field: 'tzdm04', imageField: 'slt04', matchField: 't04match' },
{ tzdl: '切削齿后倾角°', field: 'tzdm04', imageField: 'slt04', matchField: 't04match' },
{ tzdl: '冠部轮廓', field: 'tzdm05', imageField: 'slt05', matchField: 't05match' },
{ tzdl: '保径', field: 'tzdm06', imageField: 'slt06', matchField: 't06match' }
]
......@@ -359,7 +359,7 @@ export default {
console.log('zttjfa推荐数据:', zttjfa);
// 根据新的字段结构使用zttjfa中的推荐值
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿负前角, t05: 冠部轮廓, t06: 保径
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿后倾角, t05: 冠部轮廓, t06: 保径
this.recommendationData = {
bladeCount: zttjfa.t01 || '',
toothSize: zttjfa.t03 || '',
......@@ -398,9 +398,9 @@ export default {
this.updateCuttingTeethSizeChart(data.qxccc);
}
// 更新切削齿负前角图表 (blade4 对应 qxcfqj)
// 更新切削齿后倾角图表 (blade4 对应 qxcfqj)
if (data.qxcfqj && this.charts.blade4) {
console.log('更新切削齿负前角图表:', data.qxcfqj);
console.log('更新切削齿后倾角图表:', data.qxcfqj);
this.updateCuttingTeethAngleChart(data.qxcfqj);
}
......@@ -562,20 +562,20 @@ export default {
});
},
// 更新切削齿负前角图表
// 更新切削齿后倾角图表
updateCuttingTeethAngleChart(qxcfqjData) {
if (!qxcfqjData || !qxcfqjData.X || !qxcfqjData.Y) {
console.warn('切削齿负前角图表数据无效:', qxcfqjData);
console.warn('切削齿后倾角图表数据无效:', qxcfqjData);
return;
}
console.log('更新切削齿负前角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
console.log('更新切削齿后倾角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
// 直接使用后台返回的数据
let displayData = [...qxcfqjData.Y]; // 复制原始数据
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: {
trigger: 'axis',
formatter: '{b}°: {c}'
......@@ -592,7 +592,7 @@ export default {
},
series: [
{
name: '切削齿负前角°',
name: '切削齿后倾角°',
type: 'bar',
barWidth: 50,
data: displayData,
......@@ -759,17 +759,17 @@ export default {
})
}
// 刀翼图表4 - 切削齿负前角
// 刀翼图表4 - 切削齿后倾角
if (this.$refs.bladeChart4) {
this.charts.blade4 = echarts.init(this.$refs.bladeChart4)
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: { trigger: 'axis' },
grid: { top: 40, left: 40, right: 20, bottom: 30 },
xAxis: { type: 'category', data: [4, 5, 6, 7, 8] },
yAxis: { type: 'value', name: '百分' },
series: [
{ name: '切削齿负前角°', type: 'bar', barWidth: 30, data: [] }
{ name: '切削齿后倾角°', type: 'bar', barWidth: 30, data: [] }
]
})
}
......@@ -852,7 +852,7 @@ export default {
queryParams.t01 = zttjfa.t01; // 刀翼数
queryParams.t02 = zttjfa.t02; // 布齿密度
queryParams.t03 = zttjfa.t03; // 切削齿尺寸
queryParams.t04 = zttjfa.t04; // 切削齿负前角
queryParams.t04 = zttjfa.t04; // 切削齿后倾角
queryParams.t05 = zttjfa.t05; // 冠部轮廓
// queryParams.t06 = zttjfa.t06; // 保径
}
......
src/views/wellDesign/components/BitDesignRecommendation copy.vue
......@@ -56,10 +56,10 @@
<div class="chart-title">切削齿尺寸</div>
</div>
<!-- 切削齿负前角 -->
<!-- 切削齿后倾角 -->
<div class="chart-item">
<div ref="bladeChart4" class="chart" style="width: 100%; height: 200px;"></div>
<div class="chart-title">切削齿负前角°</div>
<div class="chart-title">切削齿后倾角°</div>
</div>
<!-- 冠部轮廓 -->
......@@ -272,13 +272,13 @@ export default {
console.log('zttjfa推荐数据:', zttjfa);
// 根据新的字段结构使用zttjfa中的推荐值
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿负前角, t05: 冠部轮廓, t06: 保径
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿后倾角, t05: 冠部轮廓, t06: 保径
this.recommendationData = [
{ parameter: '材质', result: '钢体' },
{ parameter: '刀翼数', result: zttjfa.t01 || '4' },
{ parameter: '冠部轮廓', result: zttjfa.t05 || '短抛物' },
{ parameter: '切削齿尺寸', result: (zttjfa.t03 || '8') + 'mm' },
{ parameter: '切削齿负前角°', result: (zttjfa.t04 || '15') + '°' },
{ parameter: '切削齿后倾角°', result: (zttjfa.t04 || '15') + '°' },
{ parameter: '布齿密度', result: zttjfa.t02 || '低' },
{ parameter: '保径', result: zttjfa.t06 || '常规' },
{ parameter: '双排齿', result: '是' },
......@@ -319,9 +319,9 @@ export default {
this.updateCuttingTeethSizeChart(data.qxccc);
}
// 更新切削齿负前角图表 (blade4 对应 qxcfqj)
// 更新切削齿后倾角图表 (blade4 对应 qxcfqj)
if (data.qxcfqj && this.charts.blade4) {
console.log('更新切削齿负前角图表:', data.qxcfqj);
console.log('更新切削齿后倾角图表:', data.qxcfqj);
this.updateCuttingTeethAngleChart(data.qxcfqj);
}
......@@ -502,20 +502,20 @@ export default {
});
},
// 更新切削齿负前角图表
// 更新切削齿后倾角图表
updateCuttingTeethAngleChart(qxcfqjData) {
if (!qxcfqjData || !qxcfqjData.X || !qxcfqjData.Y) {
console.warn('切削齿负前角图表数据无效:', qxcfqjData);
console.warn('切削齿后倾角图表数据无效:', qxcfqjData);
return;
}
console.log('更新切削齿负前角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
console.log('更新切削齿后倾角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
// 直接使用后台返回的数据，不生成示例数据
let displayData = [...qxcfqjData.Y]; // 复制原始数据
this.charts.blade4.setOption({
title: { text: '切削齿负前角', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: {
trigger: 'axis',
formatter: '{b}°: {c}%'
......@@ -532,13 +532,13 @@ export default {
},
series: [
{
name: '切削齿负前角°',
name: '切削齿后倾角°',
type: 'bar',
data: displayData,
itemStyle: {
color: function (params) {
const zttjfa = this.apiData?.zttjfa;
const recommendedValue = zttjfa?.t04 || '15'; // t04是切削齿负前角
const recommendedValue = zttjfa?.t04 || '15'; // t04是切削齿后倾角
if (qxcfqjData.X[params.dataIndex] === recommendedValue) {
return '#FF6B6B';
}
......
src/views/wellDesign/components/BitDesignRecommendation.vue
......@@ -30,7 +30,7 @@
<el-table-column prop="bladeCount" label="刀翼数" min-width="120px" align="center" />
<el-table-column prop="density" label="布齿密度" min-width="120px" align="center" />
<el-table-column prop="toothSize" label="切削齿尺寸" min-width="120px" align="center" />
<el-table-column prop="negativeAngle" label="切削齿负前角°" min-width="120px" align="center" />
<el-table-column prop="negativeAngle" label="切削齿后倾角°" min-width="120px" align="center" />
<el-table-column prop="crownProfile" label="冠状轮廓" min-width="120px" align="center" />
<el-table-column label="操作" align="center" fixed="right" width="250px"
class-name="small-padding fixed-width">
......@@ -76,11 +76,11 @@
</div>
<div class="chart-title">切削齿尺寸</div>
</div>
<!-- 切削齿负前角 -->
<!-- 切削齿后倾角 -->
<div class="chart-item">
<div ref="bladeChart4" class="chart" style="width: 100%; height: calc((100vh - 260px) / 2);">
</div>
<div class="chart-title">切削齿负前角°</div>
<div class="chart-title">切削齿后倾角°</div>
</div>
<!-- 冠部轮廓 -->
<div class="chart-item">
......@@ -299,7 +299,7 @@ export default {
console.log('zttjfa推荐数据:', zttjfa);
// 根据新的字段结构使用zttjfa中的推荐值
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿负前角, t05: 冠部轮廓, t06: 保径
// t01: 刀翼数, t02: 布齿密度, t03: 切削齿尺寸, t04: 切削齿后倾角, t05: 冠部轮廓, t06: 保径
this.recommendationData = {
bladeCount: zttjfa.t01 || '',
toothSize: zttjfa.t03 || '',
......@@ -338,9 +338,9 @@ export default {
this.updateCuttingTeethSizeChart(data.qxccc);
}
// 更新切削齿负前角图表 (blade4 对应 qxcfqj)
// 更新切削齿后倾角图表 (blade4 对应 qxcfqj)
if (data.qxcfqj && this.charts.blade4) {
console.log('更新切削齿负前角图表:', data.qxcfqj);
console.log('更新切削齿后倾角图表:', data.qxcfqj);
this.updateCuttingTeethAngleChart(data.qxcfqj);
}
......@@ -502,20 +502,20 @@ export default {
});
},
// 更新切削齿负前角图表
// 更新切削齿后倾角图表
updateCuttingTeethAngleChart(qxcfqjData) {
if (!qxcfqjData || !qxcfqjData.X || !qxcfqjData.Y) {
console.warn('切削齿负前角图表数据无效:', qxcfqjData);
console.warn('切削齿后倾角图表数据无效:', qxcfqjData);
return;
}
console.log('更新切削齿负前角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
console.log('更新切削齿后倾角图表 - X轴:', qxcfqjData.X, 'Y轴:', qxcfqjData.Y);
// 直接使用后台返回的数据
let displayData = [...qxcfqjData.Y]; // 复制原始数据
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: {
trigger: 'axis',
formatter: '{b}°: {c}'
......@@ -532,7 +532,7 @@ export default {
},
series: [
{
name: '切削齿负前角°',
name: '切削齿后倾角°',
type: 'bar',
barWidth: 50,
data: displayData,
......@@ -699,17 +699,17 @@ export default {
})
}
// 刀翼图表4 - 切削齿负前角
// 刀翼图表4 - 切削齿后倾角
if (this.$refs.bladeChart4) {
this.charts.blade4 = echarts.init(this.$refs.bladeChart4)
this.charts.blade4.setOption({
title: { text: '切削齿负前角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
title: { text: '切削齿后倾角°', left: 'center', top: 10, textStyle: { fontSize: 12 } },
tooltip: { trigger: 'axis' },
grid: { top: 40, left: 40, right: 20, bottom: 30 },
xAxis: { type: 'category', data: [4, 5, 6, 7, 8] },
yAxis: { type: 'value', name: '百分' },
series: [
{ name: '切削齿负前角°', type: 'bar', barWidth: 30, data: [] }
{ name: '切削齿后倾角°', type: 'bar', barWidth: 30, data: [] }
]
})
}
......@@ -792,7 +792,7 @@ export default {
queryParams.t01 = zttjfa.t01; // 刀翼数
queryParams.t02 = zttjfa.t02; // 布齿密度
queryParams.t03 = zttjfa.t03; // 切削齿尺寸
queryParams.t04 = zttjfa.t04; // 切削齿负前角
queryParams.t04 = zttjfa.t04; // 切削齿后倾角
queryParams.t05 = zttjfa.t05; // 冠部轮廓
// queryParams.t06 = zttjfa.t06; // 保径
}
......@@ -948,7 +948,7 @@ export default {
// 更新 t03 (切削齿尺寸)
processItems(data.t03, '03');
// 更新 t04 (切削齿负前角)
// 更新 t04 (切削齿后倾角)
processItems(data.t04, '04');
// 更新 t05 (冠部轮廓)
......
src/views/wellDesign/components/BitMatching.vue
......@@ -48,7 +48,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="切削齿负前角°" min-width="100" align="center">
<el-table-column label="切削齿后倾角°" min-width="100" align="center">
<template slot-scope="scope">
<span :class="['status-icon', scope.row.t04match === '匹配' ? 'match' : 'no-match']">
{{ scope.row.t04match === '匹配' ? '✓' : '✗' }}
......@@ -209,7 +209,7 @@ export default {
t01match: item.t01match, // 刀翼总数匹配状态
t02match: item.t02match, // 布齿密度匹配状态
t03match: item.t03match, // 切削齿尺寸匹配状态
t04match: item.t04match, // 切削齿负前角匹配状态
t04match: item.t04match, // 切削齿后倾角匹配状态
t05match: item.t05match, // 冠部轮廓匹配状态
t06match: item.t06match, // 保径匹配状态
......
src/views/wellDesign/components/BitSelectionInfo.vue
......@@ -52,7 +52,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="切削齿负前角°" min-width="140" align="center">
<el-table-column label="切削齿后倾角°" min-width="140" align="center">
<template slot-scope="scope">
<span v-if="showValues" class="value-text">
{{ getCurrentValue('tzdm04') || '--' }}
......@@ -181,7 +181,7 @@ export default {
{ tzdl: '刀翼总数', field: 'tzdm01', imageField: 'slt01', matchField: 't01match', nameField: 'tzxl01' },
{ tzdl: '布齿密度', field: 'tzdm02', imageField: 'slt02', matchField: 't02match', nameField: 'tzxl02' },
{ tzdl: '切削齿尺寸mm', field: 'tzdm03', imageField: 'slt03', matchField: 't03match', nameField: 'tzxl03' },
{ tzdl: '切削齿负前角°', field: 'tzdm04', imageField: 'slt04', matchField: 't04match', nameField: 'tzxl04' },
{ tzdl: '切削齿后倾角°', field: 'tzdm04', imageField: 'slt04', matchField: 't04match', nameField: 'tzxl04' },
{ tzdl: '冠部轮廓', field: 'tzdm05', imageField: 'slt05', matchField: 't05match', nameField: 'tzxl05' },
// { tzdl: '保径', field: 'tzdm06', imageField: 'slt06', matchField: 't06match', nameField: 'tzxl06' }
],
......@@ -195,35 +195,35 @@ export default {
tzdm01: '', // 刀翼总数
tzdm02: '', // 布齿密度
tzdm03: '', // 切削齿尺寸
tzdm04: '', // 切削齿负前角
tzdm04: '', // 切削齿后倾角
tzdm05: '', // 冠部轮廓
tzdm06: '', // 保径
// 图片
slt01: '', // 刀翼总数图片
slt02: '', // 布齿密度图片
slt03: '', // 切削齿尺寸图片
slt04: '', // 切削齿负前角图片
slt04: '', // 切削齿后倾角图片
slt05: '', // 冠部轮廓图片
slt06: '', // 保径图片
// 图片名称
tzxl01: '', // 刀翼总数图片名称
tzxl02: '', // 布齿密度图片名称
tzxl03: '', // 切削齿尺寸图片名称
tzxl04: '', // 切削齿负前角图片名称
tzxl04: '', // 切削齿后倾角图片名称
tzxl05: '', // 冠部轮廓图片名称
tzxl06: '', // 保径图片名称
// 图片列表（支持多个图片）
slt01List: [], // 刀翼总数图片列表
slt02List: [], // 布齿密度图片列表
slt03List: [], // 切削齿尺寸图片列表
slt04List: [], // 切削齿负前角图片列表
slt04List: [], // 切削齿后倾角图片列表
slt05List: [], // 冠部轮廓图片列表
slt06List: [], // 保径图片列表
// 匹配状态
t01match: '', // 刀翼总数匹配状态
t02match: '', // 布齿密度匹配状态
t03match: '', // 切削齿尺寸匹配状态
t04match: '', // 切削齿负前角匹配状态
t04match: '', // 切削齿后倾角匹配状态
t05match: '', // 冠部轮廓匹配状态
t06match: '' // 保径匹配状态
}
......
src/views/ztxxCj/index.vue 0 → 100644
<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="mc">
<el-input
v-model="queryParams.mc"
placeholder="请输入厂家名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<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>
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:ztxxCj:add']"
>新增</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="ztxxCjList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="厂家名称" align="center" prop="mc" />
<el-table-column label="排序" align="center" prop="px" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:ztxxCj:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:ztxxCj:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改厂家信息对话框 -->
<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="mc">
<el-input v-model="form.mc" placeholder="请输入厂家名称" />
</el-form-item>
<el-form-item label="排序" prop="px">
<el-input v-model="form.px" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listZtxxCj, getZtxxCj, delZtxxCj, addZtxxCj, updateZtxxCj } from "@/api/system/ztxxCj";
export default {
name: "ZtxxCj",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 厂家信息表格数据
ztxxCjList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
mc: null,
px: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询厂家信息列表 */
getList() {
this.loading = true;
listZtxxCj(this.queryParams).then(response => {
this.ztxxCjList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
mc: null,
px: null,
createTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加厂家信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getZtxxCj(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改厂家信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateZtxxCj(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addZtxxCj(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除厂家信息编号为"' + ids + '"的数据项？').then(function() {
return delZtxxCj(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/ztxxCj/export', {
...this.queryParams
}, `ztxxCj_${new Date().getTime()}.xlsx`)
}
}
};
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment