diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js index 601f208..1450494 100644 --- a/public/playerVideo6/jessibuca.js +++ b/public/playerVideo6/jessibuca.js @@ -37,8 +37,8 @@ hasControl: !1, loadingText: '', background: '', - // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 - decoder: `/playerVideo6/decoder.js`, // 本地使用 + decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 + // decoder: `/playerVideo6/decoder.js`, // 本地使用 // decoder: import.meta.env.MODE === 'development' ? `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, url: '', rotate: 0, diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js index 601f208..1450494 100644 --- a/public/playerVideo6/jessibuca.js +++ b/public/playerVideo6/jessibuca.js @@ -37,8 +37,8 @@ hasControl: !1, loadingText: '', background: '', - // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 - decoder: `/playerVideo6/decoder.js`, // 本地使用 + decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 + // decoder: `/playerVideo6/decoder.js`, // 本地使用 // decoder: import.meta.env.MODE === 'development' ? `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, url: '', rotate: 0, diff --git a/src/components.d.ts b/src/components.d.ts index 0ebd6ef..a1c59be 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -20,6 +20,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarChartVerticalDynamics: typeof import('./components/Echart/BarChartVerticalDynamics.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] @@ -43,6 +44,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + LineChartDynamics: typeof import('./components/Echart/LineChartDynamics.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] @@ -53,6 +55,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + RadarChart: typeof import('./components/Echart/radarChart.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js index 601f208..1450494 100644 --- a/public/playerVideo6/jessibuca.js +++ b/public/playerVideo6/jessibuca.js @@ -37,8 +37,8 @@ hasControl: !1, loadingText: '', background: '', - // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 - decoder: `/playerVideo6/decoder.js`, // 本地使用 + decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 + // decoder: `/playerVideo6/decoder.js`, // 本地使用 // decoder: import.meta.env.MODE === 'development' ? `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, url: '', rotate: 0, diff --git a/src/components.d.ts b/src/components.d.ts index 0ebd6ef..a1c59be 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -20,6 +20,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarChartVerticalDynamics: typeof import('./components/Echart/BarChartVerticalDynamics.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] @@ -43,6 +44,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + LineChartDynamics: typeof import('./components/Echart/LineChartDynamics.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] @@ -53,6 +55,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + RadarChart: typeof import('./components/Echart/radarChart.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index 123906c..451bc7f 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -66,21 +66,22 @@ showEchart.value = !showEchart.value } -const secretLevelUserName = ref('') +const secretLevelUserName = ref('内部') const systemType = ref('') onMounted(() => { systemType.value = window.localStorage.getItem('systemType') - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex(item => item.value === level) - if (index !== -1 && systemType.value === 'gm') { - secretLevelUserName.value = response.data[index].name - } - } - } - }) + // 根据用户的m级标m + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex(item => item.value === level) + // if (index !== -1 && systemType.value === 'gm') { + // secretLevelUserName.value = response.data[index].name + // } + // } + // } + // }) }) diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js index 601f208..1450494 100644 --- a/public/playerVideo6/jessibuca.js +++ b/public/playerVideo6/jessibuca.js @@ -37,8 +37,8 @@ hasControl: !1, loadingText: '', background: '', - // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 - decoder: `/playerVideo6/decoder.js`, // 本地使用 + decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 + // decoder: `/playerVideo6/decoder.js`, // 本地使用 // decoder: import.meta.env.MODE === 'development' ? `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, url: '', rotate: 0, diff --git a/src/components.d.ts b/src/components.d.ts index 0ebd6ef..a1c59be 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -20,6 +20,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarChartVerticalDynamics: typeof import('./components/Echart/BarChartVerticalDynamics.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] @@ -43,6 +44,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + LineChartDynamics: typeof import('./components/Echart/LineChartDynamics.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] @@ -53,6 +55,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + RadarChart: typeof import('./components/Echart/radarChart.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index 123906c..451bc7f 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -66,21 +66,22 @@ showEchart.value = !showEchart.value } -const secretLevelUserName = ref('') +const secretLevelUserName = ref('内部') const systemType = ref('') onMounted(() => { systemType.value = window.localStorage.getItem('systemType') - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex(item => item.value === level) - if (index !== -1 && systemType.value === 'gm') { - secretLevelUserName.value = response.data[index].name - } - } - } - }) + // 根据用户的m级标m + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex(item => item.value === level) + // if (index !== -1 && systemType.value === 'gm') { + // secretLevelUserName.value = response.data[index].name + // } + // } + // } + // }) }) diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue index 8806711..2c6c5ca 100644 --- a/src/views/monitor/realTime/index-new-gm-plugin.vue +++ b/src/views/monitor/realTime/index-new-gm-plugin.vue @@ -153,7 +153,7 @@ console.log('获取设备信息', data) if (data.device.deviceStatusName === '离线') { ElMessage.warning(`设备 ${data.device.monitorName} 离线`) - // return false + return false } const now = new Date().getTime() @@ -257,25 +257,25 @@ // 创建流 async function fetchStream(deviceId: string) { loading.value = true - const res = await setTimeout(() => { - ElMessage.warning('获取视频数据中...') - }, 3000) - loading.value = false - return { - url: testurl[`${currentIndex}`], - createStreamResponseId: currentIndex, - } - // const res = await createStream(deviceId) + // const res = await setTimeout(() => { + // ElMessage.warning('获取视频数据中...') + // }, 3000) // loading.value = false - // if (res && res.data) { - // return { - // url: res.data.url, - // createStreamResponseId: res.data.id, - // } + // return { + // url: testurl[`${currentIndex}`], + // createStreamResponseId: currentIndex, // } - // else { - // // ElMessage.warning('创建流失败！') - // } + const res = await createStream(deviceId) + loading.value = false + if (res && res.data) { + return { + url: res.data.url, + createStreamResponseId: res.data.id, + } + } + else { + // ElMessage.warning('创建流失败！') + } } // 停止流 @@ -381,7 +381,7 @@ // 处理拖拽开始事件 const handleDragStart = (event: DragEvent, data: any) => { if (data.children.length === 0) { // 仅允许拖拽叶子节点 - event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据 + event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据 } } // 处理拖拽经过事件 diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js index 601f208..1450494 100644 --- a/public/playerVideo6/jessibuca.js +++ b/public/playerVideo6/jessibuca.js @@ -37,8 +37,8 @@ hasControl: !1, loadingText: '', background: '', - // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 - decoder: `/playerVideo6/decoder.js`, // 本地使用 + decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用 + // decoder: `/playerVideo6/decoder.js`, // 本地使用 // decoder: import.meta.env.MODE === 'development' ? `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, url: '', rotate: 0, diff --git a/src/components.d.ts b/src/components.d.ts index 0ebd6ef..a1c59be 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -20,6 +20,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarChartVerticalDynamics: typeof import('./components/Echart/BarChartVerticalDynamics.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] @@ -43,6 +44,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + LineChartDynamics: typeof import('./components/Echart/LineChartDynamics.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] @@ -53,6 +55,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + RadarChart: typeof import('./components/Echart/radarChart.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index 123906c..451bc7f 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -66,21 +66,22 @@ showEchart.value = !showEchart.value } -const secretLevelUserName = ref('') +const secretLevelUserName = ref('内部') const systemType = ref('') onMounted(() => { systemType.value = window.localStorage.getItem('systemType') - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex(item => item.value === level) - if (index !== -1 && systemType.value === 'gm') { - secretLevelUserName.value = response.data[index].name - } - } - } - }) + // 根据用户的m级标m + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex(item => item.value === level) + // if (index !== -1 && systemType.value === 'gm') { + // secretLevelUserName.value = response.data[index].name + // } + // } + // } + // }) }) diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue index 8806711..2c6c5ca 100644 --- a/src/views/monitor/realTime/index-new-gm-plugin.vue +++ b/src/views/monitor/realTime/index-new-gm-plugin.vue @@ -153,7 +153,7 @@ console.log('获取设备信息', data) if (data.device.deviceStatusName === '离线') { ElMessage.warning(`设备 ${data.device.monitorName} 离线`) - // return false + return false } const now = new Date().getTime() @@ -257,25 +257,25 @@ // 创建流 async function fetchStream(deviceId: string) { loading.value = true - const res = await setTimeout(() => { - ElMessage.warning('获取视频数据中...') - }, 3000) - loading.value = false - return { - url: testurl[`${currentIndex}`], - createStreamResponseId: currentIndex, - } - // const res = await createStream(deviceId) + // const res = await setTimeout(() => { + // ElMessage.warning('获取视频数据中...') + // }, 3000) // loading.value = false - // if (res && res.data) { - // return { - // url: res.data.url, - // createStreamResponseId: res.data.id, - // } + // return { + // url: testurl[`${currentIndex}`], + // createStreamResponseId: currentIndex, // } - // else { - // // ElMessage.warning('创建流失败！') - // } + const res = await createStream(deviceId) + loading.value = false + if (res && res.data) { + return { + url: res.data.url, + createStreamResponseId: res.data.id, + } + } + else { + // ElMessage.warning('创建流失败！') + } } // 停止流 @@ -381,7 +381,7 @@ // 处理拖拽开始事件 const handleDragStart = (event: DragEvent, data: any) => { if (data.children.length === 0) { // 仅允许拖拽叶子节点 - event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据 + event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据 } } // 处理拖拽经过事件 diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue index 7b3622e..fbac46e 100644 --- a/src/views/system/approval/approvalDialog.vue +++ b/src/views/system/approval/approvalDialog.vue @@ -118,7 +118,7 @@ - + { systemType.value = window.localStorage.getItem('systemType') - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex(item => item.value === level) - if (index !== -1 && systemType.value === 'gm') { - secretLevelUserName.value = response.data[index].name - } - } - } - }) + // 根据用户的m级标m + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex(item => item.value === level) + // if (index !== -1 && systemType.value === 'gm') { + // secretLevelUserName.value = response.data[index].name + // } + // } + // } + // }) }) diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue index 8806711..2c6c5ca 100644 --- a/src/views/monitor/realTime/index-new-gm-plugin.vue +++ b/src/views/monitor/realTime/index-new-gm-plugin.vue @@ -153,7 +153,7 @@ console.log('获取设备信息', data) if (data.device.deviceStatusName === '离线') { ElMessage.warning(`设备 ${data.device.monitorName} 离线`) - // return false + return false } const now = new Date().getTime() @@ -257,25 +257,25 @@ // 创建流 async function fetchStream(deviceId: string) { loading.value = true - const res = await setTimeout(() => { - ElMessage.warning('获取视频数据中...') - }, 3000) - loading.value = false - return { - url: testurl[`${currentIndex}`], - createStreamResponseId: currentIndex, - } - // const res = await createStream(deviceId) + // const res = await setTimeout(() => { + // ElMessage.warning('获取视频数据中...') + // }, 3000) // loading.value = false - // if (res && res.data) { - // return { - // url: res.data.url, - // createStreamResponseId: res.data.id, - // } + // return { + // url: testurl[`${currentIndex}`], + // createStreamResponseId: currentIndex, // } - // else { - // // ElMessage.warning('创建流失败！') - // } + const res = await createStream(deviceId) + loading.value = false + if (res && res.data) { + return { + url: res.data.url, + createStreamResponseId: res.data.id, + } + } + else { + // ElMessage.warning('创建流失败！') + } } // 停止流 @@ -381,7 +381,7 @@ // 处理拖拽开始事件 const handleDragStart = (event: DragEvent, data: any) => { if (data.children.length === 0) { // 仅允许拖拽叶子节点 - event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据 + event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据 } } // 处理拖拽经过事件 diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue index 7b3622e..fbac46e 100644 --- a/src/views/system/approval/approvalDialog.vue +++ b/src/views/system/approval/approvalDialog.vue @@ -118,7 +118,7 @@ - + = ref([ { text: '申请标题', value: 'title', align: 'center' }, { text: '操作类型', value: 'operationTypeName', align: 'center' }, - { text: '操作备注', value: 'operationRemark', align: 'center' }, + // { text: '操作备注', value: 'operationRemark', align: 'center' }, { text: '创建人', value: 'createName', align: 'center' }, { text: '创建时间', value: 'createTime', align: 'center', width: '120' }, { text: '审批人', value: 'auditName', align: 'center' },