Browse Source

Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

wangqin
zhangzhang 11 months ago
parent
commit
16f249a0c7
  1. 59
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
  2. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

59
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue

@ -7,51 +7,31 @@
<Descriptions :list="list" :data="data" style="gap: 18px"> <Descriptions :list="list" :data="data" style="gap: 18px">
<template #content-deviceName> <template #content-deviceName>
<span>{{ dialogData.deviceName || "-" }}</span> <span>{{ dialogData.deviceName || "-" }}</span>
<img <img @click="controlDialogVisible = true" v-if="[0, '0'].includes(
@click="controlDialogVisible = true"
v-if="
[0, '0'].includes(
dialogData.parseOtherConfig && dialogData.parseOtherConfig &&
dialogData.parseOtherConfig.ptzCtrl dialogData.parseOtherConfig.ptzCtrl
) )
" " src="@screen/images/camera-control-icon.svg" width="18px" height="18px" style="cursor: pointer" />
src="@screen/images/camera-control-icon.svg"
width="18px"
height="18px"
style="cursor: pointer"
/>
</template> </template>
</Descriptions> </Descriptions>
<div <div v-if="PanoramicCameraTypes.indexOf(dialogData.childType) == -1"
v-if="PanoramicCameraTypes.indexOf(dialogData.childType) == -1" style="width: 50%; display: flex; margin-top: 18px">
style="width: 50%; display: flex; margin-top: 18px" <span style="
>
<span
style="
color: #3de8ff; color: #3de8ff;
font-size: 15px; font-size: 15px;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 18px; line-height: 18px;
" ">
>
雨刷: 雨刷:
</span> </span>
<Button style="margin-left: 5px" @click.native="controlClick(49)" <Button style="margin-left: 5px" @click.native="controlClick(49)"></Button>
></Button <Button style="margin-left: 5px" @click.native="controlClick(48)"></Button>
>
<Button style="margin-left: 5px" @click.native="controlClick(48)"
></Button
>
</div> </div>
</ElTabPane> </ElTabPane>
<ElTabPane label="摄相机参数" name="second">摄相机参数</ElTabPane> <ElTabPane label="摄相机参数" name="second">摄相机参数</ElTabPane>
<ElTabPane label="在线率统计" name="third"> <ElTabPane label="在线率统计" name="third">
<LineChart <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
v-if="activeName === 'third'"
:productId="dialogData.id"
style="height: 180px"
/>
</ElTabPane> </ElTabPane>
</ElTabs> </ElTabs>
@ -61,10 +41,7 @@
</div> </div>
</div> </div>
<CameraControlDialog <CameraControlDialog :deviceId="dialogData.iotDeviceId" v-model="controlDialogVisible" />
:deviceId="dialogData.iotDeviceId"
v-model="controlDialogVisible"
/>
</Dialog> </Dialog>
</template> </template>
@ -136,12 +113,12 @@ export default {
enum: "DeviceTypeEnum", enum: "DeviceTypeEnum",
// gridColumn: 2, // gridColumn: 2,
}, },
{ // {
label: "状态更新时间", // label: "",
key: "updateTime", // key: "updateTime",
// gridColumn: 2, // // gridColumn: 2,
// enum: "CameraDirectionEnum" // // enum: "CameraDirectionEnum"
}, // },
// { // {
// label: '/', // label: '/',
// key: "${longitude} / ${latitude}", // key: "${longitude} / ${latitude}",
@ -164,7 +141,7 @@ export default {
}, },
methods: { methods: {
controlClick: throttle(function (type) { controlClick: throttle(function (type) {
controlCamera(this.deviceId, type); controlCamera(this.dialogData.iotDeviceId, type, false);
}, 150), }, 150),
visibleClose(bool) { visibleClose(bool) {
if (bool) return; if (bool) return;
@ -228,7 +205,7 @@ export default {
align-items: center; align-items: center;
justify-content: end; justify-content: end;
> div { >div {
font-size: 16px; font-size: 16px;
padding: 6px 12px; padding: 6px 12px;
} }

4
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@ -87,12 +87,12 @@ function padZero(num) {
99 /向动作停/ 99 /向动作停/
* @returns * @returns
*/ */
export function controlCamera(camId, cmdType) { export function controlCamera(camId, cmdType, isMsgType = true) {
return request({ return request({
url: "/video/PTZControl", url: "/video/PTZControl",
method: "get", method: "get",
params: { params: {
msgType: 3, ...(isMsgType ? { msgType: 3 } : undefined),
camId, camId,
cmdType, cmdType,
speed: 1, speed: 1,

Loading…
Cancel
Save