搬运起点

This commit is contained in:
蔡玲
2024-12-19 10:42:08 +08:00
parent 7486ba6078
commit 8611fca1f8
12 changed files with 1215 additions and 682 deletions

View File

@@ -24,6 +24,10 @@ export const queryTaskList = () => post('api/task/queryTaskList', {})
export const deleteTask = (taskNum) => post('api/task/deleteTask', { export const deleteTask = (taskNum) => post('api/task/deleteTask', {
task_num: taskNum task_num: taskNum
}) })
export const querySingleTask = () => post('api/task/querySingleTask', {})
export const deleteSingleTask = (taskNum) => post('api/task/deleteSingleTask', {
task_num: taskNum
})
// 1.5调整任务顺序 // 1.5调整任务顺序
export const updateTask = (arr) => post('api/task/updateTask', { export const updateTask = (arr) => post('api/task/updateTask', {
param: arr param: arr

View File

@@ -1,3 +1,4 @@
/* eslint-disable */
import {post} from '@config/http.js' import {post} from '@config/http.js'
// import store from '../vuex/store' // import store from '../vuex/store'
@@ -134,6 +135,271 @@ export const updatePass = (newPass, oldPass) => post('api/users/updatePass', {
// 用户登录获取菜单 // 用户登录获取菜单
export const sysMenuBuild = () => post('api/sysMenu/build', { export const sysMenuBuild = () => post('api/sysMenu/build', {
}) })
// export const sysMenuBuild = () => {
// let res = [
// {
// "menuId": "1654807438270009344",
// "pid": "1324783485328",
// "label": "首页",
// "router": "",
// "index": "1",
// "children": [
// {
// "menuId": "1654807784312672256",
// "pid": "1654807438270009344",
// "label": "首页",
// "router": "/index/home",
// "index": "1",
// "children": null,
// "title": "首页",
// "zhTitle": "首页",
// "enTitle": "Index",
// "inTitle": null,
// "zh_title": "首页",
// "en_title": "Index",
// "in_title": null
// }
// ],
// "title": "首页",
// "zhTitle": "首页",
// "enTitle": "Index",
// "inTitle": null,
// "zh_title": "首页",
// "en_title": "Index",
// "in_title": null
// },
// {
// "menuId": "1654808014131171328",
// "pid": "1324783485328",
// "label": "任务",
// "router": "",
// "index": "2",
// "children": [
// {
// "menuId": "1654808296076480512",
// "pid": "1654808014131171328",
// "label": "搬运起点",
// "router": "/index/carrypoint",
// "index": "1",
// "children": null,
// "title": "搬运起点",
// "zhTitle": "搬运起点",
// "enTitle": "Carry Point",
// "inTitle": null,
// "zh_title": "搬运起点",
// "en_title": "Carry\nPoint",
// "in_title": null
// }
// ],
// "title": "任务",
// "zhTitle": "任务",
// "enTitle": "Task",
// "inTitle": null,
// "zh_title": "任务",
// "en_title": "Task",
// "in_title": null
// },
// {
// "menuId": "1654808791742550016",
// "pid": "1324783485328",
// "label": "车辆",
// "router": "",
// "index": "4",
// "children": [
// {
// "menuId": "1654808864970903552",
// "pid": "1654808791742550016",
// "label": "车辆状态",
// "router": "/index/vehiclestatus",
// "index": "1",
// "children": null,
// "title": "车辆状态",
// "zhTitle": "车辆状态",
// "enTitle": "Vehicle State ",
// "inTitle": null,
// "zh_title": "车辆状态",
// "en_title": "Vehicle\nState",
// "in_title": null
// },
// {
// "menuId": "1654808966481448960",
// "pid": "1654808791742550016",
// "label": "车辆控制",
// "router": "/index/vehiclecontrol",
// "index": "2",
// "children": null,
// "title": "车辆控制",
// "zhTitle": "车辆控制",
// "enTitle": "Vehicle Control",
// "inTitle": null,
// "zh_title": "车辆控制",
// "en_title": "Vehicle\nControl",
// "in_title": null
// },
// {
// "menuId": "1654808966481448961",
// "pid": "1654808791742550016",
// "label": "恢复定位",
// "router": "/index/slam",
// "index": "3",
// "children": null,
// "title": "恢复定位",
// "zhTitle": "恢复定位",
// "enTitle": "Vehicle Control",
// "inTitle": null,
// "zh_title": "恢复定位",
// "en_title": "Vehicle\nControl",
// "in_title": null
// }
// ],
// "title": "车辆",
// "zhTitle": "车辆",
// "enTitle": "Vehicle",
// "inTitle": null,
// "zh_title": "车辆",
// "en_title": "Vehicle",
// "in_title": null
// },
// {
// "menuId": "1654808657013116928",
// "pid": "1324783485328",
// "label": "故障",
// "router": "",
// "index": "3",
// "children": [
// {
// "menuId": "1654808721102082048",
// "pid": "1654808657013116928",
// "label": "故障信息",
// "router": "/index/errorinfo",
// "index": "1",
// "children": null,
// "title": "故障信息",
// "zhTitle": "故障信息",
// "enTitle": "Fault Information",
// "inTitle": null,
// "zh_title": "故障信息",
// "en_title": "Fault\nInformation",
// "in_title": null
// }
// ],
// "title": "故障",
// "zhTitle": "故障",
// "enTitle": "Fault ",
// "inTitle": null,
// "zh_title": "故障",
// "en_title": "Fault",
// "in_title": null
// },
// {
// "menuId": "1654809097821884416",
// "pid": "1324783485328",
// "label": "示教",
// "router": "/index/teach",
// "index": "5",
// "children": null,
// "title": "示教",
// "zhTitle": "示教",
// "enTitle": "Teach",
// "inTitle": null,
// "zh_title": "示教",
// "en_title": "Teach",
// "in_title": null
// },
// {
// "menuId": "1664808014131171329",
// "pid": "1324783485328",
// "label": "系统",
// "router": "",
// "index": "6",
// "children": [
// {
// "menuId": "1664808014131171330",
// "pid": "1664808014131171329",
// "label": "用户管理",
// "router": "/index/user",
// "index": "1",
// "children": null,
// "title": "用户管理",
// "zhTitle": "用户管理",
// "enTitle": "User Management",
// "inTitle": null,
// "zh_title": "用户管理",
// "en_title": "User\nManagement",
// "in_title": null
// },
// {
// "menuId": "1664808014131171331",
// "pid": "1664808014131171329",
// "label": "角色管理",
// "router": "/index/role",
// "index": "2",
// "children": null,
// "title": "角色管理",
// "zhTitle": "角色管理",
// "enTitle": "Role Management",
// "inTitle": null,
// "zh_title": "角色管理",
// "en_title": "Role\nManagement",
// "in_title": null
// },
// {
// "menuId": "1664808014131171335",
// "pid": "1664808014131171329",
// "label": "系统管理",
// "router": "/index/system",
// "index": "3",
// "children": null,
// "title": "系统管理",
// "zhTitle": "系统管理",
// "enTitle": "System Param",
// "inTitle": null,
// "zh_title": "系统管理",
// "en_title": "System\nParam",
// "in_title": null
// },
// {
// "menuId": "1664808014131171334",
// "pid": "1664808014131171329",
// "label": "开发者选项",
// "router": "/index/developer",
// "index": "4",
// "children": null,
// "title": "开发者选项",
// "zhTitle": "开发者选项",
// "enTitle": "Developer Param",
// "inTitle": null,
// "zh_title": "开发者选项",
// "en_title": "Developer\nParam",
// "in_title": null
// },
// {
// "menuId": "1664808014131171336",
// "pid": "1664808014131171329",
// "label": "远程支持",
// "router": "/index/remote",
// "index": "5",
// "children": null,
// "title": "远程支持",
// "zhTitle": "远程支持",
// "enTitle": "Remote Support",
// "inTitle": null,
// "zh_title": "远程支持",
// "en_title": "Remote\nSupport",
// "in_title": null
// }
// ],
// "title": "系统",
// "zhTitle": "系统",
// "enTitle": "System",
// "inTitle": null,
// "zh_title": "系统",
// "en_title": "System",
// "in_title": null
// }
// ]
// return res
// }
// 用户退出 // 用户退出
export const authLogout = () => post('auth/logout', { export const authLogout = () => post('auth/logout', {

View File

@@ -1,281 +1,346 @@
/* eslint-disable */ /* eslint-disable */
export const sysMenuBuild = () => { export const queryTaskList = () => {
let res = [ let res = {
{ code: '1',
"menuId": "1654807438270009344", result: [{next_point_code: '3', task_status: '01'}, {next_point_code: '4', task_status: '00'}, {next_point_code: '5', task_status: '00'}]
"pid": "1324783485328", }
"label": "首页", return res
"router": "", }
"index": "1", export const querySingleTask = () => {
"children": [ let res = {
{ code: '1',
"menuId": "1654807784312672256", result: {'next_point_code': '4'},
"pid": "1654807438270009344", desc: 'ok'
"label": "首页", }
"router": "/index/home", return res
"index": "1", }
"children": null, export const queryPoint = () => {
"title": "首页", let res = {
"zhTitle": "首页", code: '1',
"enTitle": "Index", result: [
"inTitle": null, {
"zh_title": "首页", point_code: '01',
"en_title": "Index", code_name: '18-一线起升电机',
"in_title": null en_code_name: 'english-test'
} },
], {
"title": "首页", point_code: '02',
"zhTitle": "首页", code_name: '二楼中间层休息点位与茶水间的充电桩交叉点1',
"enTitle": "Index", en_code_name: 'english-002'
"inTitle": null, },
"zh_title": "首页", {
"en_title": "Index", point_code: '3',
"in_title": null code_name: 'A-ZD103'
}, },
{ {
"menuId": "1654808014131171328", point_code: '4',
"pid": "1324783485328", code_name: 'A-ZD101'
"label": "任务", },
"router": "", {
"index": "2", point_code: '5',
"children": [ code_name: 'A-ZD101'
{ },
"menuId": "1654808296076480512", {
"pid": "1654808014131171328", point_code: '6',
"label": "搬运起点", code_name: 'A-ZD101'
"router": "/index/carrypoint", },
"index": "1", {
"children": null, point_code: '7',
"title": "搬运起点", code_name: '二楼中间层休息点位与茶水间的充电桩交叉点1'
"zhTitle": "搬运起点", },
"enTitle": "Carry Point", {
"inTitle": null, point_code: '8',
"zh_title": "搬运起点", code_name: '我是一个超级长的标题,显示不下'
"en_title": "Carry\nPoint", },
"in_title": null {
} point_code: '9',
], code_name: 'aaammm brown head big so daijgsd jigna whcignaig ijanoghoniojojio jsi '
"title": "任务", },
"zhTitle": "任务", {
"enTitle": "Task", point_code: '10',
"inTitle": null, code_name: 'A-ZD101'
"zh_title": "任务", }
"en_title": "Task", ]
"in_title": null }
}, return res
{ }
"menuId": "1654808791742550016", export const sysMenuBuild = () => {
"pid": "1324783485328", let res = [
"label": "车辆", {
"router": "", "menuId": "1654807438270009344",
"index": "4", "pid": "1324783485328",
"children": [ "label": "首页",
{ "router": "",
"menuId": "1654808864970903552", "index": "1",
"pid": "1654808791742550016", "children": [
"label": "车辆状态", {
"router": "/index/vehiclestatus", "menuId": "1654807784312672256",
"index": "1", "pid": "1654807438270009344",
"children": null, "label": "首页",
"title": "车辆状态", "router": "/index/home",
"zhTitle": "车辆状态", "index": "1",
"enTitle": "Vehicle State ", "children": null,
"inTitle": null, "title": "首页",
"zh_title": "车辆状态", "zhTitle": "首页",
"en_title": "Vehicle\nState", "enTitle": "Index",
"in_title": null "inTitle": null,
}, "zh_title": "首页",
{ "en_title": "Index",
"menuId": "1654808966481448960", "in_title": null
"pid": "1654808791742550016", }
"label": "车辆控制", ],
"router": "/index/vehiclecontrol", "title": "首页",
"index": "2", "zhTitle": "首页",
"children": null, "enTitle": "Index",
"title": "车辆控制", "inTitle": null,
"zhTitle": "车辆控制", "zh_title": "首页",
"enTitle": "Vehicle Control", "en_title": "Index",
"inTitle": null, "in_title": null
"zh_title": "车辆控制", },
"en_title": "Vehicle\nControl", {
"in_title": null "menuId": "1654808014131171328",
}, "pid": "1324783485328",
{ "label": "任务",
"menuId": "1654808966481448961", "router": "",
"pid": "1654808791742550016", "index": "2",
"label": "恢复定位", "children": [
"router": "/index/slam", {
"index": "3", "menuId": "1654808296076480512",
"children": null, "pid": "1654808014131171328",
"title": "恢复定位", "label": "搬运起点",
"zhTitle": "恢复定位", "router": "/index/carrypoint",
"enTitle": "Vehicle Control", "index": "1",
"inTitle": null, "children": null,
"zh_title": "恢复定位", "title": "搬运起点",
"en_title": "Vehicle\nControl", "zhTitle": "搬运起点",
"in_title": null "enTitle": "Carry Point",
} "inTitle": null,
], "zh_title": "搬运起点",
"title": "车辆", "en_title": "Carry\nPoint",
"zhTitle": "车辆", "in_title": null
"enTitle": "Vehicle", }
"inTitle": null, ],
"zh_title": "车辆", "title": "任务",
"en_title": "Vehicle", "zhTitle": "任务",
"in_title": null "enTitle": "Task",
}, "inTitle": null,
{ "zh_title": "任务",
"menuId": "1654808657013116928", "en_title": "Task",
"pid": "1324783485328", "in_title": null
"label": "故障", },
"router": "", {
"index": "3", "menuId": "1654808791742550016",
"children": [ "pid": "1324783485328",
{ "label": "车辆",
"menuId": "1654808721102082048", "router": "",
"pid": "1654808657013116928", "index": "4",
"label": "故障信息", "children": [
"router": "/index/errorinfo", {
"index": "1", "menuId": "1654808864970903552",
"children": null, "pid": "1654808791742550016",
"title": "故障信息", "label": "车辆状态",
"zhTitle": "故障信息", "router": "/index/vehiclestatus",
"enTitle": "Fault Information", "index": "1",
"inTitle": null, "children": null,
"zh_title": "故障信息", "title": "车辆状态",
"en_title": "Fault\nInformation", "zhTitle": "车辆状态",
"in_title": null "enTitle": "Vehicle State ",
} "inTitle": null,
], "zh_title": "车辆状态",
"title": "故障", "en_title": "Vehicle\nState",
"zhTitle": "故障", "in_title": null
"enTitle": "Fault ", },
"inTitle": null, {
"zh_title": "故障", "menuId": "1654808966481448960",
"en_title": "Fault", "pid": "1654808791742550016",
"in_title": null "label": "车辆控制",
}, "router": "/index/vehiclecontrol",
{ "index": "2",
"menuId": "1654809097821884416", "children": null,
"pid": "1324783485328", "title": "车辆控制",
"label": "示教", "zhTitle": "车辆控制",
"router": "/index/teach", "enTitle": "Vehicle Control",
"index": "5", "inTitle": null,
"children": null, "zh_title": "车辆控制",
"title": "示教", "en_title": "Vehicle\nControl",
"zhTitle": "示教", "in_title": null
"enTitle": "Teach", },
"inTitle": null, {
"zh_title": "示教", "menuId": "1654808966481448961",
"en_title": "Teach", "pid": "1654808791742550016",
"in_title": null "label": "恢复定位",
}, "router": "/index/slam",
{ "index": "3",
"menuId": "1664808014131171329", "children": null,
"pid": "1324783485328", "title": "恢复定位",
"label": "系统", "zhTitle": "恢复定位",
"router": "", "enTitle": "Vehicle Control",
"index": "6", "inTitle": null,
"children": [ "zh_title": "恢复定位",
{ "en_title": "Vehicle\nControl",
"menuId": "1664808014131171330", "in_title": null
"pid": "1664808014131171329", }
"label": "用户管理", ],
"router": "/index/user", "title": "车辆",
"index": "1", "zhTitle": "车辆",
"children": null, "enTitle": "Vehicle",
"title": "用户管理", "inTitle": null,
"zhTitle": "用户管理", "zh_title": "车辆",
"enTitle": "User Management", "en_title": "Vehicle",
"inTitle": null, "in_title": null
"zh_title": "用户管理", },
"en_title": "User\nManagement", {
"in_title": null "menuId": "1654808657013116928",
}, "pid": "1324783485328",
{ "label": "故障",
"menuId": "1664808014131171331", "router": "",
"pid": "1664808014131171329", "index": "3",
"label": "角色管理", "children": [
"router": "/index/role", {
"index": "2", "menuId": "1654808721102082048",
"children": null, "pid": "1654808657013116928",
"title": "角色管理", "label": "故障信息",
"zhTitle": "角色管理", "router": "/index/errorinfo",
"enTitle": "Role Management", "index": "1",
"inTitle": null, "children": null,
"zh_title": "角色管理", "title": "故障信息",
"en_title": "Role\nManagement", "zhTitle": "故障信息",
"in_title": null "enTitle": "Fault Information",
}, "inTitle": null,
{ "zh_title": "故障信息",
"menuId": "1664808014131171335", "en_title": "Fault\nInformation",
"pid": "1664808014131171329", "in_title": null
"label": "系统管理", }
"router": "/index/system", ],
"index": "3", "title": "故障",
"children": null, "zhTitle": "故障",
"title": "系统管理", "enTitle": "Fault ",
"zhTitle": "系统管理", "inTitle": null,
"enTitle": "System Param", "zh_title": "故障",
"inTitle": null, "en_title": "Fault",
"zh_title": "系统管理", "in_title": null
"en_title": "System\nParam", },
"in_title": null {
}, "menuId": "1654809097821884416",
{ "pid": "1324783485328",
"menuId": "1664808014131171334", "label": "示教",
"pid": "1664808014131171329", "router": "/index/teach",
"label": "开发者选项", "index": "5",
"router": "/index/developer", "children": null,
"index": "4", "title": "示教",
"children": null, "zhTitle": "示教",
"title": "开发者选项", "enTitle": "Teach",
"zhTitle": "开发者选项", "inTitle": null,
"enTitle": "Developer Param", "zh_title": "示教",
"inTitle": null, "en_title": "Teach",
"zh_title": "开发者选项", "in_title": null
"en_title": "Developer\nParam", },
"in_title": null {
}, "menuId": "1664808014131171329",
{ "pid": "1324783485328",
"menuId": "1664808014131171336", "label": "系统",
"pid": "1664808014131171329", "router": "",
"label": "远程支持", "index": "6",
"router": "/index/remote", "children": [
"index": "5", {
"children": null, "menuId": "1664808014131171330",
"title": "远程支持", "pid": "1664808014131171329",
"zhTitle": "远程支持", "label": "用户管理",
"enTitle": "Remote Support", "router": "/index/user",
"inTitle": null, "index": "1",
"zh_title": "远程支持", "children": null,
"en_title": "Remote\nSupport", "title": "用户管理",
"in_title": null "zhTitle": "用户管理",
} "enTitle": "User Management",
], "inTitle": null,
"title": "系统", "zh_title": "用户管理",
"zhTitle": "系统", "en_title": "User\nManagement",
"enTitle": "System", "in_title": null
"inTitle": null, },
"zh_title": "系统", {
"en_title": "System", "menuId": "1664808014131171331",
"in_title": null "pid": "1664808014131171329",
}, "label": "角色管理",
{ "router": "/index/role",
"menuId": "1654809097821884416", "index": "2",
"pid": "1324783485328", "children": null,
"label": "调试", "title": "角色管理",
"router": "/index/debug", "zhTitle": "角色管理",
"index": "7", "enTitle": "Role Management",
"children": null, "inTitle": null,
"title": "调试", "zh_title": "角色管理",
"zhTitle": "调试", "en_title": "Role\nManagement",
"enTitle": "Test", "in_title": null
"inTitle": null, },
"zh_title": "调试", {
"en_title": "Test", "menuId": "1664808014131171335",
"in_title": null "pid": "1664808014131171329",
} "label": "系统管理",
] "router": "/index/system",
return res "index": "3",
"children": null,
"title": "系统管理",
"zhTitle": "系统管理",
"enTitle": "System Param",
"inTitle": null,
"zh_title": "系统管理",
"en_title": "System\nParam",
"in_title": null
},
{
"menuId": "1664808014131171334",
"pid": "1664808014131171329",
"label": "开发者选项",
"router": "/index/developer",
"index": "4",
"children": null,
"title": "开发者选项",
"zhTitle": "开发者选项",
"enTitle": "Developer Param",
"inTitle": null,
"zh_title": "开发者选项",
"en_title": "Developer\nParam",
"in_title": null
},
{
"menuId": "1664808014131171336",
"pid": "1664808014131171329",
"label": "远程支持",
"router": "/index/remote",
"index": "5",
"children": null,
"title": "远程支持",
"zhTitle": "远程支持",
"enTitle": "Remote Support",
"inTitle": null,
"zh_title": "远程支持",
"en_title": "Remote\nSupport",
"in_title": null
}
],
"title": "系统",
"zhTitle": "系统",
"enTitle": "System",
"inTitle": null,
"zh_title": "系统",
"en_title": "System",
"in_title": null
},
{
"menuId": "1654809097821884416",
"pid": "1324783485328",
"label": "调试",
"router": "/index/debug",
"index": "7",
"children": null,
"title": "调试",
"zhTitle": "调试",
"enTitle": "Test",
"inTitle": null,
"zh_title": "调试",
"en_title": "Test",
"in_title": null
}
]
return res
} }

View File

@@ -1,10 +1,12 @@
/** 10.4寸屏4:3的1366*768 */
// apt设备尺寸分辨率1024*768 现在新设备2560*1440
(function (doc, win) { (function (doc, win) {
var docEl = doc.documentElement var docEl = doc.documentElement
var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize' var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
var recalc = function () { var recalc = function () {
var clientWidth = docEl.clientWidth var clientWidth = docEl.clientWidth
if (!clientWidth) return if (!clientWidth) return
docEl.style.fontSize = 100 * (clientWidth / 1920) + 'px' docEl.style.fontSize = 100 * (clientWidth / 1366) + 'px'
} }
if (!doc.addEventListener) return if (!doc.addEventListener) return
win.addEventListener(resizeEvt, recalc, false) win.addEventListener(resizeEvt, recalc, false)

View File

@@ -28,7 +28,8 @@ module.exports = {
button1: 'Auto Pickup', button1: 'Auto Pickup',
button2: 'Auto Release', button2: 'Auto Release',
button3: 'Input Target Position', button3: 'Input Target Position',
button4: 'Set Target Position' button4: 'Set Target Position',
button5: 'Task Distribution'
}, },
tasklists: { tasklists: {
topinfo: 'Task Management', topinfo: 'Task Management',

View File

@@ -28,7 +28,8 @@ module.exports = {
button1: '自动取货', button1: '自动取货',
button2: '自动放货', button2: '自动放货',
button3: '输入点位', button3: '输入点位',
button4: '定位目标站点' button4: '定位目标站点',
button5: '任务下发'
}, },
tasklists: { tasklists: {
topinfo: '任务管理', topinfo: '任务管理',

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -5,448 +5,184 @@
<div class="title_wrap"> <div class="title_wrap">
<h2>{{ $t('carrypoint.topinfo') }}</h2> <h2>{{ $t('carrypoint.topinfo') }}</h2>
</div> </div>
<div class="box1"> <div class="page_container">
<div class="point-box"> <div class="grid_wrapper">
<div class="point" :class="{'statusbg':startObj === e.point_code,'returnbg':returnObj === e.point_code}" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)"> <div class="point_item" v-for="e in dataList" :key="e.point_code" :class="{'point_checked': pkId === e.point_code}" ref="point" @click="toRadio(e)">
<div class="popover" v-if="hover.length > 20 && hover === e.code_name"> <p>{{e.code_name}}</p>
{{hover}} <div v-show="pkId === e.point_code" class="point_item point_item_hover">{{e.code_name}}</div>
<span class="popper_arrow"></span>
</div>
{{e.code_name}}
<!-- <span class="ellipsis">{{e.code_name}}</span> -->
<!-- <span style="display: inline-block; width: 0;">{{e.code_name}}</span> -->
</div>
</div>
</div>
<div class="box2 buttons_wrapper">
<!-- <button class="button_control" :class="{'button_control_disabled':returnObj}" @click="toSure(startObj, '3')"><p>{{ $t('carrypoint.button1') }}</p></button> -->
<button class="button_control" @click="toSure(startObj, '3')"><p>{{ $t('carrypoint.button1') }}</p></button>
<button class="button_control" @click="toSure(startObj, '4')"><p>{{ $t('carrypoint.button2') }}</p></button>
<button class="button_control" @click="showDialog('1')"><p>{{ $t('carrypoint.button3') }}</p></button>
<!-- <button class="button_control" @click="showDialog('2')"><p>{{ $t('carrypoint.button4') }}</p></button> -->
<button class="button_control" @click="toSure(startObj, '1', returnObj)"><p>{{ $t('carrypoint.button4') }}</p></button>
</div>
</div>
<jxDialog
ref="child"
:title="type === '1' ? $t('carrypoint.dialoginfo') : $t('carrypoint.dialogtip')"
:type="type"
:unclick="unclick"
@toSure="toSureDialog"
@toCancle="toCancle"
>
<div v-if="type === '1'" class="form_wraper">
<div class="form">
<div class="form_item">
<div class="form_item__label"><i>*</i>{{ $t('carrypoint.pointcode') }}</div>
<div class="form_item__content">
<!-- <input type="text" class="form_item__input" v-model="pointcode" @focus="show" data-layout="normal"> -->
<keyboard-input
inputClass="form_item__input"
keyboardClass="pointcode"
:value="pointcode"
@inputChange="inputChange1"
@inputFocus="inputFocus"
></keyboard-input>
</div> </div>
</div> </div>
<div class="form_item"> <div class="buttons_wrapper">
<div class="form_item__label">{{ $t('carrypoint.returnsitecode') }}</div> <button class="button_control" :class="{'button_control_gray': !pkId || active}" :disabled="disabled" @click="_confirmPoint('3')"><p>{{ $t('carrypoint.button1') }}</p></button>
<div class="form_item__content"> <button class="mgl20 button_control" :class="{'button_control_gray': !pkId || active}" :disabled="disabled" @click="_confirmPoint('4')"><p>{{ $t('carrypoint.button2') }}</p></button>
<!-- <input type="text" class="form_item__input" v-model="returnsitecode" @focus="show" data-layout="normal"> --> <button class="mgl20 button_control button_control_disabled" :class="{'button_control_gray': !pkId || !active}" :disabled="disabled" @click="_deleteSingleTask"><p>{{ $t('tasklists.button3') }}</p></button>
<keyboard-input <button class="mgl20 button_control" :class="{'button_control_gray': !pkId || active}" :disabled="disabled" @click="_confirmPoint('1')"><p>{{ $t('carrypoint.button5') }}</p></button>
inputClass="form_item__input"
keyboardClass="returnsitecode"
:value="returnsitecode"
@inputChange="inputChange2"
@inputFocus="inputFocus2"
></keyboard-input>
</div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="type === '2'" class="form_wraper">
<div class="form">
<div class="form_item">
<div class="form_item__label">{{ $t('carrypoint.returnsite') }}</div>
<div class="form_item__content">
<el-select v-model="value" filterable :placeholder="$t('common.pleaseselect')">
<el-option
v-for="item in options"
:key="item.point_code"
:label="$i18n.locale === 'en-us' ? item.en_code_name : item.code_name"
:value="item.point_code">
</el-option>
</el-select>
</div>
</div>
</div>
</div>
</jxDialog>
</div> </div>
<vue-touch-keyboard id="keyboard" :options="keyoptions" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
</div> </div>
</template> </template>
<script> <script>
import jxDialog from '@components/dialog.vue' // import {queryPoint, querySingleTask} from '@/config/mork.js'
import KeyboardInput from '@components/keyboard-input' import {queryPoint, querySingleTask, confirmPoint, deleteSingleTask} from '@/config/getData.js'
import {queryPoint, confirmPoint} from '@/config/getData.js'
export default { export default {
name: 'CarryPoint', name: 'CarryPoint',
components: {
jxDialog,
KeyboardInput
},
data () { data () {
return { return {
interTime: this.$store.getters.setTime,
timer: null,
type: '', type: '',
title: '', title: '',
pointcode: '',
returnsitecode: '',
unclick: false,
disabled: false, disabled: false,
visible: false, pkId: '',
layout: 'normal', dataList: [],
input: null, active: false
keyoptions: {
useKbEvents: false,
preventClickEvent: false
},
statusbg: false,
selectObj: {},
startObj: '', // 起始点
returnObj: '', // 返回点
value: '',
hover: '', // 隐藏内容
dataList: []
// dataList: [
// {
// point_code: '01',
// code_name: '18-一线起升电机',
// en_code_name: 'english-test'
// },
// {
// point_code: '02',
// code_name: 'A-ZD102',
// en_code_name: 'english-002'
// },
// {
// point_code: '3',
// code_name: 'A-ZD103'
// },
// {
// point_code: '4',
// code_name: 'A-ZD101'
// },
// {
// point_code: '5',
// code_name: 'A-ZD101'
// },
// {
// point_code: '6',
// code_name: 'A-ZD101'
// },
// {
// point_code: '7',
// code_name: '二楼中间层休息点位与茶水间的充电桩交叉点1'
// },
// {
// point_code: '8',
// code_name: '我是一个超级长的标题,显示不下'
// },
// {
// point_code: '9',
// code_name: 'aaammm brown head big so daijgsd jigna whcignaig ijanoghoniojojio jsi '
// },
// {
// point_code: '10',
// code_name: 'A-ZD101'
// },
// {
// point_code: '11',
// code_name: 'A-ZD101'
// },
// {
// point_code: '12',
// code_name: 'A-ZD101'
// },
// {
// point_code: '13',
// code_name: 'A-ZD101'
// },
// {
// point_code: '14',
// code_name: 'A-ZD101'
// },
// {
// point_code: '15',
// code_name: 'A-ZD101'
// },
// {
// point_code: '16',
// code_name: 'A-ZD101'
// },
// {
// point_code: '17',
// code_name: 'A-ZD101'
// },
// {
// point_code: '18',
// code_name: 'A-ZD101'
// },
// {
// point_code: '19',
// code_name: 'A-ZD101'
// },
// {
// point_code: '20',
// code_name: 'A-ZD101'
// },
// {
// point_code: '21',
// code_name: 'A-ZD101'
// },
// {
// point_code: '22',
// code_name: 'A-ZD101'
// },
// {
// point_code: '23',
// code_name: 'A-ZD101'
// },
// {
// point_code: '24',
// code_name: 'A-ZD101'
// },
// {
// point_code: '25',
// code_name: 'A-ZD101'
// },
// {
// point_code: '26',
// code_name: 'A-ZD101'
// }
// ]
} }
}, },
created () { created () {
this.initData() this.initData()
}, },
beforeDestroy () {
if (this.timer) {
clearInterval(this.timer)
}
},
methods: { methods: {
showDialog (type, e) { refresh () {
this.type = type this._querySingleTask()
this.$refs.child.active = true this.timer = setInterval(() => {
switch (type) { this._querySingleTask()
case '1': }, this.interTime)
this.startObj = ''
this.returnObj = ''
this.pointcode = ''
this.returnsitecode = ''
this.unclick = true
break
case '2':
this.options = [...this.dataList]
this.unclick = true
break
}
}, },
toSureDialog (type) {
switch (type) {
case '1':
this.confirmPoint(this.pointcode, '1', this.returnsitecode)
this.$refs.child.active = false
break
case '2':
if (this.value) {
this.confirmPoint(this.startObj, '1', this.value)
this.value = ''
}
break
}
},
toCancle (type) {
switch (type) {
case '1':
break
case '2':
this.confirmPoint(this.startObj, '1', '')
this.value = ''
break
}
this.hide()
},
inputFocus () {
this.visible = false
},
inputFocus2 () {
this.visible = false
},
hide () {
this.visible = false
},
inputChange1 (val) {
this.pointcode = val
// 限制只能输入数字,后端校验
// this.pointcode = val.replace(/[^\d]/g, '')
},
inputChange2 (val) {
this.returnsitecode = val
},
// 这个接口需要放到agv上去才行
async initData () { async initData () {
let res = await queryPoint() let res = await queryPoint()
if (res.code === '1') { if (res.code === '1') {
this.dataList = res.result this.pkId = ''
this.active = false
this.dataList = [...res.result]
this.dataList.map(el => {
this.$set(el, 'checked', false)
})
this.refresh()
} else { } else {
this.toast(res.desc) this.toast(res.desc)
} }
}, },
async confirmPoint (pcode, type, ncode) { async _querySingleTask () {
let res = await confirmPoint(pcode, type, ncode) let res = await querySingleTask()
if (res.code === '1') { if (res.code === '1') {
this.toast(res.desc) if (res.hasOwnProperty('result')) {
this.selectObj = {} this.pkId = res.result.next_point_code
this.active = true
this.dataList.map(el => {
el.checked = true
})
} else {
this.active = false
this.dataList.map(el => {
el.checked = false
})
}
} else { } else {
this.toast(res.desc) this.toast(res.desc)
} }
this.$refs.child.active = false },
this.$refs.child.disabled = false async _deleteSingleTask () {
this.disabled = true
if (!this.pkId || !this.active) {
this.disabled = false
return
}
try {
let res = await deleteSingleTask(this.pkId)
if (this.timer) {
clearInterval(this.timer)
}
this.toast(res.desc)
this.pkId = ''
setTimeout(() => {
this.refresh()
}, 1000)
this.disabled = false
} catch (e) {
this.disabled = false
}
},
async _confirmPoint (type) {
this.disabled = true
if (!this.pkId || this.active) {
this.disabled = false
return
}
try {
let res = await confirmPoint(this.pkId, type)
if (this.timer) {
clearInterval(this.timer)
}
this.toast(res.desc)
this.pkId = ''
setTimeout(() => {
this.refresh()
}, 1000)
this.disabled = false
} catch (e) {
this.disabled = false
}
}, },
toRadio (e) { toRadio (e) {
console.log('seletobj====', e) if (e.checked) {
this.selectObj = e
if (this.startObj && this.returnObj) {
// 已选中情况下清空
this.startObj = ''
this.returnObj = ''
// this.toast('已选点已清空')
return return
} }
if (!this.startObj) { this.pkId = this.pkId === e.point_code ? '' : e.point_code
this.startObj = e.point_code
let tipText = this.$i18n.locale === 'en-us' ? 'End point selected' : '终点已选中'
this.toast(tipText)
// this.toast('终点已选中')
return
}
if (this.startObj && !this.returnObj) {
let tipText = this.$i18n.locale === 'en-us' ? 'End point selected' : '终点已选中'
this.toast(tipText)
// this.toast('终点已选中')
if (this.startObj !== e.point_code) {
this.returnObj = e.point_code
let tipText = this.$i18n.locale === 'en-us' ? 'Return point selected' : '返回点已选中'
this.toast(tipText)
// this.toast('返回点已选中')
}
}
},
toSure (pcode, type, ncode) {
if ((type === '3' || type === '4') && this.returnObj) {
return
}
if ((type === '3' || type === '4') && this.startObj) {
this.confirmPoint(pcode, type, ncode)
}
if (type === '1' && this.startObj) {
this.confirmPoint(pcode, type, ncode)
}
} }
// handleMouseenter (e) {
// console.log('ee', e)
// // this.hover = e.code_name
// }
} }
} }
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.ellipsis { .page_container
overflow: hidden; /* 确保超出容器的文本被裁剪 */ padding 31px 31px 31px 45px
white-space: nowrap; /* 确保文本在一行内显示,不换行 */ .grid_wrapper
text-overflow: ellipsis; /* 使用省略号表示文本溢出 */ display flex
width: 90%; flex-wrap wrap
} justify-content flex-start
.con align-content flex-start
float left height calc(100% - 122px)
.box0 overflow-y auto
width 1586px .buttons_wrapper
height 102px display flex
background center / 100% 100% url(../../../images/new/bg-task-r1.png) no-repeat justify-content center
.title .point_item
font-size 36px
color #F6F9FE
padding-left 39px
padding-top 48px
.box1
// width 1592px
// height 819px
height 800px
background center / 100% 100% url(../../../images/new/bg-task-r2.png) no-repeat
padding-top 28px
padding-left 44px
.point-box
width 100%
height 600px
overflow-y scroll
display flex
flex-wrap wrap
.point
width 248px
height 134px
color #e1e9f4
font-size 26px
text-align center
margin-right 3px
margin-bottom 13px
background center / 100% 100% url(../../../images/new/bg2.png) no-repeat
display flex
justify-content center
align-items center
position relative
overflow hidden
text-overflow ellipsis
.statusbg
box-sizing border-box
color #58e9ff
background center / 100% 100% url(../../../images/new/bg1.png) no-repeat !important
.returnbg
box-sizing border-box
color #ff0
background center / 100% 100% url(../../../images/new/bg1.png) no-repeat !important
.box2
position fixed
left 310px
bottom 50px
.enClass .button_control p
font-size 28px
.popover
top 10px
width 240px
transform-origin center bottom
z-index 2099
// display none
padding 8px 20px
position absolute
background #fff
min-width 150px
border-radius 4px
border 1px solid #ebeef5
padding 12px
z-index 2000
color #606266
line-height 1.4
text-align justify
font-size 14px
box-shadow 0 2px 12px 0 rgba(0,0,0,.1)
word-break break-all
.popper_arrow
position relative position relative
width 0px display: flex;
height 0px align-items: center;
border-style solid justify-content: center;
top 81px width calc(100% / 6)
left 50% height 134px
border-width 10px font-family 'SourceHanSansCN-Bold'
border-color #fff transparent transparent transparent font-size 28px
line-height 32px
color #B4C1D8
padding 14px 20px
background center / 100% 100% url(../../../images/new/bg2.png) no-repeat
p
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3; /* 定义显示的行数 */
overflow: hidden;
text-overflow: ellipsis;
.point_checked
color #3CC1FF
background-image url(../../../images/new/bg1.png)
.point_item_hover
position absolute
width 100%
height auto
min-height 100%
color #3CC1FF
background #152755 center / 100% 100% url(../../../images/new/bg1.png) no-repeat
top 0
left 0
z-index 10
</style> </style>

View File

@@ -0,0 +1,452 @@
<template>
<div class="main-container">
<div class="right_side">
<div class="content_wrap">
<div class="title_wrap">
<h2>{{ $t('carrypoint.topinfo') }}</h2>
</div>
<div class="box1">
<div class="point-box">
<div class="point" :class="{'statusbg':startObj === e.point_code,'returnbg':returnObj === e.point_code}" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">
<div class="popover" v-if="hover.length > 20 && hover === e.code_name">
{{hover}}
<span class="popper_arrow"></span>
</div>
{{e.code_name}}
<!-- <span class="ellipsis">{{e.code_name}}</span> -->
<!-- <span style="display: inline-block; width: 0;">{{e.code_name}}</span> -->
</div>
</div>
</div>
<div class="box2 buttons_wrapper">
<!-- <button class="button_control" :class="{'button_control_disabled':returnObj}" @click="toSure(startObj, '3')"><p>{{ $t('carrypoint.button1') }}</p></button> -->
<button class="button_control" @click="toSure(startObj, '3')"><p>{{ $t('carrypoint.button1') }}</p></button>
<button class="button_control" @click="toSure(startObj, '4')"><p>{{ $t('carrypoint.button2') }}</p></button>
<button class="button_control" @click="showDialog('1')"><p>{{ $t('carrypoint.button3') }}</p></button>
<!-- <button class="button_control" @click="showDialog('2')"><p>{{ $t('carrypoint.button4') }}</p></button> -->
<button class="button_control" @click="toSure(startObj, '1', returnObj)"><p>{{ $t('carrypoint.button4') }}</p></button>
</div>
</div>
<jxDialog
ref="child"
:title="type === '1' ? $t('carrypoint.dialoginfo') : $t('carrypoint.dialogtip')"
:type="type"
:unclick="unclick"
@toSure="toSureDialog"
@toCancle="toCancle"
>
<div v-if="type === '1'" class="form_wraper">
<div class="form">
<div class="form_item">
<div class="form_item__label"><i>*</i>{{ $t('carrypoint.pointcode') }}</div>
<div class="form_item__content">
<!-- <input type="text" class="form_item__input" v-model="pointcode" @focus="show" data-layout="normal"> -->
<keyboard-input
inputClass="form_item__input"
keyboardClass="pointcode"
:value="pointcode"
@inputChange="inputChange1"
@inputFocus="inputFocus"
></keyboard-input>
</div>
</div>
<div class="form_item">
<div class="form_item__label">{{ $t('carrypoint.returnsitecode') }}</div>
<div class="form_item__content">
<!-- <input type="text" class="form_item__input" v-model="returnsitecode" @focus="show" data-layout="normal"> -->
<keyboard-input
inputClass="form_item__input"
keyboardClass="returnsitecode"
:value="returnsitecode"
@inputChange="inputChange2"
@inputFocus="inputFocus2"
></keyboard-input>
</div>
</div>
</div>
</div>
<div v-if="type === '2'" class="form_wraper">
<div class="form">
<div class="form_item">
<div class="form_item__label">{{ $t('carrypoint.returnsite') }}</div>
<div class="form_item__content">
<el-select v-model="value" filterable :placeholder="$t('common.pleaseselect')">
<el-option
v-for="item in options"
:key="item.point_code"
:label="$i18n.locale === 'en-us' ? item.en_code_name : item.code_name"
:value="item.point_code">
</el-option>
</el-select>
</div>
</div>
</div>
</div>
</jxDialog>
</div>
<vue-touch-keyboard id="keyboard" :options="keyoptions" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
</div>
</template>
<script>
import jxDialog from '@components/dialog.vue'
import KeyboardInput from '@components/keyboard-input'
import {queryPoint, confirmPoint} from '@/config/getData.js'
export default {
name: 'CarryPoint',
components: {
jxDialog,
KeyboardInput
},
data () {
return {
type: '',
title: '',
pointcode: '',
returnsitecode: '',
unclick: false,
disabled: false,
visible: false,
layout: 'normal',
input: null,
keyoptions: {
useKbEvents: false,
preventClickEvent: false
},
statusbg: false,
selectObj: {},
startObj: '', // 起始点
returnObj: '', // 返回点
value: '',
hover: '', // 隐藏内容
dataList: []
// dataList: [
// {
// point_code: '01',
// code_name: '18-一线起升电机',
// en_code_name: 'english-test'
// },
// {
// point_code: '02',
// code_name: 'A-ZD102',
// en_code_name: 'english-002'
// },
// {
// point_code: '3',
// code_name: 'A-ZD103'
// },
// {
// point_code: '4',
// code_name: 'A-ZD101'
// },
// {
// point_code: '5',
// code_name: 'A-ZD101'
// },
// {
// point_code: '6',
// code_name: 'A-ZD101'
// },
// {
// point_code: '7',
// code_name: '二楼中间层休息点位与茶水间的充电桩交叉点1'
// },
// {
// point_code: '8',
// code_name: '我是一个超级长的标题,显示不下'
// },
// {
// point_code: '9',
// code_name: 'aaammm brown head big so daijgsd jigna whcignaig ijanoghoniojojio jsi '
// },
// {
// point_code: '10',
// code_name: 'A-ZD101'
// },
// {
// point_code: '11',
// code_name: 'A-ZD101'
// },
// {
// point_code: '12',
// code_name: 'A-ZD101'
// },
// {
// point_code: '13',
// code_name: 'A-ZD101'
// },
// {
// point_code: '14',
// code_name: 'A-ZD101'
// },
// {
// point_code: '15',
// code_name: 'A-ZD101'
// },
// {
// point_code: '16',
// code_name: 'A-ZD101'
// },
// {
// point_code: '17',
// code_name: 'A-ZD101'
// },
// {
// point_code: '18',
// code_name: 'A-ZD101'
// },
// {
// point_code: '19',
// code_name: 'A-ZD101'
// },
// {
// point_code: '20',
// code_name: 'A-ZD101'
// },
// {
// point_code: '21',
// code_name: 'A-ZD101'
// },
// {
// point_code: '22',
// code_name: 'A-ZD101'
// },
// {
// point_code: '23',
// code_name: 'A-ZD101'
// },
// {
// point_code: '24',
// code_name: 'A-ZD101'
// },
// {
// point_code: '25',
// code_name: 'A-ZD101'
// },
// {
// point_code: '26',
// code_name: 'A-ZD101'
// }
// ]
}
},
created () {
this.initData()
},
methods: {
showDialog (type, e) {
this.type = type
this.$refs.child.active = true
switch (type) {
case '1':
this.startObj = ''
this.returnObj = ''
this.pointcode = ''
this.returnsitecode = ''
this.unclick = true
break
case '2':
this.options = [...this.dataList]
this.unclick = true
break
}
},
toSureDialog (type) {
switch (type) {
case '1':
this.confirmPoint(this.pointcode, '1', this.returnsitecode)
this.$refs.child.active = false
break
case '2':
if (this.value) {
this.confirmPoint(this.startObj, '1', this.value)
this.value = ''
}
break
}
},
toCancle (type) {
switch (type) {
case '1':
break
case '2':
this.confirmPoint(this.startObj, '1', '')
this.value = ''
break
}
this.hide()
},
inputFocus () {
this.visible = false
},
inputFocus2 () {
this.visible = false
},
hide () {
this.visible = false
},
inputChange1 (val) {
this.pointcode = val
// 限制只能输入数字,后端校验
// this.pointcode = val.replace(/[^\d]/g, '')
},
inputChange2 (val) {
this.returnsitecode = val
},
// 这个接口需要放到agv上去才行
async initData () {
let res = await queryPoint()
if (res.code === '1') {
this.dataList = res.result
} else {
this.toast(res.desc)
}
},
async confirmPoint (pcode, type, ncode) {
let res = await confirmPoint(pcode, type, ncode)
if (res.code === '1') {
this.toast(res.desc)
this.selectObj = {}
} else {
this.toast(res.desc)
}
this.$refs.child.active = false
this.$refs.child.disabled = false
},
toRadio (e) {
console.log('seletobj====', e)
this.selectObj = e
if (this.startObj && this.returnObj) {
// 已选中情况下清空
this.startObj = ''
this.returnObj = ''
// this.toast('已选点已清空')
return
}
if (!this.startObj) {
this.startObj = e.point_code
let tipText = this.$i18n.locale === 'en-us' ? 'End point selected' : '终点已选中'
this.toast(tipText)
// this.toast('终点已选中')
return
}
if (this.startObj && !this.returnObj) {
let tipText = this.$i18n.locale === 'en-us' ? 'End point selected' : '终点已选中'
this.toast(tipText)
// this.toast('终点已选中')
if (this.startObj !== e.point_code) {
this.returnObj = e.point_code
let tipText = this.$i18n.locale === 'en-us' ? 'Return point selected' : '返回点已选中'
this.toast(tipText)
// this.toast('返回点已选中')
}
}
},
toSure (pcode, type, ncode) {
if ((type === '3' || type === '4') && this.returnObj) {
return
}
if ((type === '3' || type === '4') && this.startObj) {
this.confirmPoint(pcode, type, ncode)
}
if (type === '1' && this.startObj) {
this.confirmPoint(pcode, type, ncode)
}
}
// handleMouseenter (e) {
// console.log('ee', e)
// // this.hover = e.code_name
// }
}
}
</script>
<style lang="stylus" scoped>
.ellipsis {
overflow: hidden; /* 确保超出容器的文本被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示,不换行 */
text-overflow: ellipsis; /* 使用省略号表示文本溢出 */
width: 90%;
}
.con
float left
.box0
width 1586px
height 102px
background center / 100% 100% url(../../../images/new/bg-task-r1.png) no-repeat
.title
font-size 36px
color #F6F9FE
padding-left 39px
padding-top 48px
.box1
// width 1592px
// height 819px
height 800px
background center / 100% 100% url(../../../images/new/bg-task-r2.png) no-repeat
padding-top 28px
padding-left 44px
.point-box
width 100%
height 600px
overflow-y scroll
display flex
flex-wrap wrap
.point
width 248px
height 134px
color #e1e9f4
font-size 26px
text-align center
margin-right 3px
margin-bottom 13px
background center / 100% 100% url(../../../images/new/bg2.png) no-repeat
display flex
justify-content center
align-items center
position relative
overflow hidden
text-overflow ellipsis
.statusbg
box-sizing border-box
color #58e9ff
background center / 100% 100% url(../../../images/new/bg1.png) no-repeat !important
.returnbg
box-sizing border-box
color #ff0
background center / 100% 100% url(../../../images/new/bg1.png) no-repeat !important
.box2
position fixed
left 310px
bottom 50px
.enClass .button_control p
font-size 28px
.popover
top 10px
width 240px
transform-origin center bottom
z-index 2099
// display none
padding 8px 20px
position absolute
background #fff
min-width 150px
border-radius 4px
border 1px solid #ebeef5
padding 12px
z-index 2000
color #606266
line-height 1.4
text-align justify
font-size 14px
box-shadow 0 2px 12px 0 rgba(0,0,0,.1)
word-break break-all
.popper_arrow
position relative
width 0px
height 0px
border-style solid
top 81px
left 50%
border-width 10px
border-color #fff transparent transparent transparent
</style>

View File

@@ -96,8 +96,8 @@
<script> <script>
import jxTime from '@components/time.vue' import jxTime from '@components/time.vue'
import jxDialog from '@components/dialog.vue' import jxDialog from '@components/dialog.vue'
import { sysMenuBuild } from '@/config/mork.js' // import { sysMenuBuild } from '@/config/mork.js'
import { updatePass, authLogout } from '@config/getData2.js' import { sysMenuBuild, updatePass, authLogout } from '@config/getData2.js'
import { sendWebsocket, closeWebsocket } from '@/config/websocket.js' import { sendWebsocket, closeWebsocket } from '@/config/websocket.js'
import {encrypt} from '../../../main.js' import {encrypt} from '../../../main.js'
export default { export default {

View File

@@ -425,6 +425,8 @@
_wh(331px, 88px) _wh(331px, 88px)
.button_control_disabled .button_control_disabled
background center url(../images/new/button_disabled.png) no-repeat background center url(../images/new/button_disabled.png) no-repeat
.button_control_gray
background center url(../images/new/button_gray.png) no-repeat
.grid_wrapper .grid_wrapper
width 100% width 100%
table table

View File

@@ -145,3 +145,7 @@ input::-webkit-input-placeholder {
.mgl10 { .mgl10 {
margin-left: .1rem !important; margin-left: .1rem !important;
} }
.mgl20 {
margin-left: .2rem !important;
}