|
@@ -153,7 +153,7 @@
|
|
<el-table-column
|
|
<el-table-column
|
|
:label="$t('table.operation')"
|
|
:label="$t('table.operation')"
|
|
align="center"
|
|
align="center"
|
|
- column-key="operation"
|
|
|
|
|
|
+ column-key="operation"
|
|
>
|
|
>
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
<el-tooltip class="item" :content='$t("common.view")' effect="dark" placement="top-start">
|
|
<el-tooltip class="item" :content='$t("common.view")' effect="dark" placement="top-start">
|
|
@@ -170,7 +170,7 @@
|
|
@click="equipmentDelete(row)"
|
|
@click="equipmentDelete(row)"
|
|
/>
|
|
/>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
- <a class="el-icon-download table-operation" style="color: #1890ff;" :href="row.filePath" :download="row.submittedFileName"></a>
|
|
|
|
|
|
+ <a class="el-icon-download table-operation" style="color: #1890ff;" target="_blank" :href="row.filePath" :download="row.submittedFileName"></a>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -311,7 +311,7 @@
|
|
this.selection.map(item => {
|
|
this.selection.map(item => {
|
|
resourceIdList.push(item.id)
|
|
resourceIdList.push(item.id)
|
|
})
|
|
})
|
|
- programCenterApi.synchronousNumericalProgram({resourceIdList}).then(res => {
|
|
|
|
|
|
+ programCenterApi.synchronousNumericalProgram({"resourceList" : resourceIdList}).then(res => {
|
|
res = res.data
|
|
res = res.data
|
|
// console.log("同步数控程序】: ", res)
|
|
// console.log("同步数控程序】: ", res)
|
|
if(res.isSuccess){
|
|
if(res.isSuccess){
|
|
@@ -403,9 +403,11 @@
|
|
},
|
|
},
|
|
editSuccess () {
|
|
editSuccess () {
|
|
this.search()
|
|
this.search()
|
|
|
|
+ this.fetch2()
|
|
},
|
|
},
|
|
editUploadSuccess(){
|
|
editUploadSuccess(){
|
|
this.search()
|
|
this.search()
|
|
|
|
+ this.fetch2()
|
|
},
|
|
},
|
|
|
|
|
|
// 当选择项发生变化时会触发该事件
|
|
// 当选择项发生变化时会触发该事件
|
|
@@ -521,7 +523,7 @@
|
|
// 固定参数(采集的生产资源)
|
|
// 固定参数(采集的生产资源)
|
|
this.queryParams.resourceStatus = "1"
|
|
this.queryParams.resourceStatus = "1"
|
|
this.queryParams.displayStatus = "1"
|
|
this.queryParams.displayStatus = "1"
|
|
- this.queryParams.cncProgram = "1"
|
|
|
|
|
|
+ this.queryParams.cncProgram = "1"
|
|
equipmentMgrApi.getPageList(this.queryParams).then(response => {
|
|
equipmentMgrApi.getPageList(this.queryParams).then(response => {
|
|
const res = response.data
|
|
const res = response.data
|
|
//console.log(res)
|
|
//console.log(res)
|