|
@@ -64,6 +64,7 @@
|
|
|
@confirm="confirm"
|
|
@confirm="confirm"
|
|
|
ref="editData"
|
|
ref="editData"
|
|
|
@onClose="onClose"
|
|
@onClose="onClose"
|
|
|
|
|
+ @onRunMcuSingle="onRunMcuSingle"
|
|
|
:addRowData="addRowData"
|
|
:addRowData="addRowData"
|
|
|
/>
|
|
/>
|
|
|
|
|
|
|
@@ -86,6 +87,10 @@ const socketStore = socket(); // WebSocket状态管理实例
|
|
|
|
|
|
|
|
const emit = defineEmits([ 'confirm','onClose']);
|
|
const emit = defineEmits([ 'confirm','onClose']);
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+import configInfo from '@/stores/modules/config';
|
|
|
|
|
+const configInfoStore = configInfo();
|
|
|
|
|
+
|
|
|
const confirm = ()=>{
|
|
const confirm = ()=>{
|
|
|
hideVideo()
|
|
hideVideo()
|
|
|
emit('confirm')
|
|
emit('confirm')
|
|
@@ -120,16 +125,17 @@ import { digiCamControlWEB } from '@/utils/appconfig'
|
|
|
import { getFilePath } from '@/utils/appfun'
|
|
import { getFilePath } from '@/utils/appfun'
|
|
|
import {ElMessage} from "element-plus";
|
|
import {ElMessage} from "element-plus";
|
|
|
const previewKey = ref(0)
|
|
const previewKey = ref(0)
|
|
|
-//const preview = ref(digiCamControlWEB+'liveview.jpg')
|
|
|
|
|
|
|
|
|
|
-const preview = ref('C:\\Users\\Administrator\\AppData\\Roaming\\ZhiHuiYin\\preview\\liveview.png')
|
|
|
|
|
|
|
+const preview = ref(digiCamControlWEB+'liveview.jpg')
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
const previewSrc = computed(()=>{
|
|
const previewSrc = computed(()=>{
|
|
|
let time = new Date().getTime()
|
|
let time = new Date().getTime()
|
|
|
return preview.value+'?key='+previewKey.value+'&time='+time
|
|
return preview.value+'?key='+previewKey.value+'&time='+time
|
|
|
})
|
|
})
|
|
|
const step = ref(1)
|
|
const step = ref(1)
|
|
|
-function checkConfirm(init){
|
|
|
|
|
|
|
+async function checkConfirm(init){
|
|
|
step.value =1
|
|
step.value =1
|
|
|
if(menu.length === 0){
|
|
if(menu.length === 0){
|
|
|
menu.push({
|
|
menu.push({
|
|
@@ -139,12 +145,24 @@ function checkConfirm(init){
|
|
|
type:'toggleModel'
|
|
type:'toggleModel'
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
+ if(init){
|
|
|
|
|
+ await configInfoStore.getAppConfig()
|
|
|
|
|
+ console.log('configInfoStore.appConfig');
|
|
|
|
|
+ console.log(configInfoStore.appConfig);
|
|
|
|
|
+ console.log(configInfoStore.appConfig.controlType);
|
|
|
|
|
+ if(configInfoStore.appConfig.controlType === "SmartShooter"){
|
|
|
|
|
+ preview.value = configInfoStore.appConfig.userDataPath + "\\preview\\liveview.png"
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
if(!init) previewKey.value++;
|
|
if(!init) previewKey.value++;
|
|
|
|
|
|
|
|
showVideo()
|
|
showVideo()
|
|
|
showrEditRow.value = true
|
|
showrEditRow.value = true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+function onRunMcuSingle (){
|
|
|
|
|
+ loading.value = true
|
|
|
|
|
+}
|
|
|
const showrEditRow = ref(false)
|
|
const showrEditRow = ref(false)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -162,7 +180,7 @@ function showVideo(){
|
|
|
interval = setInterval(()=>{
|
|
interval = setInterval(()=>{
|
|
|
previewKey.value++;
|
|
previewKey.value++;
|
|
|
},1000)
|
|
},1000)
|
|
|
- },2000)
|
|
|
|
|
|
|
+ },500)
|
|
|
|
|
|
|
|
})
|
|
})
|
|
|
|
|
|
|
@@ -178,7 +196,7 @@ function hideVideo(){
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-const loading = ref(false)
|
|
|
|
|
|
|
+const loading = ref(true)
|
|
|
const editData = ref(null);
|
|
const editData = ref(null);
|
|
|
const imageTplPath = ref(null)
|
|
const imageTplPath = ref(null)
|
|
|
function takePictures() {
|
|
function takePictures() {
|