|
@@ -116,7 +116,6 @@
|
|
|
<el-table-column label="硬件ID" align="center" prop="hardwareId"></el-table-column>
|
|
<el-table-column label="硬件ID" align="center" prop="hardwareId"></el-table-column>
|
|
|
<el-table-column label="硬件序列号" align="center" prop="serialNumber"></el-table-column>
|
|
<el-table-column label="硬件序列号" align="center" prop="serialNumber"></el-table-column>
|
|
|
<el-table-column label="岗位" align="center" prop="workstationName">
|
|
<el-table-column label="岗位" align="center" prop="workstationName">
|
|
|
-
|
|
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="图片" align="left" prop="cabinetPicture">
|
|
<el-table-column label="图片" align="left" prop="cabinetPicture">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -185,6 +184,11 @@
|
|
|
<el-button type="text" @click="lookDetail(scope.row)">查看</el-button>
|
|
<el-button type="text" @click="lookDetail(scope.row)">查看</el-button>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column label="测试" align="center" prop="detail" v-hasPermi="['iscs:cabinet:test']">
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ <el-button type="text" @click="openDialogFunction(scope.row)">查看</el-button>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
<el-table-column
|
|
|
label="操作"
|
|
label="操作"
|
|
|
align="center"
|
|
align="center"
|
|
@@ -328,6 +332,27 @@
|
|
|
<el-button v-no-more-click @click="cancel">取 消</el-button>
|
|
<el-button v-no-more-click @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
+<!-- 测试弹框-->
|
|
|
|
|
+ <el-dialog title="测试" :visible.sync="openDialog" width="650px" append-to-body>
|
|
|
|
|
+ <el-form ref="form" :model="DialogData" label-width="100px">
|
|
|
|
|
+ <el-form-item label="类型">
|
|
|
|
|
+ <el-input v-model="DialogData.type" placeholder="请输入type"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ <el-form-item label="序列号">
|
|
|
|
|
+ <el-input v-model="DialogData.lotoSerialNumber" placeholder="请输入lotoSerialNumber"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ <el-form-item label="内容">
|
|
|
|
|
+ <el-input v-model="DialogData.content" placeholder="请输入content"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-form>
|
|
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
|
|
+ <el-button v-no-more-click type="primary" @click="submitTestForm"
|
|
|
|
|
+ >确 定
|
|
|
|
|
+ </el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button v-no-more-click @click="cancel">取 消</el-button>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
@@ -340,9 +365,9 @@ import {
|
|
|
deleteIsLockCabinetByCabinetIds,
|
|
deleteIsLockCabinetByCabinetIds,
|
|
|
getIsLockCabinetPage,
|
|
getIsLockCabinetPage,
|
|
|
insertIsLockCabinet,
|
|
insertIsLockCabinet,
|
|
|
- selectIsLockCabinetById,
|
|
|
|
|
|
|
+ selectIsLockCabinetById, sendDataToLoto,
|
|
|
updateIsLockCabinet
|
|
updateIsLockCabinet
|
|
|
-} from "@/api/mes/lockCabinet";
|
|
|
|
|
|
|
+} from '@/api/mes/lockCabinet'
|
|
|
|
|
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
@@ -377,6 +402,9 @@ export default {
|
|
|
title: "",
|
|
title: "",
|
|
|
// 是否显示弹出层
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
open: false,
|
|
|
|
|
+ openDialog: false,
|
|
|
|
|
+ DialogData:[],
|
|
|
|
|
+ TestRow:null,
|
|
|
// 查询参数
|
|
// 查询参数
|
|
|
createTime: "",
|
|
createTime: "",
|
|
|
queryParams: {
|
|
queryParams: {
|
|
@@ -490,6 +518,7 @@ export default {
|
|
|
// 取消按钮
|
|
// 取消按钮
|
|
|
cancel() {
|
|
cancel() {
|
|
|
this.open = false;
|
|
this.open = false;
|
|
|
|
|
+ this.openDialog = false;
|
|
|
this.reset();
|
|
this.reset();
|
|
|
},
|
|
},
|
|
|
// 表单重置
|
|
// 表单重置
|
|
@@ -567,6 +596,26 @@ export default {
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
|
|
+ // 测试
|
|
|
|
|
+ openDialogFunction(row) {
|
|
|
|
|
+ this.openDialog = true;
|
|
|
|
|
+ this.TestRow=row
|
|
|
|
|
+ },
|
|
|
|
|
+ // 测试提交数据
|
|
|
|
|
+ submitTestForm(){
|
|
|
|
|
+ const params={
|
|
|
|
|
+ type:this.DialogData.type,
|
|
|
|
|
+ lotoSerialNumber:this.DialogData.lotoSerialNumber,
|
|
|
|
|
+ content:this.DialogData.content,
|
|
|
|
|
+ }
|
|
|
|
|
+ sendDataToLoto(params).then(response => {
|
|
|
|
|
+ this.$modal.msgSuccess('测试成功');
|
|
|
|
|
+ this.openDialog=false;
|
|
|
|
|
+ this.DialogData.type=''
|
|
|
|
|
+ this.DialogData.lotoSerialNumber=''
|
|
|
|
|
+ this.DialogData.content=''
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
//图片上传成功
|
|
//图片上传成功
|
|
|
handleImgUplaoded(imgUrl) {
|
|
handleImgUplaoded(imgUrl) {
|
|
|
console.log(imgUrl);
|
|
console.log(imgUrl);
|