Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue
This commit is contained in:
commit
1876339989
|
|
@ -15,7 +15,7 @@ enum Api {
|
|||
getDictItems = '/sys/dict/getDictItems/',
|
||||
getTableList = '/sys/user/queryUserComponentData',
|
||||
getCategoryData = '/sys/category/loadAllData',
|
||||
getNuList = '/iot/cameraInfo/nuList', //后期调整
|
||||
getNuList = '/iot/tplink/cameraInfo/nuList', //后期调整
|
||||
getOrgInfo = '/api/common/getOrgInfo',//根据机构编码获取机构信息
|
||||
}
|
||||
|
||||
|
|
@ -172,4 +172,4 @@ export const uploadMyFile = (url, data) => {
|
|||
*/
|
||||
export const getOrgInfo = (params) => {
|
||||
return defHttp.get({ url: Api.getOrgInfo, params });
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,43 +1,45 @@
|
|||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
enum Api {
|
||||
queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync',
|
||||
queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync',
|
||||
syncProject = '/iot/projectInfo/sync',
|
||||
syncRegion = '/iot/regionInfo/sync',
|
||||
list = '/iot/cameraInfo/list',
|
||||
ipcCapability = '/iot/cameraInfo/getIpcCapability',
|
||||
nuList = '/iot/cameraInfo/nuList',
|
||||
edit = '/iot/cameraInfo/edit',
|
||||
rebootDevice = '/iot/cameraInfo/rebootDevice',
|
||||
previewUrl = '/iot/cameraInfo/getPreviewUrl',
|
||||
getImageCommon = '/iot/cameraInfo/getImageCommon',
|
||||
setImageCommon = '/iot/cameraInfo/setImageCommon',
|
||||
getOsdCapability = '/iot/cameraInfo/getOsdCapability',
|
||||
getOsd = '/iot/cameraInfo/getOsd',
|
||||
setOsd = '/iot/cameraInfo/setOsd',
|
||||
getTamperDet = '/iot/cameraInfo/getTamperDet',
|
||||
setTamperDet = '/iot/cameraInfo/setTamperDet',
|
||||
getTamperNotif = '/iot/cameraInfo/getTamperNotif',
|
||||
setTamperNotif = '/iot/cameraInfo/setTamperNotif',
|
||||
testAudio = '/iot/cameraInfo/testAudio',
|
||||
getAlarmInfo = '/iot/cameraInfo/getAlarmInfo',
|
||||
setAlarmInfo = '/iot/cameraInfo/setAlarmInfo',
|
||||
getAlarmPlan = '/iot/cameraInfo/getAlarmPlan',
|
||||
setAlarmPlan = '/iot/cameraInfo/setAlarmPlan',
|
||||
getVideoParams = '/iot/cameraInfo/getVideoParams',
|
||||
setVideoParams = '/iot/cameraInfo/setVideoParams',
|
||||
configRecovery = '/iot/cameraInfo/configRecovery',
|
||||
searchVideo = '/iot/cameraInfo/searchVideo',
|
||||
getPlaybackUrlList = '/iot/cameraInfo/getPlaybackUrlList',
|
||||
deletePlaybackChn = '/iot/cameraInfo/deletePlaybackChn',
|
||||
getMultitransUrl = '/iot/cameraInfo/getMultitransUrl',
|
||||
getRecordCfgs = '/iot/cameraInfo/getRecordCfgs',
|
||||
setRecordCfgs = '/iot/cameraInfo/setRecordCfgs',
|
||||
getBatchProgress = '/iot/cameraInfo/getBatchProgress',
|
||||
uploadToServer = '/iot/cameraInfo/uploadToServer',
|
||||
stopUploadToServer = '/iot/cameraInfo/stopUploadToServer',
|
||||
getUploadToServerProcess = '/iot/cameraInfo/getUploadToServerProcess',
|
||||
queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync',
|
||||
queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync',
|
||||
syncProject = '/iot/tplink/projectInfo/sync',
|
||||
syncRegion = '/iot/tplink/regionInfo/sync',
|
||||
list = '/iot/tplink/cameraInfo/list',
|
||||
syncProjectIpcDevice = '/iot/tplink/cameraInfo/syncProjectIpcDevice',
|
||||
ipcCapability = '/iot/tplink/cameraInfo/getIpcCapability',
|
||||
nuList = '/iot/tplink/cameraInfo/nuList',
|
||||
edit = '/iot/tplink/cameraInfo/edit',
|
||||
rebootDevice = '/iot/tplink/cameraInfo/rebootDevice',
|
||||
previewUrl = '/iot/tplink/cameraInfo/getPreviewUrl',
|
||||
getImageCommon = '/iot/tplink/cameraInfo/getImageCommon',
|
||||
setImageCommon = '/iot/tplink/cameraInfo/setImageCommon',
|
||||
getOsdCapability = '/iot/tplink/cameraInfo/getOsdCapability',
|
||||
getOsd = '/iot/tplink/cameraInfo/getOsd',
|
||||
setOsd = '/iot/tplink/cameraInfo/setOsd',
|
||||
getTamperDet = '/iot/tplink/cameraInfo/getTamperDet',
|
||||
setTamperDet = '/iot/tplink/cameraInfo/setTamperDet',
|
||||
getTamperNotif = '/iot/tplink/cameraInfo/getTamperNotif',
|
||||
setTamperNotif = '/iot/tplink/cameraInfo/setTamperNotif',
|
||||
testAudio = '/iot/tplink/cameraInfo/testAudio',
|
||||
getAlarmInfo = '/iot/tplink/cameraInfo/getAlarmInfo',
|
||||
setAlarmInfo = '/iot/tplink/cameraInfo/setAlarmInfo',
|
||||
getAlarmPlan = '/iot/tplink/cameraInfo/getAlarmPlan',
|
||||
setAlarmPlan = '/iot/tplink/cameraInfo/setAlarmPlan',
|
||||
getVideoParams = '/iot/tplink/cameraInfo/getVideoParams',
|
||||
setVideoParams = '/iot/tplink/cameraInfo/setVideoParams',
|
||||
configRecovery = '/iot/tplink/cameraInfo/configRecovery',
|
||||
searchVideo = '/iot/tplink/cameraInfo/searchVideo',
|
||||
getPlaybackUrlList = '/iot/tplink/cameraInfo/getPlaybackUrlList',
|
||||
deletePlaybackChn = '/iot/tplink/cameraInfo/deletePlaybackChn',
|
||||
getMultitransUrl = '/iot/tplink/cameraInfo/getMultitransUrl',
|
||||
getRecordCfgs = '/iot/tplink/cameraInfo/getRecordCfgs',
|
||||
setRecordCfgs = '/iot/tplink/cameraInfo/setRecordCfgs',
|
||||
getBatchProgress = '/iot/tplink/cameraInfo/getBatchProgress',
|
||||
uploadToServer = '/iot/tplink/cameraInfo/uploadToServer',
|
||||
stopUploadToServer = '/iot/tplink/cameraInfo/stopUploadToServer',
|
||||
getUploadToServerProcess = '/iot/tplink/cameraInfo/getUploadToServerProcess',
|
||||
motionCtrl = '/iot/tplink/cameraInfo/motionCtrl',
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -72,6 +74,13 @@ export const syncRegion = (params?) => defHttp.get({ url: Api.syncRegion, params
|
|||
*/
|
||||
export const list = (params) => defHttp.get({ url: Api.list, params });
|
||||
|
||||
|
||||
/**
|
||||
* 同步此项目下的IPC设备
|
||||
* @param params
|
||||
*/
|
||||
export const syncProjectIpcDevice = (params) => defHttp.get({ url: Api.syncProjectIpcDevice, params });
|
||||
|
||||
/**
|
||||
* 获取IPC能力集
|
||||
* @param params
|
||||
|
|
@ -266,3 +275,10 @@ export const stopUploadToServer = (params) => defHttp.get({ url: Api.stopUploadT
|
|||
*/
|
||||
export const getUploadToServerProcess = (params) => defHttp.get({ url: Api.getUploadToServerProcess, params });
|
||||
|
||||
/**
|
||||
* 控制球机转动
|
||||
* @param params
|
||||
*/
|
||||
export const motionCtrl = (params) => defHttp.get({ url: Api.motionCtrl, params });
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<JFormContainer>
|
||||
<template #detail>
|
||||
<a-row>
|
||||
<a-col :span="12">
|
||||
|
|
@ -241,24 +241,24 @@ const formRef = ref();
|
|||
const useForm = Form.useForm;
|
||||
const formData = reactive<Record<string, any>>({
|
||||
deviceIndex: '',//设备索引
|
||||
streamType: 0,//码流类型 0 代表主码流，1 代码子码流
|
||||
streamType: 1,//码流类型 0 代表主码流，1 代码子码流
|
||||
//视频预览参数
|
||||
url: '',//预览通道对应的URL
|
||||
backupUrl: '',//备选URL，当流媒体服务器存在内外网IP配置时，该字段不为null
|
||||
wsUrl: '',//用于建立ws连接传输视频帧信息
|
||||
wssUrl: '',//用于建立wss接传输视频帧信息
|
||||
|
||||
chroma: "0", //色度
|
||||
luma: "0", //亮度
|
||||
sharpness: "0", //锐度
|
||||
saturation: "0", //饱和度
|
||||
contrast: "0", //对比度
|
||||
wd_gain: "0", //宽动态度
|
||||
smartir_level: "0",//防过曝等级
|
||||
chroma: 0, //色度
|
||||
luma: 0, //亮度
|
||||
sharpness: 0, //锐度
|
||||
saturation: 0, //饱和度
|
||||
contrast: 0, //对比度
|
||||
wd_gain: 0, //宽动态度
|
||||
smartir_level: 0,//防过曝等级
|
||||
wide_dynamic: "off", //宽动态 "off"//关闭 "on"//开启
|
||||
smartir: "auto_ir",//防红外过曝："auto_ir_ae" //自动-增强模式 "auto_ir" //自动-标准模式 "manual"//手动——防过曝等级
|
||||
smartwtl: "auto_wtl",//白光强度："auto_wtl_ae" //智能白光-柔和 ；"auto_wtl" //智能白光-标准 ； "manual" //手动——出现白光等级
|
||||
smartwtl_digital_level: "0",//白光等级
|
||||
smartwtl_digital_level: 0,//白光等级
|
||||
|
||||
flip_type: "center",//画面镜像旋转： "off"//关闭 "left_and_right"//左右 "up_and_down"//上下 "center"//中心
|
||||
night_vision_mode: "md_night_vision",//照明模式："wtl_night_vision"//白光照明 ；"inf_night_vision"//红外照明 ； "md_night_vision"//移动侦测全彩——出现白光强度
|
||||
|
|
@ -302,6 +302,10 @@ async function preview(deviceIndex, streamType, url) {
|
|||
formData.wssUrl = res.wssUrl;
|
||||
confirmLoading.value = false;
|
||||
});
|
||||
if (player.value){
|
||||
player.value.destroy().then(() => {
|
||||
}); // 销毁
|
||||
}
|
||||
const TumsPlayer = window['tums-player'].default;
|
||||
player.value = new TumsPlayer('video-container', {
|
||||
type: "rtsp", // 协议类型，rtsp
|
||||
|
|
@ -309,6 +313,8 @@ async function preview(deviceIndex, streamType, url) {
|
|||
// url: formData.backupUrl, // 取流地址, getPreviewUrl接口获取
|
||||
socket: formData.wssUrl, // websocket地址, getPreviewUrl接口获取
|
||||
pluginPath: '/static', // 当sdk资源不在根路径下时，需配置pluginPath
|
||||
talkEnable: true,
|
||||
useMultitrans: true,
|
||||
});
|
||||
let isPlaying = player.value.isPlaying();
|
||||
if (!isPlaying) {
|
||||
|
|
@ -324,9 +330,11 @@ async function preview(deviceIndex, streamType, url) {
|
|||
* 销毁
|
||||
*/
|
||||
function destroy(player) {
|
||||
console.log("commonDestroy");
|
||||
if (player) {
|
||||
player.value.destroy().then(() => {
|
||||
}); // 销毁
|
||||
player.value = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -341,20 +349,29 @@ function getCommon(deviceIndex) {
|
|||
"deviceIndex": deviceIndex,
|
||||
"type": "common"
|
||||
}).then(res => {
|
||||
formData.chroma = res.chroma; //色度
|
||||
formData.luma = res.luma; //亮度
|
||||
formData.sharpness = res.sharpness; //锐度
|
||||
formData.saturation = res.saturation; //饱和度
|
||||
formData.contrast = res.contrast; //对比度
|
||||
formData.wd_gain = res.wd_gain; //宽动态度
|
||||
formData.smartir_level = res.smartir_level; //防过曝等级
|
||||
console.log(res);
|
||||
formData.chroma = strToInt(res.chroma); //色度
|
||||
formData.luma = strToInt(res.luma); //亮度
|
||||
formData.sharpness = strToInt(res.sharpness); //锐度
|
||||
formData.saturation = strToInt(res.saturation); //饱和度
|
||||
formData.contrast = strToInt(res.contrast); //对比度
|
||||
formData.wd_gain = strToInt(res.wd_gain); //宽动态度
|
||||
formData.smartir_level = strToInt(res.smartir_level); //防过曝等级
|
||||
formData.wide_dynamic = res.wide_dynamic; //宽动态 "off"//关闭 "on"//开启
|
||||
formData.smartir = res.smartir; //防红外过曝："auto_ir_ae" //自动-增强模式 "auto_ir" //自动-标准模式 "manual"//手动——防过曝等级
|
||||
formData.smartwtl = res.smartwtl; //白光强度："auto_wtl_ae" //智能白光-柔和 ；"auto_wtl" //智能白光-标准 ； "manual" //手动——出现白光等级
|
||||
formData.smartwtl_digital_level = res.smartwtl_digital_level; //白光等级
|
||||
formData.smartwtl_digital_level = strToInt(res.smartwtl_digital_level); //白光等级
|
||||
});
|
||||
}
|
||||
|
||||
function strToInt(val){
|
||||
if(val!=null&&isFinite(val)){
|
||||
return Number(val);
|
||||
}else{
|
||||
return val;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取照明设置信息
|
||||
*/
|
||||
|
|
@ -423,6 +440,7 @@ onMounted(() => {
|
|||
watch(
|
||||
() => props.data,
|
||||
async () => {
|
||||
console.log(props.data);
|
||||
formData.deviceIndex = props.data.deviceIndex;
|
||||
getCommon(formData.deviceIndex);
|
||||
getSwitch(formData.deviceIndex);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<a-spin :spinning="syncoading">
|
||||
<div class="j-table-operator" style="width: 100%">
|
||||
<a-button preIcon="ant-design:sync-outlined" @click="loadRootTreeData">刷新</a-button>
|
||||
<!-- <a-button type="primary" preIcon="ant-design:sync-outlined" @click="syncProjectInfo">同步项目</a-button>-->
|
||||
<a-button type="primary" preIcon="ant-design:sync-outlined" @click="getProjectIpcDevice">同步设备</a-button>
|
||||
<!-- <template v-if="currentRegion !=null">-->
|
||||
<!-- <a-button preIcon="ant-design:sync-outlined" @click="syncRegionInfo">同步区域</a-button>-->
|
||||
<!-- </template>-->
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { useMethods } from '/@/hooks/system/useMethods';
|
||||
const { createMessage } = useMessage();
|
||||
import { queryProjectTreeSync, queryRegionTreeSync, syncProject, syncRegion } from '../camera.api';
|
||||
import { syncProjectIpcDevice, queryProjectTreeSync, queryRegionTreeSync, syncProject, syncRegion } from '../camera.api';
|
||||
|
||||
const emit = defineEmits(['select', 'rootTreeData']);
|
||||
const syncoading = ref<boolean>(false);
|
||||
|
|
@ -172,13 +172,21 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* 同步项目
|
||||
* 同步设备
|
||||
*/
|
||||
// async function syncProjectInfo(){
|
||||
// syncoading.value = true;
|
||||
// await syncProject();
|
||||
// await loadRootTreeData();
|
||||
// }
|
||||
async function getProjectIpcDevice(){
|
||||
let data = currentRegion.value;
|
||||
if (data == null) {
|
||||
createMessage.warning('请先选择一个区域');
|
||||
return;
|
||||
}
|
||||
const record = {
|
||||
projectId: data.projectId
|
||||
};
|
||||
await syncProjectIpcDevice(record);
|
||||
currentRegion.value["timestamp"] = new Date().getTime();
|
||||
emit('select', currentRegion.value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步区域
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<JFormContainer>
|
||||
<template #detail>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
weekEnabled: true,
|
||||
labelEnabled: true,
|
||||
|
||||
streamType: 0,//码流类型 0 代表主码流，1 代码子码流
|
||||
streamType: 1,//码流类型 0 代表主码流，1 代码子码流
|
||||
//视频预览参数
|
||||
url: '',//预览通道对应的URL
|
||||
backupUrl: '',//备选URL，当流媒体服务器存在内外网IP配置时，该字段不为null
|
||||
|
|
@ -220,6 +220,10 @@
|
|||
formData.wssUrl = res.wssUrl;
|
||||
confirmLoading.value=false;
|
||||
});
|
||||
if (player.value){
|
||||
player.value.destroy().then(() => {
|
||||
}); // 销毁
|
||||
}
|
||||
const TumsPlayer = window['tums-player'].default;
|
||||
player.value = new TumsPlayer('video-container', {
|
||||
type: "rtsp", // 协议类型，rtsp
|
||||
|
|
@ -227,6 +231,8 @@
|
|||
// url: formData.backupUrl, // 取流地址, getPreviewUrl接口获取
|
||||
socket: formData.wssUrl, // websocket地址, getPreviewUrl接口获取
|
||||
pluginPath: '/static', // 当sdk资源不在根路径下时，需配置pluginPath
|
||||
talkEnable: true,
|
||||
useMultitrans: true,
|
||||
});
|
||||
let isPlaying = player.value.isPlaying();
|
||||
if (!isPlaying) {
|
||||
|
|
@ -242,9 +248,11 @@
|
|||
* 销毁
|
||||
*/
|
||||
function destroy(player){
|
||||
console.log("osdDestroy");
|
||||
if (player){
|
||||
player.value.destroy().then(() => {
|
||||
}); // 销毁
|
||||
player.value = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,42 +4,39 @@
|
|||
v-model:activeKey="activeKey"
|
||||
tab-position="left"
|
||||
:style="{ height: '100%' }"
|
||||
@tabScroll="callback"
|
||||
>
|
||||
<a-tab-pane :key="1" tab="画面显示">
|
||||
<a-tab-pane key="A" tab="画面显示">
|
||||
<a-tabs
|
||||
v-model:activeKey="oneChildActiveKey"
|
||||
tab-position="top"
|
||||
:style="{ height: '100%' }"
|
||||
@tabScroll="callback"
|
||||
type="card"
|
||||
>
|
||||
<a-tab-pane :key="1" tab="视频显示">
|
||||
<div class="scrollable" v-if="oneChildActiveKey==1">
|
||||
<a-tab-pane key="A1" tab="视频显示">
|
||||
<div class="scrollable" v-if="oneChildActiveKey=='A1'">
|
||||
<CameraCommonForm :data="cameraData"></CameraCommonForm>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="2" tab="OSD">
|
||||
<div class="scrollable" v-if="oneChildActiveKey==2">
|
||||
<a-tab-pane key="A2" tab="OSD">
|
||||
<div class="scrollable" v-if="oneChildActiveKey=='A2'">
|
||||
<CameraOsdForm :data="cameraData"></CameraOsdForm>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="3" tab="码流参数">
|
||||
<div class="scrollable" v-if="oneChildActiveKey==3">
|
||||
<a-tab-pane key="A3" tab="码流参数">
|
||||
<div class="scrollable" v-if="oneChildActiveKey=='A3'">
|
||||
<CameraBitrateForm :data="cameraData"></CameraBitrateForm>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="2" tab="事件侦测">
|
||||
<a-tab-pane key="B" tab="事件侦测">
|
||||
<a-tabs
|
||||
v-model:activeKey="twoChildActiveKey"
|
||||
tab-position="top"
|
||||
:style="{ height: '100%' }"
|
||||
@tabScroll="callback"
|
||||
type="card"
|
||||
>
|
||||
<a-tab-pane :key="1" tab="镜头遮挡">
|
||||
<a-tab-pane key="B1" tab="镜头遮挡">
|
||||
<div class="scrollable">
|
||||
<CameraBlockForm :data="cameraData"></CameraBlockForm>
|
||||
</div>
|
||||
|
|
@ -67,40 +64,38 @@
|
|||
<!-- </a-tab-pane>-->
|
||||
</a-tabs>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="3" tab="报警设备">
|
||||
<a-tab-pane key="C" tab="报警设备">
|
||||
<a-tabs
|
||||
v-model:activeKey="threeChildActiveKey"
|
||||
tab-position="top"
|
||||
:style="{ height: '100%' }"
|
||||
@tabScroll="callback"
|
||||
type="card"
|
||||
>
|
||||
<a-tab-pane :key="1" tab="白光报警">
|
||||
<div class="scrollable" v-if="threeChildActiveKey==1">
|
||||
<a-tab-pane key="C1" tab="白光报警">
|
||||
<div class="scrollable" v-if="threeChildActiveKey=='C1'">
|
||||
<CameraLightAlarmForm :data="cameraData"></CameraLightAlarmForm>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="2" tab="声音报警">
|
||||
<div class="scrollable" v-if="threeChildActiveKey==2">
|
||||
<a-tab-pane key="C2" tab="声音报警">
|
||||
<div class="scrollable" v-if="threeChildActiveKey=='C2'">
|
||||
<CameraSoundAlarmForm :data="cameraData"></CameraSoundAlarmForm>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="4" tab="录像管理">
|
||||
<a-tab-pane key="D" tab="录像管理">
|
||||
<a-tabs
|
||||
v-model:activeKey="fourChildActiveKey"
|
||||
tab-position="top"
|
||||
:style="{ height: '100%' }"
|
||||
@tabScroll="callback"
|
||||
type="card"
|
||||
>
|
||||
<a-tab-pane :key="1" tab="MP4转发FTP">
|
||||
<a-tab-pane key="D1" tab="MP4转发FTP">
|
||||
<div class="scrollable">
|
||||
<CameraUploadForm :data="cameraData"></CameraUploadForm>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane :key="2" tab="当天录像">
|
||||
<a-tab-pane key="D2" tab="当天录像">
|
||||
<div class="scrollable">
|
||||
<CameraRecordList :data="cameraData" />
|
||||
</div>
|
||||
|
|
@ -119,7 +114,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" name="iot-nuIotCameraInfo" setup>
|
||||
import { ref, onMounted, reactive } from "vue";
|
||||
import {ref, onMounted, reactive, onUnmounted} from "vue";
|
||||
import { useRouter } from 'vue-router';
|
||||
import type { TabsProps } from 'ant-design-vue';
|
||||
import { useListPage } from "@/hooks/system/useListPage";
|
||||
|
|
@ -148,10 +143,10 @@
|
|||
ip: '' ,//IP
|
||||
});
|
||||
const cameraData = ref({});
|
||||
const activeKey = ref(1);
|
||||
const oneChildActiveKey = ref(1);
|
||||
const twoChildActiveKey = ref(1);
|
||||
const threeChildActiveKey = ref(1);
|
||||
const activeKey = ref('A');
|
||||
const oneChildActiveKey = ref('A1');
|
||||
const twoChildActiveKey = ref('B1');
|
||||
const threeChildActiveKey = ref('C1');
|
||||
|
||||
const imageData = reactive<Record<string, any>>({
|
||||
//画面显示配置
|
||||
|
|
@ -191,6 +186,7 @@
|
|||
// }
|
||||
|
||||
onMounted(()=>{
|
||||
console.log(router.currentRoute.value.query);
|
||||
formData.deviceIndex = router.currentRoute.value.query.deviceIndex;
|
||||
formData.parentId = router.currentRoute.value.query.parentId;
|
||||
formData.multitrans = router.currentRoute.value.query.multitrans;
|
||||
|
|
@ -204,7 +200,11 @@
|
|||
cameraData.value.multitrans = formData.multitrans;
|
||||
cameraData.value.scale = formData.scale;
|
||||
cameraData.value.parentId = formData.parentId;
|
||||
console.log(cameraData);
|
||||
})
|
||||
// onUnmounted(()=>{
|
||||
//
|
||||
// })
|
||||
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,63 +4,107 @@
|
|||
<a-col :span="24">
|
||||
<div id="video-container"></div>
|
||||
</a-col>
|
||||
<a-col :span="24" style="padding: 5px;">
|
||||
<span style="margin-left: 5px;" v-show="!izPlaying">
|
||||
<a-button preIcon="ant-design:play-circle-outlined" @click="play">播放</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="izPlaying">
|
||||
<a-button preIcon="ant-design:pause-circle-outlined" @click="pause">暂停</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:swap-outlined" @click="switchResolution">{{ resolution }}</a-button>
|
||||
</span>
|
||||
<!-- <span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:phone-outlined" @click="screenshot">巡航*</a-button>
|
||||
</span>-->
|
||||
<span style="margin-left: 5px;" v-show="!izPhone">
|
||||
<a-button preIcon="ant-design:phone-outlined" @click="startPhone">电话</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="izPhone">
|
||||
<a-button type="primary" danger ghost preIcon="ant-design:phone-outlined" @click="stopPhone">电话</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 15px;">分屏
|
||||
<a-select
|
||||
ref="select"
|
||||
v-model:value="fishEyeDisplayMode"
|
||||
style="width: 120px"
|
||||
@focus="focus"
|
||||
@change="setFishEyeDisplayMode"
|
||||
>
|
||||
<a-select-option value="ORIGIN">原图</a-select-option>
|
||||
<a-select-option value="FISHEYE_360D">360全景</a-select-option>
|
||||
<a-select-option value="FISHEYE_180D">180全景</a-select-option>
|
||||
<a-select-option value="FISHEYE_WIN_PLANE_TOP_QUAD">四分屏</a-select-option>
|
||||
<a-select-option value="FISHEYE_LONGITUDE">全景拉伸</a-select-option>
|
||||
</a-select>
|
||||
</span>
|
||||
</a-col>
|
||||
<a-col :span="24" style="padding: 5px;">
|
||||
<span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:picture-outlined" @click="screenshot">截图</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="!izRecording">
|
||||
<a-button preIcon="ant-design:video-camera-outlined" @click="recordingStart">录制</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="izRecording">
|
||||
<a-button type="primary" danger ghost preIcon="ant-design:video-camera-outlined" @click="recordingEnd">录制</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 15px;">画面翻转
|
||||
<a-select v-model:value="formData.flip_type" @change="(value) => changeSwitch('flip_type', value)">
|
||||
<a-select-option value="off">关闭</a-select-option>
|
||||
<a-select-option value="left_and_right">左右</a-select-option>
|
||||
<a-select-option value="up_and_down">上下</a-select-option>
|
||||
<a-select-option value="center">中心</a-select-option>
|
||||
</a-select>
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:alert-outlined" @click="manualAlarm">报警</a-button>
|
||||
</span>
|
||||
<a-col :span="24">
|
||||
<a-col :span="24" style="padding: 5px;">
|
||||
<span style="margin-left: 5px;" v-show="!izPlaying">
|
||||
<a-button preIcon="ant-design:play-circle-outlined" @click="play">播放</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="izPlaying">
|
||||
<a-button preIcon="ant-design:pause-circle-outlined" @click="pause">暂停</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:swap-outlined" @click="switchResolution">{{ resolution }}</a-button>
|
||||
</span>
|
||||
<!-- <span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:phone-outlined" @click="screenshot">巡航*</a-button>
|
||||
</span>-->
|
||||
<span style="margin-left: 5px;" v-show="!izPhone">
|
||||
<a-button preIcon="ant-design:phone-outlined" @click="startPhone">电话</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="izPhone">
|
||||
<a-button type="primary" danger ghost preIcon="ant-design:phone-outlined" @click="stopPhone">电话</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 15px;">分屏
|
||||
<a-select
|
||||
ref="select"
|
||||
v-model:value="fishEyeDisplayMode"
|
||||
style="width: 120px"
|
||||
@focus="focus"
|
||||
@change="setFishEyeDisplayMode"
|
||||
>
|
||||
<a-select-option value="ORIGIN">原图</a-select-option>
|
||||
<a-select-option value="FISHEYE_360D">360全景</a-select-option>
|
||||
<a-select-option value="FISHEYE_180D">180全景</a-select-option>
|
||||
<a-select-option value="FISHEYE_WIN_PLANE_TOP_QUAD">四分屏</a-select-option>
|
||||
<a-select-option value="FISHEYE_LONGITUDE">全景拉伸</a-select-option>
|
||||
</a-select>
|
||||
</span>
|
||||
</a-col>
|
||||
<a-col :span="24" style="padding: 5px;">
|
||||
<span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:picture-outlined" @click="screenshot">截图</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="!izRecording">
|
||||
<a-button preIcon="ant-design:video-camera-outlined" @click="recordingStart">录制</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;" v-show="izRecording">
|
||||
<a-button type="primary" danger ghost preIcon="ant-design:video-camera-outlined" @click="recordingEnd">录制</a-button>
|
||||
</span>
|
||||
<span style="margin-left: 15px;">画面翻转
|
||||
<a-select v-model:value="formData.flip_type" @change="(value) => changeSwitch('flip_type', value)" style="width: 80px;">
|
||||
<a-select-option value="off">关闭</a-select-option>
|
||||
<a-select-option value="left_and_right">左右</a-select-option>
|
||||
<a-select-option value="up_and_down">上下</a-select-option>
|
||||
<a-select-option value="center">中心</a-select-option>
|
||||
</a-select>
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<a-button preIcon="ant-design:alert-outlined" @click="manualAlarm">报警</a-button>
|
||||
</span>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-col :span="24" style="padding: 5px;display: flex;">
|
||||
<span style="margin-left: 5px;">
|
||||
变焦
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<!-- <a-button :disabled="formData.zoom<=1" preIcon="ant-design:zoom-out-outlined" @click="zoomInOut('out')" title="缩小"></a-button>-->
|
||||
<a-button preIcon="ant-design:zoom-out-outlined" @click="zoomInOut('out')" title="缩小"></a-button>
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<!-- <a-button :disabled="formData.zoom>=4" preIcon="ant-design:zoom-in-outlined" @click="zoomInOut('in')" title="放大"></a-button>-->
|
||||
<a-button preIcon="ant-design:zoom-in-outlined" @click="zoomInOut('in')" title="放大"></a-button>
|
||||
</span>
|
||||
<!-- <span style="margin-left: 5px;width: 60%">
|
||||
<a-slider v-model:value="formData.zoom" :min="1.0" :max="4.0" :step="0.2" :marks="{1:1.0,2:2.0,3:3.0,4:4.0}" @afterChange="(value) => changeZoom(value)" />
|
||||
</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<a-input-number v-model:value="formData.zoom" :min="1" :max="4" @change="(value) => changeZoom(value)" :disabled="true"/>
|
||||
</span>-->
|
||||
</a-col>
|
||||
</a-col>
|
||||
</a-col>
|
||||
<!-- <a-col :span="4">
|
||||
<table style="width: 102px">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td><a-button preIcon="ant-design:caret-up-outlined" @mousedown="moveCtrl(1,1)" @mouseup="moveCtrl(1,0)"></a-button></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a-button preIcon="ant-design:caret-left-outlined" @mousedown="moveCtrl(3,1)" @mouseup="moveCtrl(3,0)"></a-button></td>
|
||||
<td><a-button preIcon="ant-design:compress-outlined"></a-button></td>
|
||||
<td><a-button preIcon="ant-design:caret-right-outlined" @mousedown="moveCtrl(5,1)" @mouseup="moveCtrl(5,0)"></a-button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td><a-button preIcon="ant-design:caret-down-outlined" @mousedown="moveCtrl(7,1)" @mouseup="moveCtrl(7,0)"></a-button></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</a-col>-->
|
||||
</a-row>
|
||||
</a-spin>
|
||||
</template>
|
||||
|
|
@ -76,7 +120,8 @@
|
|||
getMultitransUrl,
|
||||
getPreviewUrl,
|
||||
setImageCommon,
|
||||
testAudio
|
||||
testAudio,
|
||||
motionCtrl
|
||||
} from "../camera.api";
|
||||
|
||||
const props = defineProps({
|
||||
|
|
@ -108,7 +153,8 @@
|
|||
wssUrl: '',//用于建立wss接传输视频帧信息
|
||||
|
||||
flip_type: '',//画面镜像旋转： "off"//关闭 "left_and_right"//左右 "up_and_down"//上下 "center"//中心
|
||||
|
||||
zoom: 1, //变焦
|
||||
sliderValue : 1,//滑动条的值
|
||||
});
|
||||
const { createMessage } = useMessage();
|
||||
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
|
||||
|
|
@ -328,6 +374,78 @@
|
|||
izPhone.value = false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 缩放
|
||||
*/
|
||||
function zoomInOut(type){
|
||||
let delayTime = 6000;
|
||||
if(type == 'in'){
|
||||
formData.zoom = formData.zoom+0.4;
|
||||
if(formData.zoom > 4){
|
||||
formData.zoom = 4;
|
||||
}
|
||||
formData.sliderValue = formData.zoom;
|
||||
moveCtrl(10,1,1);
|
||||
if(formData.sliderValue<=2){
|
||||
delayTime = 0.4*6000;
|
||||
}else{
|
||||
delayTime = 0.2*6000;
|
||||
}
|
||||
delayExecute(moveCtrl,[10,0,1],delayTime);
|
||||
}else{
|
||||
formData.zoom = formData.zoom-0.4;
|
||||
if(formData.zoom < 1){
|
||||
formData.zoom = 1;
|
||||
}
|
||||
formData.sliderValue = formData.zoom;
|
||||
moveCtrl(9,1,1);
|
||||
if(formData.sliderValue<=2){
|
||||
delayTime = 0.4*6000;
|
||||
}else{
|
||||
delayTime = 0.2*6000;
|
||||
}
|
||||
delayExecute(moveCtrl,[9,0,1],delayTime);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 变焦
|
||||
*/
|
||||
function changeZoom(value){
|
||||
if(formData.sliderValue <= value){
|
||||
moveCtrl(10,1,1);
|
||||
let delayTime = value - formData.sliderValue;
|
||||
formData.sliderValue = value;
|
||||
delayExecute(moveCtrl,[10,0,1],delayTime*4500);
|
||||
}else{
|
||||
moveCtrl(9,1,1);
|
||||
let delayTime = formData.sliderValue - value;
|
||||
formData.sliderValue = value;
|
||||
delayExecute(moveCtrl,[9,0,1],delayTime*4500);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 控制球机
|
||||
*/
|
||||
function moveCtrl(direction,startOrNot,speed){
|
||||
let params = {
|
||||
"deviceIndex": formData.deviceIndex,
|
||||
"direction": direction,
|
||||
"startOrNot": startOrNot,
|
||||
"speed": speed,
|
||||
};
|
||||
motionCtrl(params);
|
||||
}
|
||||
|
||||
function delayExecute(fn, args, delay) {
|
||||
setTimeout(() => {
|
||||
fn.apply(this,args) // 使用apply传递参数数组
|
||||
}, delay)
|
||||
}
|
||||
|
||||
/**
|
||||
* 销毁
|
||||
*/
|
||||
|
|
@ -335,6 +453,7 @@
|
|||
if (player){
|
||||
player.value.destroy().then(() => {
|
||||
}); // 销毁
|
||||
player.value = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -354,4 +473,35 @@
|
|||
height: 500px;
|
||||
background: #1a1a1a;
|
||||
}
|
||||
|
||||
.ant-input-number {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
tbody {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
tr {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
td {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
td button{
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
border-color:white;
|
||||
}
|
||||
|
||||
td button:hover{
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
border-color:white !important;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭" :bodyStyle="bodyStyle">
|
||||
<CameraPreviewForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CameraPreviewForm>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
|
@ -15,6 +15,10 @@
|
|||
const disableSubmit = ref<boolean>(false);
|
||||
const registerForm = ref();
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
const bodyStyle = ref<any>({
|
||||
'height': 'auto',
|
||||
'overflow-y': 'auto',
|
||||
});
|
||||
|
||||
// const player = ref();
|
||||
|
||||
|
|
@ -63,5 +67,11 @@
|
|||
.jee-hidden {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.ant-modal-body {
|
||||
height: auto !important;
|
||||
overflow: hidden !important;
|
||||
}
|
||||
|
||||
</style>
|
||||
<style lang="less" scoped></style>
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ import {ref, reactive, createVNode, h, onMounted, watch, unref} from 'vue';
|
|||
function handlePlayback(record: Recordable) {
|
||||
record.scale = props.data.scale;
|
||||
record.multitrans = props.data.multitrans;
|
||||
console.log(record.multitrans);
|
||||
if(record.multitrans=="1"){
|
||||
multitransModal.value.disableSubmit = true;
|
||||
multitransModal.value.edit(record);
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@ import { defHttp } from '/@/utils/http/axios';
|
|||
import {Modal} from "ant-design-vue";
|
||||
|
||||
enum Api {
|
||||
queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync',
|
||||
queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync',
|
||||
queryTreeList = '/iot/cameraInfo/queryTreeList',
|
||||
getStorageDevice = '/iot/cameraInfo/getStorageDevice',
|
||||
getAllRecordPlans = '/iot/cameraInfo/getAllRecordPlans',
|
||||
getRecordCfgs = '/iot/cameraInfo/getRecordCfgs',
|
||||
addRecordCfgs = '/iot/cameraInfo/addRecordCfgs',
|
||||
setRecordCfgs = '/iot/cameraInfo/setRecordCfgs',
|
||||
delRecordCfgs = '/iot/cameraInfo/delRecordCfgs',
|
||||
getBatchProgress = '/iot/cameraInfo/getBatchProgress',
|
||||
queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync',
|
||||
queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync',
|
||||
queryTreeList = '/iot/tplink/cameraInfo/queryTreeList',
|
||||
getStorageDevice = '/iot/tplink/cameraInfo/getStorageDevice',
|
||||
getAllRecordPlans = '/iot/tplink/cameraInfo/getAllRecordPlans',
|
||||
getRecordCfgs = '/iot/tplink/cameraInfo/getRecordCfgs',
|
||||
addRecordCfgs = '/iot/tplink/cameraInfo/addRecordCfgs',
|
||||
setRecordCfgs = '/iot/tplink/cameraInfo/setRecordCfgs',
|
||||
delRecordCfgs = '/iot/tplink/cameraInfo/delRecordCfgs',
|
||||
getBatchProgress = '/iot/tplink/cameraInfo/getBatchProgress',
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
enum Api {
|
||||
list = '/iot/projectInfo/list',
|
||||
sync = '/iot/projectInfo/sync',
|
||||
add = '/iot/projectInfo/add',
|
||||
edit = '/iot/projectInfo/edit',
|
||||
delete = '/iot/projectInfo/delete',
|
||||
list = '/iot/tplink/projectInfo/list',
|
||||
sync = '/iot/tplink/projectInfo/sync',
|
||||
add = '/iot/tplink/projectInfo/add',
|
||||
edit = '/iot/tplink/projectInfo/edit',
|
||||
delete = '/iot/tplink/projectInfo/delete',
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
enum Api {
|
||||
queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync',
|
||||
queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync',
|
||||
syncProject = '/iot/projectInfo/sync',
|
||||
syncRegion = '/iot/regionInfo/sync',
|
||||
syncRegionChildren = '/iot/regionInfo/syncChildren',
|
||||
list = '/iot/regionInfo/list',
|
||||
sync = '/iot/regionInfo/sync',
|
||||
add = '/iot/regionInfo/add',
|
||||
edit = '/iot/regionInfo/edit',
|
||||
delete = '/iot/regionInfo/delete',
|
||||
queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync',
|
||||
queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync',
|
||||
syncProject = '/iot/tplink/projectInfo/sync',
|
||||
syncRegion = '/iot/tplink/regionInfo/sync',
|
||||
syncRegionChildren = '/iot/tplink/regionInfo/syncChildren',
|
||||
list = '/iot/tplink/regionInfo/list',
|
||||
sync = '/iot/tplink/regionInfo/sync',
|
||||
add = '/iot/tplink/regionInfo/add',
|
||||
edit = '/iot/tplink/regionInfo/edit',
|
||||
delete = '/iot/tplink/regionInfo/delete',
|
||||
queryChildrenByParentId = '/sys/sysDepart/queryChildrenByParentId',
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
|||
const { createConfirm } = useMessage();
|
||||
|
||||
enum Api {
|
||||
list = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/list',
|
||||
save='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/add',
|
||||
edit='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/edit',
|
||||
deleteOne = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/delete',
|
||||
deleteBatch = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/deleteBatch',
|
||||
importExcel = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/importExcel',
|
||||
exportXls = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/exportXls',
|
||||
list = '/iot/tq/apiRequestLog/list',
|
||||
save='/iot/tq/apiRequestLog/add',
|
||||
edit='/iot/tq/apiRequestLog/edit',
|
||||
deleteOne = '/iot/tq/apiRequestLog/delete',
|
||||
deleteBatch = '/iot/tq/apiRequestLog/deleteBatch',
|
||||
importExcel = '/iot/tq/apiRequestLog/importExcel',
|
||||
exportXls = '/iot/tq/apiRequestLog/exportXls',
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -40,18 +40,18 @@
|
|||
</template>
|
||||
</BasicTable>
|
||||
<!-- 表单区域 -->
|
||||
<NuIotTqApiRequestLogModal ref="registerModal" @success="handleSuccess"></NuIotTqApiRequestLogModal>
|
||||
<ApiRequestLogModal ref="registerModal" @success="handleSuccess"></ApiRequestLogModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="nuIotTqApiRequestLog-nuIotTqApiRequestLog" setup>
|
||||
<script lang="ts" name="ApiRequestLog-ApiRequestLog" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { columns, superQuerySchema } from './NuIotTqApiRequestLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqApiRequestLog.api';
|
||||
import { columns, superQuerySchema } from './ApiRequestLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ApiRequestLog.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import NuIotTqApiRequestLogModal from './components/NuIotTqApiRequestLogModal.vue'
|
||||
import ApiRequestLogModal from './components/ApiRequestLogModal.vue'
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
{
|
||||
label: '编辑',
|
||||
onClick: handleEdit.bind(null, record),
|
||||
auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit'
|
||||
auth: 'ApiRequestLog:nu_iot_tq_api_request_log:edit'
|
||||
},
|
||||
];
|
||||
}
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
confirm: handleDelete.bind(null, record),
|
||||
placement: 'topLeft',
|
||||
},
|
||||
auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:delete'
|
||||
auth: 'ApiRequestLog:nu_iot_tq_api_request_log:delete'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -2,55 +2,55 @@
|
|||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuIotTqApiRequestLogForm">
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ApiRequestLogForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="设备号" v-bind="validateInfos.address" id="NuIotTqApiRequestLogForm-address" name="address">
|
||||
<a-form-item label="设备号" v-bind="validateInfos.address" id="ApiRequestLogForm-address" name="address">
|
||||
<a-input v-model:value="formData.address" placeholder="请输入设备号" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="类型" v-bind="validateInfos.type" id="NuIotTqApiRequestLogForm-type" name="type">
|
||||
<a-form-item label="类型" v-bind="validateInfos.type" id="ApiRequestLogForm-type" name="type">
|
||||
<j-dict-select-tag v-model:value="formData.type" dictCode="dbsb_type" placeholder="请选择类型" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="请求时的值" v-bind="validateInfos.requestValue" id="NuIotTqApiRequestLogForm-requestValue" name="requestValue">
|
||||
<a-form-item label="请求时的值" v-bind="validateInfos.requestValue" id="ApiRequestLogForm-requestValue" name="requestValue">
|
||||
<a-input v-model:value="formData.requestValue" placeholder="请输入请求时的值" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="请求时间" v-bind="validateInfos.requestTime" id="NuIotTqApiRequestLogForm-requestTime" name="requestTime">
|
||||
<a-form-item label="请求时间" v-bind="validateInfos.requestTime" id="ApiRequestLogForm-requestTime" name="requestTime">
|
||||
<a-input v-model:value="formData.requestTime" placeholder="请输入请求时间" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="请求状态" v-bind="validateInfos.requestStatus" id="NuIotTqApiRequestLogForm-requestStatus" name="requestStatus">
|
||||
<a-form-item label="请求状态" v-bind="validateInfos.requestStatus" id="ApiRequestLogForm-requestStatus" name="requestStatus">
|
||||
<j-dict-select-tag v-model:value="formData.requestStatus" dictCode="" placeholder="请选择请求状态" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="请求描述" v-bind="validateInfos.requestRemark" id="NuIotTqApiRequestLogForm-requestRemark" name="requestRemark">
|
||||
<a-form-item label="请求描述" v-bind="validateInfos.requestRemark" id="ApiRequestLogForm-requestRemark" name="requestRemark">
|
||||
<a-input v-model:value="formData.requestRemark" placeholder="请输入请求描述" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="反馈值" v-bind="validateInfos.resolveValue" id="NuIotTqApiRequestLogForm-resolveValue" name="resolveValue">
|
||||
<a-form-item label="反馈值" v-bind="validateInfos.resolveValue" id="ApiRequestLogForm-resolveValue" name="resolveValue">
|
||||
<a-input v-model:value="formData.resolveValue" placeholder="请输入反馈值" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="反馈时间" v-bind="validateInfos.resolveTime" id="NuIotTqApiRequestLogForm-resolveTime" name="resolveTime">
|
||||
<a-form-item label="反馈时间" v-bind="validateInfos.resolveTime" id="ApiRequestLogForm-resolveTime" name="resolveTime">
|
||||
<a-input v-model:value="formData.resolveTime" placeholder="请输入反馈时间" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="反馈状态" v-bind="validateInfos.resolveStatus" id="NuIotTqApiRequestLogForm-resolveStatus" name="resolveStatus">
|
||||
<a-form-item label="反馈状态" v-bind="validateInfos.resolveStatus" id="ApiRequestLogForm-resolveStatus" name="resolveStatus">
|
||||
<j-dict-select-tag v-model:value="formData.resolveStatus" dictCode="dbsb_status" placeholder="请选择反馈状态" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="反馈描述" v-bind="validateInfos.resolveRemark" id="NuIotTqApiRequestLogForm-resolveRemark" name="resolveRemark">
|
||||
<a-form-item label="反馈描述" v-bind="validateInfos.resolveRemark" id="ApiRequestLogForm-resolveRemark" name="resolveRemark">
|
||||
<a-input v-model:value="formData.resolveRemark" placeholder="请输入反馈描述" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import { getValueType } from '/@/utils';
|
||||
import { saveOrUpdate } from '../NuIotTqApiRequestLog.api';
|
||||
import { saveOrUpdate } from '../ApiRequestLog.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
const props = defineProps({
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
<template>
|
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<NuIotTqApiRequestLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIotTqApiRequestLogForm>
|
||||
<ApiRequestLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiRequestLogForm>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import NuIotTqApiRequestLogForm from './NuIotTqApiRequestLogForm.vue'
|
||||
import ApiRequestLogForm from './ApiRequestLogForm.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
|
|
@ -43,14 +43,14 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="nuIotTqElectricitySyncLog-nuIotTqElectricitySyncLog" setup>
|
||||
<script lang="ts" name="ElectricitySyncLog-ElectricitySyncLog" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { columns, superQuerySchema } from './NuIotTqElectricitySyncLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqElectricitySyncLog.api';
|
||||
import { columns, superQuerySchema } from './ElectricitySyncLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElectricitySyncLog.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import NuIotTqElectricitySyncLogModal from './components/NuIotTqElectricitySyncLogModal.vue'
|
||||
import ElectricitySyncLogModal from './components/ElectricitySyncLogModal.vue'
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
<template>
|
||||
<j-modal :title="title" width="80%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<NuIotTqElectricitySyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIotTqElectricitySyncLogList>
|
||||
<DeviceSyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DeviceSyncLogList>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import NuIotTqElectricitySyncLogList from './NuIotTqElectricitySyncLogList.vue'
|
||||
import DeviceSyncLogList from './DeviceSyncLogList.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
|||
const { createConfirm } = useMessage();
|
||||
|
||||
enum Api {
|
||||
list = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/list',
|
||||
save='/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/add',
|
||||
edit='/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/edit',
|
||||
deleteOne = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/delete',
|
||||
deleteBatch = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/deleteBatch',
|
||||
importExcel = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/importExcel',
|
||||
exportXls = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/exportXls',
|
||||
list = '/iot/syncLog/list',
|
||||
save='/iot/syncLog/add',
|
||||
edit='/iot/syncLog/edit',
|
||||
deleteOne = '/iot/syncLog/delete',
|
||||
deleteBatch = '/iot/syncLog/deleteBatch',
|
||||
importExcel = '/iot/syncLog/importExcel',
|
||||
exportXls = '/iot/syncLog/exportXls',
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -43,14 +43,14 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="nuIotTqElectricitySyncLog-nuIotTqElectricitySyncLog" setup>
|
||||
<script lang="ts" name="ElectricitySyncLog-ElectricitySyncLog" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { columns, superQuerySchema } from './NuIotTqElectricitySyncLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqElectricitySyncLog.api';
|
||||
import { columns, superQuerySchema } from './ElectricitySyncLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElectricitySyncLog.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import NuIotTqElectricitySyncLogModal from './components/NuIotTqElectricitySyncLogModal.vue'
|
||||
import ElectricitySyncLogModal from './components/ElectricitySyncLogModal.vue'
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
<template>
|
||||
<j-modal :title="title" width="80%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<HumidDeviceSyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></HumidDeviceSyncLogList>
|
||||
<ElectricitySyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ElectricitySyncLogList>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import HumidDeviceSyncLogList from './HumidDeviceSyncLogList.vue'
|
||||
import ElectricitySyncLogList from './ElectricitySyncLogList.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
|
|
@ -43,14 +43,14 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="nuIotTqElectricitySyncLog-nuIotTqElectricitySyncLog" setup>
|
||||
<script lang="ts" name="ElectricitySyncLog-ElectricitySyncLog" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { columns, superQuerySchema } from './NuIotTqElectricitySyncLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqElectricitySyncLog.api';
|
||||
import { columns, superQuerySchema } from './ElectricitySyncLog.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElectricitySyncLog.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import NuIotTqElectricitySyncLogModal from './components/NuIotTqElectricitySyncLogModal.vue'
|
||||
import ElectricitySyncLogModal from './components/ElectricitySyncLogModal.vue'
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
|
|
@ -2,45 +2,45 @@
|
|||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuIotTqElectricitySyncLogForm">
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ElectricitySyncLogForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="主表名称" v-bind="validateInfos.mainName" id="NuIotTqElectricitySyncLogForm-mainName" name="mainName">
|
||||
<a-form-item label="主表名称" v-bind="validateInfos.mainName" id="ElectricitySyncLogForm-mainName" name="mainName">
|
||||
<a-input v-model:value="formData.mainName" placeholder="请输入主表名称" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="同步类型" v-bind="validateInfos.syncType" id="NuIotTqElectricitySyncLogForm-syncType" name="syncType">
|
||||
<a-form-item label="同步类型" v-bind="validateInfos.syncType" id="ElectricitySyncLogForm-syncType" name="syncType">
|
||||
<a-input v-model:value="formData.syncType" placeholder="请输入同步类型" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="原机构名称" v-bind="validateInfos.orgName" id="NuIotTqElectricitySyncLogForm-orgName" name="orgName">
|
||||
<a-form-item label="原机构名称" v-bind="validateInfos.orgName" id="ElectricitySyncLogForm-orgName" name="orgName">
|
||||
<a-input v-model:value="formData.orgName" placeholder="请输入原机构名称" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="原机构编码" v-bind="validateInfos.orgCode" id="NuIotTqElectricitySyncLogForm-orgCode" name="orgCode">
|
||||
<a-form-item label="原机构编码" v-bind="validateInfos.orgCode" id="ElectricitySyncLogForm-orgCode" name="orgCode">
|
||||
<a-input v-model:value="formData.orgCode" placeholder="请输入原机构编码" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="新机构名称" v-bind="validateInfos.newOrgName" id="NuIotTqElectricitySyncLogForm-newOrgName" name="newOrgName">
|
||||
<a-form-item label="新机构名称" v-bind="validateInfos.newOrgName" id="ElectricitySyncLogForm-newOrgName" name="newOrgName">
|
||||
<a-input v-model:value="formData.newOrgName" placeholder="请输入新机构名称" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="新机构编码" v-bind="validateInfos.newOrgCode" id="NuIotTqElectricitySyncLogForm-newOrgCode" name="newOrgCode">
|
||||
<a-form-item label="新机构编码" v-bind="validateInfos.newOrgCode" id="ElectricitySyncLogForm-newOrgCode" name="newOrgCode">
|
||||
<a-input v-model:value="formData.newOrgCode" placeholder="请输入新机构编码" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="状态" v-bind="validateInfos.status" id="NuIotTqElectricitySyncLogForm-status" name="status">
|
||||
<a-form-item label="状态" v-bind="validateInfos.status" id="ElectricitySyncLogForm-status" name="status">
|
||||
<a-input v-model:value="formData.status" placeholder="请输入状态" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="备注" v-bind="validateInfos.content" id="NuIotTqElectricitySyncLogForm-content" name="content">
|
||||
<a-form-item label="备注" v-bind="validateInfos.content" id="ElectricitySyncLogForm-content" name="content">
|
||||
<a-input v-model:value="formData.content" placeholder="请输入备注" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { getValueType } from '/@/utils';
|
||||
import { saveOrUpdate } from '../NuIotTqElectricitySyncLog.api';
|
||||
import { saveOrUpdate } from '../ElectricitySyncLog.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
const props = defineProps({
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
<template>
|
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<NuIotTqElectricitySyncLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIotTqElectricitySyncLogForm>
|
||||
<ElectricitySyncLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ElectricitySyncLogForm>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import NuIotTqElectricitySyncLogForm from './NuIotTqElectricitySyncLogForm.vue'
|
||||
import ElectricitySyncLogForm from './ElectricitySyncLogForm.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
<div class="p-2">
|
||||
<a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
|
||||
<a-tab-pane key="3" tab="抄表" >
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal3"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="9" tab="清零" force-render>
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal9"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal9"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="10" tab="电表拉闸" force-render>
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal10"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal10"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="11" tab="电表合闸" force-render>
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal11"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal11"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
</div>
|
||||
|
|
@ -20,14 +20,14 @@
|
|||
<script lang="ts" name="departUtils-sysDepart" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
|
||||
import NuIotTqApiRequestLogList from '/@/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue';
|
||||
import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
|
||||
|
||||
const activeKey= ref('3');
|
||||
const dbsbInfo = ref<any>({});
|
||||
const nuIotTqApiRequestLogListModal9 = ref();
|
||||
const nuIotTqApiRequestLogListModal3 = ref();
|
||||
const nuIotTqApiRequestLogListModal10 = ref();
|
||||
const nuIotTqApiRequestLogListModal11 = ref();
|
||||
const ApiRequestLogListModal9 = ref();
|
||||
const ApiRequestLogListModal3 = ref();
|
||||
const ApiRequestLogListModal10 = ref();
|
||||
const ApiRequestLogListModal11 = ref();
|
||||
function initLog(record){
|
||||
activeKey.value = "3";
|
||||
getDataList(activeKey.value, record);
|
||||
|
|
@ -41,13 +41,13 @@ const nuIotTqApiRequestLogListModal11 = ref();
|
|||
cid: record.cid
|
||||
}
|
||||
if(type == '9'){
|
||||
nuIotTqApiRequestLogListModal9.value.init(params);
|
||||
ApiRequestLogListModal9.value.init(params);
|
||||
}else if(type == '3'){
|
||||
nuIotTqApiRequestLogListModal3.value.init(params);
|
||||
ApiRequestLogListModal3.value.init(params);
|
||||
}else if(type == '10'){
|
||||
nuIotTqApiRequestLogListModal10.value.init(params);
|
||||
ApiRequestLogListModal10.value.init(params);
|
||||
}else if(type == '11'){
|
||||
nuIotTqApiRequestLogListModal11.value.init(params);
|
||||
ApiRequestLogListModal11.value.init(params);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
<div class="p-2">
|
||||
<a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
|
||||
<a-tab-pane key="42" tab="抄表" >
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal42"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal42"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="49" tab="清零" force-render>
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal49"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal49"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="43" tab="开阀" force-render>
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal43"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal43"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="53" tab="关阀" force-render>
|
||||
<NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal43"></NuIotTqApiRequestLogList>
|
||||
<ApiRequestLogList ref="ApiRequestLogListModal43"></ApiRequestLogList>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
</div>
|
||||
|
|
@ -20,14 +20,14 @@
|
|||
<script lang="ts" name="departUtils-sysDepart" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
|
||||
import NuIotTqApiRequestLogList from '/@/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue';
|
||||
import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
|
||||
|
||||
const activeKey= ref('42');
|
||||
const dbsbInfo = ref<any>({});
|
||||
const nuIotTqApiRequestLogListModal42 = ref();
|
||||
const nuIotTqApiRequestLogListModal43 = ref();
|
||||
const nuIotTqApiRequestLogListModal49 = ref();
|
||||
const nuIotTqApiRequestLogListModal53 = ref();
|
||||
const ApiRequestLogListModal42 = ref();
|
||||
const ApiRequestLogListModal43 = ref();
|
||||
const ApiRequestLogListModal49 = ref();
|
||||
const ApiRequestLogListModal53 = ref();
|
||||
function initLog(record){
|
||||
activeKey.value = "42";
|
||||
getDataList(activeKey.value, record);
|
||||
|
|
@ -41,13 +41,13 @@ const nuIotTqApiRequestLogListModal53 = ref();
|
|||
cid: record.cid
|
||||
}
|
||||
if(type == '42'){
|
||||
nuIotTqApiRequestLogListModal42.value.init(params);
|
||||
ApiRequestLogListModal42.value.init(params);
|
||||
}else if(type == '43'){
|
||||
nuIotTqApiRequestLogListModal43.value.init(params);
|
||||
ApiRequestLogListModal43.value.init(params);
|
||||
}else if(type == '49'){
|
||||
nuIotTqApiRequestLogListModal49.value.init(params);
|
||||
ApiRequestLogListModal49.value.init(params);
|
||||
}else if(type == '53'){
|
||||
nuIotTqApiRequestLogListModal53.value.init(params);
|
||||
ApiRequestLogListModal53.value.init(params);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
</BasicTable>
|
||||
<HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
|
||||
<ApiLogModal ref="apiLogModal"></ApiLogModal>
|
||||
<NuIotTqElectricitySyncLogListModal ref="syncLogModal"></NuIotTqElectricitySyncLogListModal>
|
||||
<ElectricitySyncLogListModal ref="syncLogModal"></ElectricitySyncLogListModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
|
||||
import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
|
||||
import ApiLogModal from "@/views/iot/tq/electricity/apilog/ApiLogModal.vue";
|
||||
import NuIotTqElectricitySyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue";
|
||||
import ElectricitySyncLogListModal from "/@/views/iot/tq/SyncLog/ElectricitySyncLogListModal.vue";
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
const queryParam = reactive<any>({});
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
import { defHttp } from '/@/utils/http/axios';
|
||||
import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
|
||||
import ApiLogModal from "@/views/iot/tq/electricity/apilog/WaterApiLogModal.vue";
|
||||
import SyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogListModal.vue";
|
||||
import SyncLogListModal from "/@/views/iot/tq/SyncLog/WaterSyncLogListModal.vue";
|
||||
|
||||
const queryParam = reactive<any>({});
|
||||
const apiLogModal = ref();
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<DeviceInfoDrawer @register="registerDrawer" @success="handleSuccess" />
|
||||
<ApiLogAlarmModal ref="apiLogAlarmModal"></ApiLogAlarmModal>
|
||||
<HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
|
||||
<HumidDeviceSyncLogListModal ref="syncLogModal"></HumidDeviceSyncLogListModal>
|
||||
<DeviceSyncLogListModal ref="syncLogModal"></DeviceSyncLogListModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
import {useDrawer} from "@/components/Drawer";
|
||||
import ApiLogAlarmModal from './components/ApiLogAlarmModal.vue'
|
||||
import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
|
||||
import HumidDeviceSyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue";
|
||||
import DeviceSyncLogListModal from "/@/views/iot/tq/SyncLog/DeviceSyncLogListModal.vue";
|
||||
import DeviceInfoDrawer from "./components/DeviceInfoDrawer.vue";
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
const apiLogAlarmModal = ref();
|
||||
|
|
|
|||
Loading…
Reference in New Issue