|
@@ -577,29 +577,48 @@ export default function usePhotography() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const menu = computed(() => {
|
|
const menu = computed(() => {
|
|
|
|
|
+ // 一级导航:设置 + 快捷操作下拉(含一键释放/一键回落/生成图目录)
|
|
|
|
|
+ const quickActionsChildren = [
|
|
|
|
|
+ {
|
|
|
|
|
+ name: '生成图目录',
|
|
|
|
|
+ click() {
|
|
|
|
|
+ openOutputDir()
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ type: 'OneClickRelease'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ type: 'OneKeyDown'
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+
|
|
|
|
|
+ // 一级导航:高级生成下拉
|
|
|
|
|
+ const generateMenu = {
|
|
|
|
|
+ ...generate
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (configInfoStore.appModel === 2) {
|
|
if (configInfoStore.appModel === 2) {
|
|
|
return [
|
|
return [
|
|
|
{
|
|
{
|
|
|
type: 'setting'
|
|
type: 'setting'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: '切换模式',
|
|
|
|
|
- click() {
|
|
|
|
|
- configInfoStore.updateAppModel(1)
|
|
|
|
|
- Router.push({
|
|
|
|
|
- name: 'PhotographyCheck'
|
|
|
|
|
- })
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: '生成图目录',
|
|
|
|
|
- click() {
|
|
|
|
|
- openOutputDir()
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ name: '快捷操作',
|
|
|
|
|
+ children: [
|
|
|
|
|
+ ...quickActionsChildren,
|
|
|
|
|
+ {
|
|
|
|
|
+ name: '切换模式',
|
|
|
|
|
+ click() {
|
|
|
|
|
+ configInfoStore.updateAppModel(1)
|
|
|
|
|
+ Router.push({
|
|
|
|
|
+ name: 'PhotographyCheck'
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- ...generate
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ generateMenu
|
|
|
]
|
|
]
|
|
|
}
|
|
}
|
|
|
if (useUserInfoStore.userInfo.brand_company_code === '1300' || configInfoStore.appConfig.debug) {
|
|
if (useUserInfoStore.userInfo.brand_company_code === '1300' || configInfoStore.appConfig.debug) {
|
|
@@ -608,20 +627,18 @@ export default function usePhotography() {
|
|
|
type: 'setting'
|
|
type: 'setting'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- type: 'developer'
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: '生成图目录',
|
|
|
|
|
- click() {
|
|
|
|
|
- openOutputDir()
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ name: '快捷操作',
|
|
|
|
|
+ children: quickActionsChildren
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- ...generate,
|
|
|
|
|
|
|
+ name: '开发工具',
|
|
|
|
|
+ children: [
|
|
|
|
|
+ {
|
|
|
|
|
+ type: 'developer'
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- type: 'OneClickRelease'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ generateMenu
|
|
|
]
|
|
]
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -631,17 +648,10 @@ export default function usePhotography() {
|
|
|
type: 'setting'
|
|
type: 'setting'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: '生成图目录',
|
|
|
|
|
- click() {
|
|
|
|
|
- openOutputDir()
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- ...generate
|
|
|
|
|
|
|
+ name: '快捷操作',
|
|
|
|
|
+ children: quickActionsChildren
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- type: 'OneClickRelease'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ generateMenu
|
|
|
]
|
|
]
|
|
|
|
|
|
|
|
|
|
|
|
@@ -783,6 +793,26 @@ const onRemoteControl = async (type) => {
|
|
|
console.log('_handler_take_picture')
|
|
console.log('_handler_take_picture')
|
|
|
console.log(result)
|
|
console.log(result)
|
|
|
if (result.code === 0) {
|
|
if (result.code === 0) {
|
|
|
|
|
+
|
|
|
|
|
+ if(result.msg === '处理单拍消息'){
|
|
|
|
|
+ const pointName = await getPhotoPointName()
|
|
|
|
|
+ clickLog({ describe: { action: '实体遥控器拍照按钮', point_name: pointName } }, route);
|
|
|
|
|
+
|
|
|
|
|
+ if (runLoading.value || takePictureLoading.value) {
|
|
|
|
|
+ ElMessage.error('拍摄程序正在运行,请稍候')
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ ElMessage.success('正在拍摄中,请稍候')
|
|
|
|
|
+ takePictureLoading.value = true;
|
|
|
|
|
+ socketStore.sendMessage({
|
|
|
|
|
+ type: 'handler_take_picture',
|
|
|
|
|
+ data: {
|
|
|
|
|
+ point_name: pointName
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
/* if (runLoading.value || takePictureLoading.value) {
|
|
/* if (runLoading.value || takePictureLoading.value) {
|
|
|
ElMessage.error('拍摄程序正在运行,请稍候')
|
|
ElMessage.error('拍摄程序正在运行,请稍候')
|
|
|
return
|
|
return
|