@@ -86,6 +88,7 @@ import Markdown from 'vue3-markdown-it';
const props = defineProps({
id: String,
+ propertiesOptions: Array
});
interface Emits {
@@ -121,16 +124,14 @@ const lastClick = (node: OperatorItem) => {
emit('addOperatorValue', `$lastState("${node.id}")`);
};
const addClick = (node: OperatorItem) => {
- console.log(node)
emit('addOperatorValue', node.code);
};
const productStore = useProductStore();
const getData = async (id?: string) => {
- const metadata = productStore.current.metadata || '{}';
- const _properties =
- JSON.parse(metadata).properties || ([] as PropertyMetadata[]);
+ // const metadata = productStore.current.metadata || '{}';
+ const _properties = props.propertiesOptions as PropertyMetadata[]
const properties = {
id: 'property',
name: '属性',
diff --git a/src/components/FRuleEditor/index.vue b/src/components/FRuleEditor/index.vue
index c45a2204..9ca56d93 100644
--- a/src/components/FRuleEditor/index.vue
+++ b/src/components/FRuleEditor/index.vue
@@ -24,7 +24,7 @@
(props.value);
diff --git a/src/components/HomeView/index.vue b/src/components/HomeView/index.vue
new file mode 100644
index 00000000..acf8cb53
--- /dev/null
+++ b/src/components/HomeView/index.vue
@@ -0,0 +1,80 @@
+
+
+
-
+
},
+ placement:{
+ type: String,
+ default: 'top'
+ },
...omit(buttonProps(), 'icon')
})
diff --git a/src/components/Player/mediaTool.less b/src/components/Player/mediaTool.less
index 68edb215..8428448f 100644
--- a/src/components/Player/mediaTool.less
+++ b/src/components/Player/mediaTool.less
@@ -44,7 +44,7 @@
justify-content: center;
width: 45%;
height: 45%;
- font-size: 30px;
+ // font-size: 30px;
background-color: #fff;
border-radius: 50%;
transform: translate(-50%, -50%) rotateZ(-45deg);
diff --git a/src/components/Player/mediaTool.vue b/src/components/Player/mediaTool.vue
index 83f0b315..b206a16b 100644
--- a/src/components/Player/mediaTool.vue
+++ b/src/components/Player/mediaTool.vue
@@ -39,7 +39,7 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Metadata/JsonParam/index.vue b/src/components/Metadata/JsonParam/index.vue
index c1b901d9..ade586ca 100644
--- a/src/components/Metadata/JsonParam/index.vue
+++ b/src/components/Metadata/JsonParam/index.vue
@@ -19,7 +19,7 @@
{ max: 64, message: '最多可输入64个字符' },
{
pattern: /^[a-zA-Z0-9_\-]+$/,
- message: 'ID只能由数字、字母、下划线、中划线组成',
+ message: '标识只能由数字、字母、下划线、中划线组成',
},
]">
+ ![]()
+
+
-
+
diff --git a/src/router/index.ts b/src/router/index.ts
index 09f14d0e..0f4ff104 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,5 @@
import { createRouter, createWebHashHistory } from 'vue-router'
-import menus, { AccountCenterBindPath, InitHomePath, InitLicense, LoginPath, OauthPath } from './menu'
+import menus, { AccountCenterBindPath, InitHomePath, InitLicense, LoginPath, OauthPath, VideoSharePath } from './menu'
import { cleanToken, getToken } from '@/utils/comm'
import { useUserInfo } from '@/store/userInfo'
import { useSystem } from '@/store/system'
@@ -15,7 +15,7 @@ const router = createRouter({
})
const filterPath = [ InitHomePath ]
-const noTokenPath = [ AccountCenterBindPath, OauthPath, InitLicense ]
+const noTokenPath = [ AccountCenterBindPath, OauthPath, InitLicense, VideoSharePath ]
router.beforeEach((to, from, next) => {
// TODO 切换路由取消请求
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 7f7c7614..34605154 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -5,6 +5,7 @@ export const InitLicense = '/init-license'
export const NotificationSubscriptionCode = 'message-subscribe'
export const NotificationRecordCode = 'account/NotificationRecord'
export const OauthPath = '/oauth'
+export const VideoSharePath = '/media/device/Share'
export const AccountMenu = {
path: '/account',
@@ -86,5 +87,9 @@ export default [
},
component: () => import('@/views/oauth/WeChat.vue')
},
+ {
+ path: VideoSharePath,
+ component: () => import('@/views/media/Device/Channel/Share/index.vue')
+ },
AccountMenu
]
\ No newline at end of file
diff --git a/src/style.less b/src/style.less
index 8b3171c1..b119250d 100644
--- a/src/style.less
+++ b/src/style.less
@@ -212,3 +212,7 @@ body {
margin: 16px 0;
}
}
+
+.ant-notification {
+ z-index: 1100;
+}
diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index 0ea4e3de..9acfd9a3 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -53,6 +53,7 @@ export const USER_CENTER_MENU_BUTTON_CODE = 'user-center-passwd-update'
/**协议列表 */
export const protocolList = [
- { label: 'OPC-UA', value: 'OPC_UA', alias: 'opc-ua' },
- { label: 'Modbus/TCP', value: 'MODBUS_TCP', alias: 'modbus-tcp' },
+ { label: 'OPC_UA', value: 'OPC_UA', alias: 'opc-ua' },
+ { label: 'MODBUS_TCP', value: 'MODBUS_TCP', alias: 'Modbus/TCP' },
+ { label: 'COLLECTOR_GATEWAY', value: 'COLLECTOR_GATEWAY', alias: 'GATEWAY' },
]
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 273d5755..53e4ebe4 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -368,10 +368,10 @@ const findComponents = (code: string, level: number, isApp: boolean, components:
const myComponents = components[code]
if (level === 1) { // BasicLayoutPage
return myComponents ? () => myComponents() : BasicLayoutPage
+ } else if (isApp){ // iframe
+ return Iframe
} else if (level === 2) { // BlankLayoutPage or components
return myComponents ? () => myComponents() : BlankLayoutPage
- } else if (isApp){ // iframe
- return () => Iframe
} else if(myComponents) { // components
return () => myComponents()
}
@@ -417,6 +417,21 @@ const findDetailRouteItem = (item: any, components: any) => {
return []
}
+const findSaveRouteItem = (item: any, components: any) => {
+ const { code, url } = item
+ const Component = components[`${item.code}/Save`]
+ if (Component) {
+ return [{
+ url: `${url}/detail/:id`,
+ code: `${code}/Save`,
+ component: Component,
+ name: '详情信息',
+ isShow: false
+ }]
+ }
+ return []
+}
+
export const handleMenus = (menuData: any[], components: any, level: number = 1) => {
if (menuData && menuData.length) {
return menuData.map(item => {
@@ -434,7 +449,6 @@ export const handleMenus = (menuData: any[], components: any, level: number = 1)
const extraRoute = hasExtraChildren(item, extraRouteObj)
const detail_components = findDetailRouteItem(item, components)
-
if (extraRoute && !isApp) { // 包含额外的子路由
route.children = route.children ? [...route.children, ...extraRoute] : extraRoute
}
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index b5bbf228..920825f9 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -43,9 +43,7 @@ export const initWebSocket = () => {
const data = JSON.parse(msg.data)
if (data.type === 'error') {
- notification.error({ key: 'wserr', message: data.message, style: {
- zIndex: 1040
- } })
+ notification.error({ key: 'error', message: data.message })
}
if (subs[data.requestId]) {
diff --git a/src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue b/src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue
new file mode 100644
index 00000000..68b956c9
--- /dev/null
+++ b/src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/DataCollect/Channel/Save/GateWayFormItem.vue b/src/views/DataCollect/Channel/Save/GateWayFormItem.vue
new file mode 100644
index 00000000..5427a373
--- /dev/null
+++ b/src/views/DataCollect/Channel/Save/GateWayFormItem.vue
@@ -0,0 +1,71 @@
+
+
+ 选择网关设备
+
+
+
(cloneDeep(FormState));
const handleOk = async () => {
- const params = await formRef.value?.validate();
+ const params: any = await formRef.value?.validate();
+ if (params?.provider === 'COLLECTOR_GATEWAY') {
+ params.configuration.deviceName = formData.value.configuration.deviceName
+ }
+
+ params.circuitBreaker = {
+ type: 'Ignore'
+ }
+
loading.value = true;
const response = !id
? await save(params).catch(() => {})
@@ -284,9 +304,9 @@ const getProvidersList = async () => {
if (resp.status === 200) {
const arr = resp.result
.filter(
- (item: any) => item.id === 'modbus-tcp' || item.id === 'opc-ua',
+ (item: any) => ['GATEWAY', 'Modbus/TCP', 'opc-ua'].includes(item.name),
)
- .map((it: any) => it.id);
+ .map((it: any) => it.name);
const providers: any = protocolList.filter((item: any) =>
arr.includes(item.alias),
);
@@ -302,7 +322,9 @@ getCertificateList();
watch(
() => props.data,
(value) => {
- if (value.id) formData.value = value as FormDataType;
+ if (value.id) {
+ formData.value = value as FormDataType;
+ }
},
{ immediate: true, deep: true },
);
diff --git a/src/views/DataCollect/Channel/data.ts b/src/views/DataCollect/Channel/data.ts
index c95583fa..68a8fe0c 100644
--- a/src/views/DataCollect/Channel/data.ts
+++ b/src/views/DataCollect/Channel/data.ts
@@ -15,6 +15,8 @@ export const FormState: FormDataType = {
authType: 'anonymous',
username: '',
password: '',
+ deviceId: undefined,
+ deviceName: undefined,
},
description: '',
};
diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue
index 583606f9..3e27726b 100644
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@@ -143,11 +143,12 @@
\ No newline at end of file
diff --git a/src/views/account/Center/components/BindThirdAccount/index.vue b/src/views/account/Center/components/BindThirdAccount/index.vue
index 1e440fa5..8e07e584 100644
--- a/src/views/account/Center/components/BindThirdAccount/index.vue
+++ b/src/views/account/Center/components/BindThirdAccount/index.vue
@@ -1,5 +1,6 @@
-
上行
@@ -73,6 +73,7 @@ import {
getTimeByType,
typeDataLine,
areaStyle,
+ colorNetwork,
networkParams, arrayReverse,
} from './tool.ts';
import dayjs from 'dayjs';
@@ -108,7 +109,9 @@ const pickerTimeChange = (value: any) => {
data.value.time.type = undefined;
getNetworkEcharts(data.value);
};
-
+const changeType = (value:any) =>{
+ getNetworkEcharts(data.value);
+}
const getNetworkEcharts = async (val: any) => {
loading.value = true;
const resp: any = await dashboard(networkParams(val));
@@ -168,7 +171,7 @@ const setOptions = (data: any, key: string) => ({
name: key,
type: 'line',
smooth: true,
- areaStyle,
+ // areaStyle,
});
const handleNetworkOptions = (optionsData: any, xAxis: any) => {
@@ -205,7 +208,7 @@ const echartsOptions = computed(() => {
trigger: 'axis',
formatter: (_value: any) => networkValueRender(_value[0]),
},
- color: ['#979AFF'],
+ color: colorNetwork,
series: series
};
})
@@ -214,6 +217,7 @@ watch(
() => data.value.time.type,
(value) => {
if (value === undefined) return;
+ console.log(value);
const date = getTimeByType(value);
data.value.time.time = [dayjs(date), dayjs(new Date())];
diff --git a/src/views/link/DashBoard/components/ServerList.vue b/src/views/link/DashBoard/components/ServerList.vue
index 80bc72bb..d2655b2e 100644
--- a/src/views/link/DashBoard/components/ServerList.vue
+++ b/src/views/link/DashBoard/components/ServerList.vue
@@ -4,10 +4,10 @@
@@ -26,7 +26,7 @@ const props = defineProps({
default: () => []
},
color: {
- type: String,
+ type: [String, Array],
default: '#979AFF'
}
})
diff --git a/src/views/link/DashBoard/components/tool.ts b/src/views/link/DashBoard/components/tool.ts
index 4bcbac31..83602698 100644
--- a/src/views/link/DashBoard/components/tool.ts
+++ b/src/views/link/DashBoard/components/tool.ts
@@ -104,7 +104,7 @@ export const networkParams = (val: any) => {
},
];
};
-export const defulteParamsData = (group: any, val: any) => [
+export const defaultParamsData = (group: any, val: any) => [
{
dashboard: 'systemMonitor',
object: 'stats',
@@ -119,6 +119,10 @@ export const defulteParamsData = (group: any, val: any) => [
},
];
+export const colorNetwork = ['#FF7D00', '#FFC300', '#37E2E2', '#165DFF', '#722ED1']
+export const colorCpu = ['#313CA9', '#21CCFF', '#249EFF', '#86DF6C', '#979AFF']
+export const colorJvm = ['#246EFF', '#00B2FF', '#81E2FF', '#2CAB40', '#8D4EDA']
+
export const areaStyle = {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
diff --git a/src/views/media/Device/Channel/Live/Preset.vue b/src/views/media/Device/Channel/Live/Preset.vue
new file mode 100644
index 00000000..323fab90
--- /dev/null
+++ b/src/views/media/Device/Channel/Live/Preset.vue
@@ -0,0 +1,203 @@
+
+
+
+
+ 设置
+
+
+ 删除
+ 调用
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/media/Device/Channel/Live/Share.vue b/src/views/media/Device/Channel/Live/Share.vue
new file mode 100644
index 00000000..416e1537
--- /dev/null
+++ b/src/views/media/Device/Channel/Live/Share.vue
@@ -0,0 +1,61 @@
+
+
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/media/Device/Channel/Live/index.less b/src/views/media/Device/Channel/Live/index.less
index e8e0b3f6..b2e2221e 100644
--- a/src/views/media/Device/Channel/Live/index.less
+++ b/src/views/media/Device/Channel/Live/index.less
@@ -1,22 +1,21 @@
.media-live {
display: flex;
- .live-player-tools {
- flex-basis: 230px;
+ // .live-player-tools {
+ // flex-basis: 300px;
- .direction-item {
- font-size: 30px !important;
- }
+ // .direction-item {
+ // font-size: 30px !important;
+ // }
- .zoom-item {
- font-size: 20px !important;
- }
- }
+ // .zoom-item {
+ // font-size: 20px !important;
+ // }
+ // }
.media-live-video {
position: relative;
- flex-grow: 1;
- width: 0;
+ flex: 1;
.media-tool {
position: absolute;
@@ -50,9 +49,20 @@
}
}
}
+
+ .media-live-actions {
+ width: 300px;
+ margin-left: 10px;
+
+ .actions-tool {
+ padding: 0 40px 5px 40px;
+ }
+ }
}
.media-live-tool {
display: flex;
- margin-top: 24px;
+ margin-bottom: 24px;
+ justify-content: space-between;
+ align-items: center;
}
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 27d292e1..b9e0aa5b 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -3,49 +3,82 @@
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ {{ slotProps.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备类型
+
+ {{ slotProps.deviceType?.text }}
+
+ 产品名称
+
+ {{ slotProps.productName }}
+
+
+
+ {{ name }}
+
+
+
+ 重新选择
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/index.vue b/src/views/device/components/Metadata/index.vue
index 719774c5..b24b6a62 100644
--- a/src/views/device/components/Metadata/index.vue
+++ b/src/views/device/components/Metadata/index.vue
@@ -80,8 +80,8 @@ provide('_metadataType', props.type)
const showReset = computed(() => {
if (props.type === 'device' && instanceStore.current.productMetadata) {
console.log(instanceStore.current)
- const proMetadata = JSON.parse(instanceStore.current.productMetadata)
- const _metadata = JSON.parse(instanceStore.current.metadata)
+ const proMetadata = JSON.parse(instanceStore.current.productMetadata || '{}')
+ const _metadata = JSON.parse(instanceStore.current.metadata || '{}')
return !isEqual(_metadata, proMetadata)
}
diff --git a/src/views/home/components/DeviceCountCard.vue b/src/views/home/components/DeviceCountCard.vue
index 755117a8..88a2d8bc 100644
--- a/src/views/home/components/DeviceCountCard.vue
+++ b/src/views/home/components/DeviceCountCard.vue
@@ -29,13 +29,13 @@ const deviceNum = ref(0);
const menuPermission = useMenuStore().hasMenu;
const getData = () => {
// 有产品菜单权限则获取数据
- menuPermission('device/Product') &&
+ menuPermission('device/Instance') &&
getDeviceCount_api().then((resp: any) => {
deviceNum.value = resp.result;
});
// 有设备菜单权限则获取数据
- menuPermission('device/Instance') &&
+ menuPermission('device/Product') &&
getProductCount_api({}).then((resp: any) => {
projectNum.value = resp.result;
});
diff --git a/src/views/home/components/InitHome/index.vue b/src/views/home/components/InitHome/index.vue
index 143dec54..49323b98 100644
--- a/src/views/home/components/InitHome/index.vue
+++ b/src/views/home/components/InitHome/index.vue
@@ -3,29 +3,7 @@
@@ -61,7 +61,8 @@ import {
arrayReverse,
typeDataLine,
areaStyleJvm,
- defulteParamsData,
+ colorJvm,
+ defaultParamsData
} from './tool.ts';
import { DataType } from '../typings';
import ServerList from './ServerList.vue'
@@ -98,7 +99,7 @@ const pickerTimeChange = () => {
const getJVMEcharts = async (val: any) => {
loading.value = true;
- const res: any = await dashboard(defulteParamsData('jvm', val));
+ const res: any = await dashboard(defaultParamsData('jvm', val));
if (res.success) {
const _jvmOptions = {};
const _jvmXAxis = new Set();
@@ -142,7 +143,7 @@ const setOptions = (optionsData: any, key: string) => ({
type: 'line',
smooth: true,
symbol: 'none',
- areaStyle: areaStyleJvm,
+ // areaStyle: areaStyleJvm(_index),
});
const handleJVMOptions = (optionsData: any, xAxis: any) => {
const dataKeys = Object.keys(optionsData);
@@ -184,7 +185,7 @@ const echartsOptions = computed(() => {
end: data.value.type !== 'hour' ? 10 : 100,
},
],
- color: ['#60DFC7'],
+ color: colorJvm,
series: series
}
})
diff --git a/src/views/link/DashBoard/components/Network.vue b/src/views/link/DashBoard/components/Network.vue
index ab9de9e3..bb6c1893 100644
--- a/src/views/link/DashBoard/components/Network.vue
+++ b/src/views/link/DashBoard/components/Network.vue
@@ -7,7 +7,7 @@
请选择首页视图
- 保存修改
@@ -35,8 +13,8 @@
+
+
diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue
index bbf277c2..bd6d62e5 100644
--- a/src/views/link/AccessConfig/components/Media/GB28181.vue
+++ b/src/views/link/AccessConfig/components/Media/GB28181.vue
@@ -151,17 +151,11 @@
/^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: '请输入正确的IP地址',
},
- {
- max: 65535,
- message: '请输入1~65535之间的正整数'
- },
- {
- min: 1,
- message: '请输入1~65535之间的正整数'
- },
+
]"
+ :validateFirst="true"
>
-
@@ -343,6 +333,7 @@
index,
'publicHost',
]"
+ :validateFirst="true"
:rules="[
{
required: true,
@@ -598,6 +589,15 @@ const dynamicValidateForm = reactive<{ cluster: Form2[] }>({
cluster: [],
});
+const rules = {
+ publicPort: [
+ {
+ required: true,
+ message: '输入端口',
+ }
+ ]
+}
+
const removeCluster = (item: Form2) => {
let index = dynamicValidateForm.cluster.indexOf(item);
if (index !== -1) {
diff --git a/src/views/link/AccessConfig/data.ts b/src/views/link/AccessConfig/data.ts
index 9753405e..891b18dc 100644
--- a/src/views/link/AccessConfig/data.ts
+++ b/src/views/link/AccessConfig/data.ts
@@ -14,6 +14,7 @@ ProtocolMapping.set('Ctwing', 'HTTP');
ProtocolMapping.set('modbus-tcp', 'MODBUS_TCP');
ProtocolMapping.set('opc-ua', 'OPC_UA');
ProtocolMapping.set('edge-child-device', 'EdgeGateway');
+ProtocolMapping.set('collector-gateway', 'collector-gateway');
ProtocolMapping.set('official-edge-gateway', 'MQTT');
const NetworkTypeMapping = new Map();
@@ -44,6 +45,7 @@ BackMap.set('gb28181-2016', getImage('/access/gb28181.png'));
BackMap.set('mqtt-client-gateway', getImage('/access/mqtt-broke.png'));
BackMap.set('edge-child-device', getImage('/access/child-device.png'));
BackMap.set('official-edge-gateway', getImage('/access/edge.png'));
+BackMap.set('collector-gateway', getImage('/access/collector-gateway.png'));
const descriptionList = {
'udp-device-gateway':
diff --git a/src/views/link/DashBoard/components/Cpu.vue b/src/views/link/DashBoard/components/Cpu.vue
index f7e39658..75391946 100644
--- a/src/views/link/DashBoard/components/Cpu.vue
+++ b/src/views/link/DashBoard/components/Cpu.vue
@@ -45,7 +45,7 @@
v-if="serverOptions.length > 1"
v-model:value="serverActive"
:options="serverOptions"
- color="#2CB6E0"
+ :color="colorCpu"
/>
@@ -59,9 +59,10 @@ import dayjs from 'dayjs';
import {
getTimeByType,
arrayReverse,
- defulteParamsData,
+ defaultParamsData,
areaStyleCpu,
typeDataLine,
+ colorCpu
} from './tool.ts';
import { DataType } from '../typings';
import ServerList from './ServerList.vue'
@@ -97,6 +98,7 @@ const pickerTimeChange = () => {
};
const echartsOptions = computed(() => {
+ console.log(serverActive.value)
const series = serverActive.value.length
? serverActive.value.map((key) => setOptions(serverData.data, key))
: typeDataLine
@@ -128,13 +130,13 @@ const echartsOptions = computed(() => {
end: data.value.type !== 'hour' ? 5 : 100,
},
],
- color: ['#2CB6E0'],
+ color: colorCpu,
series: series
};
})
const getCPUEcharts = async (val: any) => {
loading.value = true;
- const res: any = await dashboard(defulteParamsData('cpu', val));
+ const res: any = await dashboard(defaultParamsData('cpu', val));
if (res.success) {
const _cpuOptions = {};
const _cpuXAxis = new Set();
@@ -174,7 +176,7 @@ const setOptions = (optionsData: any, key: string) => ({
type: 'line',
smooth: true,
symbol: 'none',
- areaStyle: areaStyleCpu,
+ // areaStyle: areaStyleCpu(index),
});
const handleCpuOptions = (optionsData: any, xAxis: any) => {
diff --git a/src/views/link/DashBoard/components/Jvm.vue b/src/views/link/DashBoard/components/Jvm.vue
index 6c1ef7fc..77a7eee4 100644
--- a/src/views/link/DashBoard/components/Jvm.vue
+++ b/src/views/link/DashBoard/components/Jvm.vue
@@ -45,7 +45,7 @@
v-if="serverOptions.length > 1"
v-model:value="serverActive"
:options="serverOptions"
- color="#60DFC7"
+ :color="colorJvm"
/>
-
+
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
-
+
+
+
+
+
+
+
+
+
+ 复制下方链接，分享{{ data.name }}视频界面
+
+
+
+ MP4
+ FLV
+ HLS
+
+
+
+
- => {
+ const index = window.location.href.indexOf('?')
+ const paramsUrl = window.location.href.substr(index + 1)
+ const paramsArr = paramsUrl.split('#')?.[0] || ''
+
+ const vars = paramsArr.split('&');
+ const maps = new Map()
for (let i = 0; i < vars.length; i++) {
const pair = vars[i].split('=');
- if (pair[0] === variable) {
- return pair[1];
- }
+ const [key, value] = pair
+ maps.set(key, value)
}
- return '';
+ return maps;
}
const doLogin = () => {
@@ -209,32 +213,36 @@ const doLogin = () => {
const initPage = async () => {
let redirectUrl
// 获取url中的配置信息
+ const paramsIndex = location.hash.indexOf('?')
+ const _params = getQueryVariable()
const items = {
- client_id: getQueryVariable('client_id'),
- state: getQueryVariable('state'),
- redirect_uri: decodeURIComponent(getQueryVariable('redirect_uri')),
- response_type: getQueryVariable('response_type'),
- scope: getQueryVariable('scope'),
+ client_id: _params.get('client_id'),
+ state: _params.get('state'),
+ redirect_uri: decodeURIComponent(_params.get('redirect_uri')!),
+ response_type: _params.get('response_type'),
+ scope: _params.get('scope'),
}
- const item = getQueryVariable('internal');
+ const item = _params.get('internal');
if (items.redirect_uri) {
const origin = items.redirect_uri.split('/').slice(0, 3)
const url = `${origin.join('/')}${items.redirect_uri?.split('redirect=')[1]}`
// redirectUrl = `${items.redirect_uri?.split('redirect_uri=')[0]}?redirect=${url}`
redirectUrl = items.redirect_uri
}
- // 获取用户信息
- getLoginUser({
- ...items,
- internal: getQueryVariable('internal'),
- redirect_uri: redirectUrl,
- })
+ console.log(params)
internal.value = item
params.value = {
...items,
redirect_uri: redirectUrl,
}
+ console.log(params.value)
+ // 获取用户信息
+ getLoginUser({
+ ...items,
+ internal: _params.get('internal'),
+ redirect_uri: redirectUrl,
+ })
}
const getSettingDetail = () => {
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
index 4f00510e..11055f19 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
@@ -38,6 +38,8 @@
:height='450'
:virtual='true'
@select='treeSelect'
+ :showLine="{ showLeafIcon: false }"
+ :show-icon="true"
>
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
index 23c25abf..c5c6484b 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
@@ -60,6 +60,10 @@ const onSelect = (v: any, _label: string, index: number) => {
const tabChange = (e: string) => {
emit('update:source', e)
}
+
+watch(() => props.value, () => {
+ myValue.value = props.value
+})
-
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 5eb49648..06666e25 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -130,7 +130,7 @@
:channelData="channelData"
@submit="listRef.reload()"
/>
-
-
-
-
-
- 本地存储
-
-
-
-
- 云端存储
-
-
-
-
+
+ 取消
+ 确定
+
+
+
- 开始录像
-
-
-
+
-
+
+
+
+
+ 本地存储
+
+
+
+
+ 云端存储
+
+
+
+
+
+
-
-
-
-
-
开始录像
+
+
- 请求录像中
+
- 请求录像中
+
+ 停止录像
+
- 停止录像
-
-
刷新
@@ -67,23 +100,45 @@
autoplay
/>
-
-
- MP4
- FLV
- HLS
-
+
+
+
+
+
+
+
+
+
+
+ {{ _speed }}
+
+ {{ item.label }}
+
+
+
+
+
+
+ 转速控制
+