This commit is contained in:
打豆豆 2024-03-26 19:48:34 +08:00
parent 73aeaa701b
commit 029d57ad8e
9 changed files with 416 additions and 374 deletions

View File

@ -30,7 +30,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<!-- <el-col :span="7">
<el-form-item label="所在车间" prop="workshopName">
<el-select v-model="queryParams.workshopId" placeholder="请选择车间">
<el-option
@ -41,7 +41,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="3">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -178,7 +178,7 @@ export default {
workstationCode: null,
workstationName: null,
workstationAddress: null,
workshopId: null,
workshopId: "214",
workshopCode: null,
workshopName: null,
processId: null,

View File

@ -315,15 +315,8 @@
v-model="form.machineryTypeId"
:options="machineryTypeOptions"
:normalizer="normalizer"
disabled
v-if="optType == 'view'"
/>
<treeselect
v-model="form.machineryTypeId"
:options="machineryTypeOptions"
:normalizer="normalizer"
placeholder="请选择所属分类"
v-else
placeholder="请选择设备类型"
@select="handleNodeClick"
/>
</el-form-item>
</el-col>
@ -382,7 +375,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属车间" prop="workshopName">
<!-- <el-form-item label="所属车间" prop="workshopName">
<el-select
v-model="form.workshopName"
placeholder="请选择车间"
@ -397,7 +390,7 @@
:value="item"
></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
@ -587,7 +580,7 @@ export default {
idList: "",
workshopCode: "",
workshopName: "",
workshopId: "",
workshopId: "214",
},
defaultPropss: {
children: "children",
@ -656,15 +649,15 @@ export default {
machineryName: [
{ required: true, message: "设备名称不能为空", trigger: "blur" },
],
workshopId: [
{ required: true, message: "车间不能为空", trigger: "blur" },
],
// workshopId: [
// { required: true, message: "", trigger: "blur" },
// ],
machineryTypeId: [
{ required: true, message: "设备分类不能为空", trigger: "blur" },
],
workshopName: [
{ required: true, message: "所属车间不能为空", trigger: "blur" },
],
// workshopName: [
// { required: true, message: "", trigger: "blur" },
// ],
},
};
},
@ -727,6 +720,12 @@ export default {
this.queryParamsdata = data;
this.handleQuery();
},
//
handleNodeClick(data) {
console.log(data);
this.form.machineryTypeName = data.machineryTypeName;
this.form.machineryTypeCode = data.code;
},
//
cancel() {
this.open = false;
@ -743,7 +742,7 @@ export default {
machineryTypeId: null,
machineryTypeCode: null,
machineryTypeName: null,
workshopId: null,
workshopId: "214",
workshopCode: null,
workshopName: null,
status: "STOP",
@ -809,7 +808,7 @@ export default {
// this.$emit("getSelectList", this.selectList);
},
//
//
handleAccompanyId(val) {
this.form.workshopCode = val.workshopCode;
this.form.workshopName = val.workshopName;

View File

@ -201,7 +201,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属车间" prop="workshopId">
<!-- <el-form-item label="所属车间" prop="workshopId">
<el-select
v-model="form.workshopId"
placeholder="请选择车间"
@ -215,7 +215,7 @@
:value="item.workshopId"
></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
<el-col :span="12">
<el-form-item label="是否启用" prop="enableFlag">
@ -346,7 +346,7 @@ export default {
proAgvlineId: null,
lineCode: null,
lineName: null,
workshopId: null,
workshopId: "214",
enableFlag: "Y",
remark: null,
};

View File

@ -245,7 +245,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="所在车间" prop="workshopId">
<el-select
v-model="form.workshopId"
@ -260,7 +260,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="12">
@ -564,7 +564,7 @@ export default {
workstationCode: null,
workstationName: null,
workstationAddress: null,
workshopId: null,
workshopId: "214",
workshopCode: null,
workshopName: null,
processId: null,
@ -670,6 +670,7 @@ export default {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.workstationId != null) {
this.form.processId = this.form.processId.join(",");
updateWorkstation(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;

View File

@ -1,343 +1,351 @@
<template>
<div class="videoMain" ref="playWndBox">
<div
id="playWnd"
class="playWnd"
:style="{
height: playWndHeight + 'px',
width: playWndWidth + 'px',
}"
></div>
<div>
<div>
<div id="playWnd" class="playWnd"></div>
<div v-show="lodingshow" style="margin: -17px 0">
<a-spin tip="Loading...">
<div class="spin-content">插件未启动正在尝试启动请稍候...</div>
</a-spin>
</div>
<div v-show="lodingres" class="example">
<p style="margin: 0; display: inline-block">
没有检测到插件请安装插件后重启浏览器
</p>
<a-button class="buttonDetails-class" @click="downloadFile()"
>下载</a-button
>
</div>
</div>
</div>
</template>
<script>
export default {
name: "HikVideo",
name: "monitor",
data() {
return {
//
playWndHeight: "",
//
playWndWidth: "",
oWebControl: null,
initCount: 0,
pubKey: "",
cameraIndexCode: "", //
objData: {
appkey: "", //appkey
ip: "", //
secret: "", //secret
port: 443,
playMode: 0, // 0 1
layout: "2x2", //16
},
//
camlength: "1x1",
//
lodingshow: false,
lodingres: false,
};
},
mounted() {
//
this.playWndHeight = this.$refs.playWndBox.clientHeight;
//
this.playWndWidth = this.$refs.playWndBox.clientWidth;
created() {
//
this.initPlugin();
// resize使DIV
// vue onresize
$(window).resize(() => {
if (oWebControl != null) {
oWebControl.JS_Resize( $('.map').width(), $('.map').height() - 60);
}
});
//
this.$nextTick(() => {
this.initPlugin();
});
// scroll使DIV
window.addEventListener("scroll", () => {
if (this.oWebControl != null) {
this.oWebControl.JS_Resize(
this.$refs.playWndBox.clientWidth,
this.$refs.playWndBox.clientHeight
);
this.setWndCover();
}
});
// resize使DIV
window.addEventListener("resize", (e) => {
if (this.oWebControl != null) {
this.oWebControl.JS_Resize(
this.$refs.playWndBox.clientWidth,
this.$refs.playWndBox.clientHeight
);
this.setWndCover();
}
});
},
destroyed() {
if (this.oWebControl != null) {
//
this.oWebControl.JS_HideWnd();
//
this.oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
//
this.oWebControl.JS_Disconnect();
}
},
methods: {
//
initPlugin() {
let that = this;
this.oWebControl = null;
that.oWebControl = new WebControl({
szPluginContainer: "playWnd", // id
iServicePortStart: 15900, // 使
iServicePortEnd: 15909,
szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11", // IE10使ActiveXclsid
cbConnectSuccess: () => {
// WebControl
that.oWebControl
.JS_StartService("window", {
// WebControl
// "./VideoPluginConnect.dll"
dllPath: "./VideoPluginConnect.dll",
})
.then(
function () {
//
that.oWebControl.JS_SetWindowControlCallback({
cbIntegrationCallBack: that.cbIntegrationCallBack,
});
//JS_CreateWnd
that.oWebControl
.JS_CreateWnd("playWnd", 2040, 945, { bEmbed: true })
//2040,945
.then(function () {
//
that.init();
});
},
function () {
//
}
);
},
// WebControl
cbConnectError: function () {
that.oWebControl = null;
// alert('...')
// that.$message.warning("...");
// errorwakeup
window.WebControl.JS_WakeUp("VideoWebPlugin://");
that.initCount++;
if (that.initCount < 3) {
setTimeout(function () {
that.initPlugin();
}, 3000);
} else {
// that.messageBox = true
// alert('')
// that.downloadHikVideo()
// setTimeout(function () {
// that.messageBox = false
// }, 5000)
// setTimeout(function () {
// alert('')
// that.$message({
// message: ' \n https://www.baidu.com',
// type: 'warning'
// });
// }, 5000)
}
},
cbConnectClose: () => {
// bNormalClose = false
// JS_DisconnectbNormalClose = true
// console.log("cbConnectClose");
that.oWebControl = null;
},
});
},
//
init(callback) {
let that = this;
that.getPubKey(() => {
let appkey = that.objData.appkey; //appkey
let secret = that.setEncrypt(that.objData.secret); //secret
let ip = that.objData.ip; //IP
let playMode = that.objData.playMode; //0-1-
let port = that.objData.port; //HTTPS443
let snapDir = "D:\\SnapDir"; //
let videoDir = "D:\\VideoDir"; //
let layout = that.objData.layout; //playMode
let enableHTTPS = 1; //HTTPS1
let encryptedFields = "secret"; //secret
let showToolbar = 1; //0-0-
let showSmart = 1; //线0-0-
let buttonIDs =
"0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"; //
// var toolBarButtonIDs = "2049,2304" //
that.oWebControl
.JS_RequestInterface({
funcName: "init",
argument: JSON.stringify({
appkey: appkey, //APIappkey
secret: secret, //APIsecret
ip: ip, //APIIP
playMode: playMode, //
port: port, //
snapDir: snapDir, //
videoDir: videoDir, //
layout: layout, //
enableHTTPS: enableHTTPS, //HTTPS
encryptedFields: encryptedFields, //
showToolbar: showToolbar, //
showSmart: showSmart, //
buttonIDs, //
}),
})
.then(function (oData) {
that.oWebControl.JS_Resize(that.playWndWidth, that.playWndHeight); // resizefirefoxDIV
if (callback) {
callback();
//
destroyed() {
if (oWebControl != null) {
oWebControl.JS_HideWnd(); //
oWebControl.JS_Disconnect().then(() => { //
},
() => { //
});
}
//
// that.oWebControl.JS_HideWnd()
});
});
},
//
getPubKey(callback) {
let that = this;
this.oWebControl
.JS_RequestInterface({
funcName: "getRSAPubKey",
argument: JSON.stringify({
keyLength: 1024,
}),
})
.then(function (oData) {
if (oData.responseMsg.data) {
that.pubKey = oData.responseMsg.data;
callback();
}
});
},
// RSA
setEncrypt(value) {
let that = this;
let encrypt = new window.JSEncrypt();
encrypt.setPublicKey(that.pubKey);
return encrypt.encrypt(value);
},
//
cbIntegrationCallBack(oData) {
let { responseMsg: type } = oData;
if (type === "error") {
} else {
}
},
//
previewVideo(data) {
let that = this;
let cameraIndexCode = data; //
let streamMode = 0; // 0-1-
let transMode = 0; // 0-UDP1-TCP
let gpuMode = 0; // GPU0-1-
let wndId = -1; // 2x2
// console.log(cameraIndexCode, "-------cameraIndexCode-");
},
methods: {
//
refusePlay() {
//
SubordinateCam({
pageNo: 1,
pageSize: 1000,
regionIndexCode: this.$route.params.id
}).then(res => {
if (res.data.code == 0) {
let shuliang = res.data.data.list.length;
if (shuliang == 1 || shuliang == 0) {
this.camlength = "1x1"
} else if (shuliang > 1 && shuliang <= 4) {
this.camlength = "2x2"
} else if (shuliang > 4 && shuliang <= 9) {
this.camlength = "3x3"
} else if (shuliang > 9 && shuliang <= 16) {
this.camlength = "4x4"
} else if (shuliang > 16 && shuliang <= 25) {
this.camlength = "5x5"
}
//
oWebControl.JS_RequestInterface({
funcName: "setLayout",
argument: {layout: this.camlength}
}).then(() => {
//
if (res.data.data.list.length > 0) {
this.$message.success('获取成功 监控点数量为' + res.data.data.list.length)
res.data.data.list.forEach((item, index) => {
oWebControl.JS_RequestInterface({
funcName: "startPreview",
argument: JSON.stringify({
cameraIndexCode: item.cameraIndexCode, //
streamMode: 0, //
transMode: 1, //
gpuMode: 0, //GPU
wndId: index + 1 //
})
})
})
} else {
this.$message.warning('当前区域无直属监控点区域')
//
let result = JSON.stringify({
"funcName": "stopAllPreview"
}, null, 2)
this.requestInterface(result);
}
})
} else {
this.$message.error('获取失败')
}
})
},
// $('.map').width(), $('.map').height() - 60)
//
initPlugin() {
// eslint-disable-next-line no-undef
oWebControl = new WebControl({
szPluginContainer: "playWnd", // id
iServicePortStart: 15900, // 使
iServicePortEnd: 15909,
szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11", // IE10使ActiveXclsid
cbConnectSuccess: () => { // WebControl
oWebControl.JS_StartService("window", { // WebControl
dllPath: "./VideoPluginConnect.dll" // "./VideoPluginConnect.dll"
}).then(() => { //
oWebControl.JS_SetWindowControlCallback({ //
cbIntegrationCallBack: this.cbIntegrationCallBack
});
oWebControl.JS_CreateWnd("playWnd", $('.map').width(), $('.map').height() - 60).then(() => { //JS_CreateWnd
this.init(); //
});
}, () => { //
});
},
cbConnectError: () => { // WebControl
oWebControl = null;
// $("#playWnd").html("...");
this.lodingshow = true;
// eslint-disable-next-line no-undef
WebControl.JS_WakeUp("VideoWebPlugin://"); // errorwakeup
initCount++;
if (initCount < 3) {
setTimeout(() => {
this.initPlugin();
}, 3000)
} else {
this.lodingshow = false;
this.lodingres = true;
// $("#playWnd").html("");
}
},
cbConnectClose: () => {
// bNormalClose = false
// JS_DisconnectbNormalClose = true
oWebControl = null;
}
});
},
//
init() {
//
this.getPubKey(() => {
////////////////////////////////// ////////////////////////////////////
let appkey = admin; //appkey
//
let secret = "mygymygy."; //secret
let ip = "192.168.2.107"; //IP
let port = "443"; //HTTPS443
let playMode = 0; //0-1-
let snapDir = "D:\\SnapDir"; //
let videoDir = "D:\\VideoDir"; //
let layout = "1x1"; //playMode
let enableHTTPS = 1; //HTTPS1
let encryptedFields = 'secret'; //secret
let showToolbar = 1; //0-0-
let showSmart = 1; //线0-0-
let buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,768,769"; //
let toolBarButtonIDs = "2048,2304,2305,2306,2307,2308,2309,4096,4097,4098,4099,4608,4609"
////////////////////////////////// ////////////////////////////////////
oWebControl.JS_RequestInterface({
funcName: "init",
argument: JSON.stringify({
appkey: appkey, //APIappkey
secret: secret, //APIsecret
ip: ip, //APIIP
playMode: playMode, //
port: port, //
snapDir: snapDir, //
videoDir: videoDir, //
layout: layout, //
enableHTTPS: enableHTTPS, //HTTPS
encryptedFields: encryptedFields, //
showToolbar: showToolbar, //
showSmart: showSmart, //
buttonIDs: buttonIDs, //
toolBarButtonIDs:toolBarButtonIDs //
})
}).then(() => {
oWebControl.JS_Resize( $('.map').width(), $('.map').height() - 60); // resizefirefoxDIV
//
this.refusePlay();
});
});
},
//
getPubKey(callback) {
oWebControl.JS_RequestInterface({
funcName: "getRSAPubKey",
argument: JSON.stringify({
keyLength: 1024
})
}).then((oData) => {
console.log(oData);
if (oData.responseMsg.data) {
pubKey = oData.responseMsg.data;
callback()
}
})
},
//RSA
setEncrypt(value) {
// eslint-disable-next-line no-undef
let encrypt = new JSEncrypt();
encrypt.setPublicKey(pubKey);
return encrypt.encrypt(value);
},
//
cbIntegrationCallBack(oData) {
// if (oData.responseMsg.msg.cameraIndexCode != '') {
// this.$router.push({name: 'playbackDetails', params: {id: oData.responseMsg.msg.cameraIndexCode}})
// }
this.showCBInfo(JSON.stringify(oData.responseMsg));
},
// JS_CuttingPartWindow
setWndCover() {
let iWidth = $('.map').width();
let iHeight = $('.map').height() - 60;
let oDivRect = $("#playWnd").get(0).getBoundingClientRect();
let iCoverLeft = (oDivRect.left < 0) ? Math.abs(oDivRect.left) : 0;
let iCoverTop = (oDivRect.top < 0) ? Math.abs(oDivRect.top) : 0;
let iCoverRight = (oDivRect.right - iWidth > 0) ? Math.round(oDivRect.right - iWidth) : 0;
let iCoverBottom = (oDivRect.bottom - iHeight > 0) ? Math.round(oDivRect.bottom - iHeight) : 0;
iCoverLeft = (iCoverLeft > 1200) ? 1200 : iCoverLeft;
iCoverTop = (iCoverTop > 600) ? 600 : iCoverTop;
iCoverRight = (iCoverRight > 1200) ? 1200 : iCoverRight;
iCoverBottom = (iCoverBottom > 600) ? 600 : iCoverBottom;
oWebControl.JS_RepairPartWindow(0, 0, $('.map').width(), $('.map').height() - 60); // 1
if (iCoverLeft != 0) {
oWebControl.JS_CuttingPartWindow(0, 0, iCoverLeft, 600);
}
if (iCoverTop != 0) {
oWebControl.JS_CuttingPartWindow(0, 0, $('.map').width(), iCoverTop); //
}
if (iCoverRight != 0) {
oWebControl.JS_CuttingPartWindow($('.map').width() - iCoverRight, 0, iCoverRight, 600);
}
if (iCoverBottom != 0) {
oWebControl.JS_CuttingPartWindow(0, 600 - iCoverBottom, $('.map').width(), iCoverBottom);
}
},
//
// valueJS_RequestInterfacejsonargumentargument
requestInterface(value) {
this.isJSON(value);
let JsonParam = JSON.parse(value);
let JsonArgument = JsonParam.argument;
JsonParam.argument = JSON.stringify(JsonArgument);
oWebControl.JS_RequestInterface(JsonParam).then((oData) => {
this.showCBInfo(JSON.stringify(oData ? oData.responseMsg : ''));
});
},
//
showCBInfo(szInfo, type) {
if (type === 'error') {
szInfo = "<div style='color: red;'>" + this.dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss") + " " + szInfo + "</div>";
} else {
szInfo = "<div>" + this.dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss") + " " + szInfo + "</div>";
}
$("#cbInfo").html(szInfo + $("#cbInfo").html());
},
// json
isJSON(str) {
if (typeof str == 'string') {
try {
let obj = JSON.parse(str);
if (typeof obj == 'object' && obj) {
return true;
} else {
this.showCBInfo("param is not the correct JSON message");
return false;
}
} catch (e) {
this.showCBInfo("param is not the correct JSON message");
return false;
}
}
},
//
dateFormat(oDate, fmt) {
let o = {
"M+": oDate.getMonth() + 1, //
"d+": oDate.getDate(), //
"h+": oDate.getHours(), //
"m+": oDate.getMinutes(), //
"s+": oDate.getSeconds(), //
"q+": Math.floor((oDate.getMonth() + 3) / 3), //
"S": oDate.getMilliseconds()//
};
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(RegExp.$1, (oDate.getFullYear() + "").substr(4 - RegExp.$1.length));
}
for (let k in o) {
if (new RegExp("(" + k + ")").test(fmt)) {
fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
}
}
return fmt;
},
//
downloadFile() {
var a = document.createElement('a')
// var blob = new Blob([content])
// var url = window.URL.createObjectURL(blob)
a.href = '控件下载地址'
a.download = '视频插件'
a.click()
// window.URL.revokeObjectURL(url)
},
that.oWebControl.JS_RequestInterface({
funcName: "startPreview",
argument: JSON.stringify({
cameraIndexCode: cameraIndexCode.trim(), //
streamMode: streamMode, //
transMode: transMode, //
gpuMode: gpuMode, // GPU
wndId: wndId, //
}),
});
},
//
stopAllPreview() {
this.oWebControl.JS_RequestInterface({
funcName: "stopAllPreview",
});
},
//
dateFormat(oDate, fmt) {
let o = {
"M+": oDate.getMonth() + 1, //
"d+": oDate.getDate(), //
"h+": oDate.getHours(), //
"m+": oDate.getMinutes(), //
"s+": oDate.getSeconds(), //
"q+": Math.floor((oDate.getMonth() + 3) / 3), //
S: oDate.getMilliseconds(), //
};
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(
RegExp.$1,
(oDate.getFullYear() + "").substr(4 - RegExp.$1.length)
);
}
for (let k in o) {
if (new RegExp("(" + k + ")").test(fmt)) {
fmt = fmt.replace(
RegExp.$1,
RegExp.$1.length == 1
? o[k]
: ("00" + o[k]).substr(("" + o[k]).length)
);
}
}
return fmt;
},
// JS_CuttingPartWindow
setWndCover() {
var iWidth = $(window).width();
var iHeight = $(window).height();
var oDivRect = $("#playWnd").get(0).getBoundingClientRect();
var iCoverLeft = oDivRect.left < 0 ? Math.abs(oDivRect.left) : 0;
var iCoverTop = oDivRect.top < 0 ? Math.abs(oDivRect.top) : 0;
var iCoverRight =
oDivRect.right - iWidth > 0 ? Math.round(oDivRect.right - iWidth) : 0;
var iCoverBottom =
oDivRect.bottom - iHeight > 0
? Math.round(oDivRect.bottom - iHeight)
: 0;
iCoverLeft = iCoverLeft > 2041 ? 2041 : iCoverLeft;
iCoverTop = iCoverTop > 945 ? 945 : iCoverTop;
iCoverRight = iCoverRight > 2041 ? 2041 : iCoverRight;
iCoverBottom = iCoverBottom > 945 ? 945 : iCoverBottom;
this.oWebControl.JS_RepairPartWindow(0, 0, 2041, 946); // 1
if (iCoverLeft != 0) {
this.oWebControl.JS_CuttingPartWindow(0, 0, iCoverLeft, 946);
}
if (iCoverTop != 0) {
this.oWebControl.JS_CuttingPartWindow(0, 0, 2041, iCoverTop); //
}
if (iCoverRight != 0) {
this.oWebControl.JS_CuttingPartWindow(
2041 - iCoverRight,
0,
iCoverRight,
946
);
}
if (iCoverBottom != 0) {
this.oWebControl.JS_CuttingPartWindow(
0,
946 - iCoverBottom,
2041,
iCoverBottom
);
}
},
},
};
</script>
<style lang="scss" scoped>
.videoMain {
width: 100%;
height: 100%;
}
</style>

View File

@ -146,11 +146,7 @@
<defective :message="this.defectiveData" />
</div>
<div style="width: 30%; margin-top: 50px">
<hkVideo
:cameraIndexCode="cameraIndexCode"
:objData="objData"
ref="hikVideo"
></hkVideo>
<hkVideo :monitoringNumber="cameraIndexCode"></hkVideo>
</div>
</div>
<div style="height: 50%; display: flex">
@ -251,6 +247,7 @@
</template>
<script>
import axios from "axios";
import { listWorkorder } from "@/api/mes/pro/workorder";
// import * as statisServer from "@/api/statistics";
@ -265,7 +262,7 @@ export default {
components: { defective, complete, ticket, hkVideo },
data() {
return {
cameraIndexCode: "", //wed
cameraIndexCode: "1a033f81-a404-4a66-aabf-cb0ead6cc2be", //wed
//wed
objData: {
appkey: "", //appkey
@ -366,6 +363,28 @@ export default {
},
getList() {
var params = {
pageNo: 1,
pageSize: 9999,
};
axios({
url: "https://190.168.2.104:8077/artemis/api/resource/v1/cameras",
method: "post",
data: params, //data;
headers: {
//
"Content-Type": "application/json",
},
})
.then((res) => {
console.log(res);
})
.catch((error) => {
if (error) {
throw error;
}
});
// listWorkorder(this.queryParams).then((response) => {
// this.workorderList = response.data;
// });

View File

@ -666,7 +666,8 @@ export default {
handleproductione(row) {
const routeId = row.workorderId || this.ids;
axios
.get("http://192.168.3.53:8077/manage/task/execute?ids=" + routeId)
.get("http://192.168.2.104:8077/manage/task/execute?ids=" + routeId)
// .get("http://192.168.3.53:8077/manage/task/execute?ids=" + routeId)
// .get("http://127.0.0.1:8077/manage/task/execute?ids=" + routeId)
.then((res) => {
if (res.data.code === 200) {
@ -682,7 +683,8 @@ export default {
Pendingproduction(row) {
const routeId = row.workorderId || this.ids;
axios
.get("http://192.168.3.53:8077/manage/task/suspension?id=" + routeId)
.get("http://192.168.2.104:8077/manage/task/suspension?id=" + routeId)
// .get("http://192.168.3.53:8077/manage/task/suspension?id=" + routeId)
// .get("http://127.0.0.1:8077/manage/task/suspension?id=" + routeId)
.then((res) => {
if (res.data.code === 200) {

View File

@ -434,6 +434,7 @@
</template>
<script>
import axios from "axios";
import {
listItemrecpt,
getItemrecpt,
@ -441,7 +442,6 @@ import {
addItemrecpt,
updateItemrecpt,
confirmItemrecpt,
storage,
} from "@/api/mes/wm/itemrecpt";
import { listItemrecptline } from "@/api/mes/wm/itemrecptline";
import { listMdItem } from "@/api/mes/md/pallet";
@ -693,8 +693,12 @@ export default {
listItemrecptline({ recptId: row.recptId }).then((response) => {
this.itemrecptlineList = response.rows;
});
var queryParams = {
pageNum: 1,
pageSize: 10000,
};
//
listMdItem(this.queryParams).then((response) => {
listMdItem(queryParams).then((response) => {
this.itemList = response.rows;
});
},
@ -707,7 +711,6 @@ export default {
}
this.perform.itemCode = data.itemCode;
this.perform.lineId = data.lineId;
this.perform.itemId = data.itemId;
},
selectTray(data) {
this.perform.palletId = data.proPalletId;
@ -715,12 +718,20 @@ export default {
},
submitFileForm() {
if (this.remainingquantity != 0) {
storage(this.perform).then((response) => {
this.$modal.msgSuccess("入库成功");
this.warehousing = false;
this.getList();
this.selectEncoding();
});
axios
.get("http://192.168.2.104:8077/manage/matter/storageItem", {
params: this.perform,
})
.then((res) => {
if (res.data.code === 200) {
this.$modal.msgSuccess("入库成功");
this.warehousing = false;
this.getList();
this.selectEncoding();
} else {
this.$message.error(res.data.msg);
}
});
} else {
this.$message({
message: "当前入库数量为0",

View File

@ -35,14 +35,16 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
"/prod-api": {
target: `http://192.168.3.53:8063`,
target: `http://192.168.2.104:8063`,
// target: `http://192.168.3.53:8063`,
changeOrigin: true,
// pathRewrite: {
// ['^' + process.env.VUE_APP_BASE_API]: ''
// }
},
"/ureport": {
target: `http://192.168.3.53:8063`,
target: `http://192.168.2.104:8063`,
// target: `http://192.168.3.53:8063`,
ws: false,
changeOrigin: true,
pathRewrite: {