diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 95aa54b..247b928 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -117,7 +117,7 @@ export default { }, { index: "/photographicDevice", - title: "拍照装置管理", + title: "装置管理", }, { index: "/devicePhotoSchedule", @@ -159,6 +159,10 @@ export default { index: "/waterMark", title: "水印下发", }, + { + index: "/otherCommon", + title: "批量命令", + }, { index: "/aiWork", title: "AI绘图", diff --git a/src/router/index.js b/src/router/index.js index 5cf4f93..cebf06e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -198,6 +198,17 @@ const routes = [ requiresAuth: true, }, }, + { + path: "/otherCommon", + component: () => import("../views/otherCommon/index.vue"), + name: "otherCommon", + meta: { + title: "批量命令", + icon: "", + keepAlive: true, + requiresAuth: true, + }, + }, { path: "/reportData", component: () => import("../views/reportData/index.vue"), diff --git a/src/views/otherCommon/index.vue b/src/views/otherCommon/index.vue new file mode 100644 index 0000000..d25c13c --- /dev/null +++ b/src/views/otherCommon/index.vue @@ -0,0 +1,285 @@ + + + diff --git a/src/views/waterMark/index.vue b/src/views/waterMark/index.vue index 06d284f..6f70c67 100644 --- a/src/views/waterMark/index.vue +++ b/src/views/waterMark/index.vue @@ -152,7 +152,7 @@ export default { for (let j = 0; j < this.checkList.length; j++) { for (let i = 0; i < this.cmdidArr.length; i++) { var command = - "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=osd --cmdid=" + + "./bin/xympadmn.exe --server=61.169.135.150 --port=6891 --act=osd --cmdid=" + this.cmdidArr[i] + " --flag=1 --channel=" + this.checkList[j] + @@ -164,7 +164,7 @@ export default { "
" + "sleep 1;" + "
" + - "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=capture --cmdid=" + + "./bin/xympadmn.exe --server=61.169.135.150 --port=6891 --act=capture --cmdid=" + this.cmdidArr[i] + " --channel=" + this.checkList[j] + @@ -237,7 +237,7 @@ export default { border-radius: 4px; margin-right: 8px; .el-textarea { - margin-top: 12px; + margin-top: 2px; } } .leftWaterBox { @@ -250,7 +250,7 @@ export default { padding: 12px; border-radius: 4px; .el-textarea { - margin-top: 12px; + margin-top: 2px; } } }