From bdac1a6090c960de838ba96dd1101cb1b36443b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 9 Jul 2025 08:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E9=9B=86=E6=88=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iot/tplink/camera/camera.api.ts | 8 +- src/views/iot/tplink/camera/camera.data.ts | 200 +++++++++++------- .../camera/components/CameraPictureConfig.vue | 24 ++- .../components/CameraPictureConfigModal.vue | 66 ++++++ src/views/iot/tplink/camera/index.vue | 184 ++++++++++++++++ .../tplink/plan/components/PlanAddForm.vue | 4 +- .../tplink/plan/components/PlanAddTree.vue | 4 +- src/views/iot/tplink/plan/index.vue | 179 ++++++++++++++++ .../iot/tq/electricity/electricity.data.ts | 80 +++---- src/views/iot/tq/electricity/index.vue | 25 ++- src/views/iot/tq/water/index.vue | 8 +- src/views/iot/tq/water/water.data.ts | 80 +++---- src/views/iot/yiweilian/humid.data.ts | 101 ++++----- src/views/iot/yiweilian/index.vue | 8 +- .../depart/components/TplinkUserTab.vue | 102 --------- src/views/system/depart/depart.api.ts | 11 - src/views/system/depart/depart.data.ts | 95 --------- src/views/system/depart/index.vue | 6 - 18 files changed, 735 insertions(+), 450 deletions(-) create mode 100644 src/views/iot/tplink/camera/components/CameraPictureConfigModal.vue delete mode 100644 src/views/system/depart/components/TplinkUserTab.vue diff --git a/src/views/iot/tplink/camera/camera.api.ts b/src/views/iot/tplink/camera/camera.api.ts index 3a7bc03..7ae9b63 100644 --- a/src/views/iot/tplink/camera/camera.api.ts +++ b/src/views/iot/tplink/camera/camera.api.ts @@ -7,6 +7,7 @@ enum Api { syncRegion = '/iot/tplink/regionInfo/sync', list = '/iot/tplink/cameraInfo/list', syncProjectIpcDevice = '/iot/tplink/cameraInfo/syncProjectIpcDevice', + syncAllDevices = '/iot/tplink/cameraInfo/syncAllDevices', ipcCapability = '/iot/tplink/cameraInfo/getIpcCapability', nuList = '/iot/tplink/cameraInfo/nuList', edit = '/iot/tplink/cameraInfo/edit', @@ -74,13 +75,18 @@ 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 }); +/** + * 所有摄像头设备 + * @param params + */ +export const syncAllDevices = (params) => defHttp.get({ url: Api.syncAllDevices, params }); + /** * 获取IPC能力集 * @param params diff --git a/src/views/iot/tplink/camera/camera.data.ts b/src/views/iot/tplink/camera/camera.data.ts index b796eb1..d6b3921 100644 --- a/src/views/iot/tplink/camera/camera.data.ts +++ b/src/views/iot/tplink/camera/camera.data.ts @@ -24,46 +24,71 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'deviceModel' }, - { - title: 'IP地址', - align: "center", - dataIndex: 'ip' - }, - { - title: 'MAC地址', - align: "center", - dataIndex: 'mac' - }, - { - title: '区域名称', - align: "center", - dataIndex: 'regionName' - }, - { - title: '父设备名称', - align: "center", - dataIndex: 'parentDeviceName' - }, - { - title: '项目名称', - align: "center", - dataIndex: 'projectName' - }, - { - title: '位置名称', - align: "center", - dataIndex: 'locationName' - }, - { - title: '护理单元', - align: "center", - dataIndex: 'nuId_dictText', - }, + // { + // title: 'IP地址', + // align: "center", + // dataIndex: 'ip' + // }, + // { + // title: 'MAC地址', + // align: "center", + // dataIndex: 'mac' + // }, + // { + // title: '区域名称', + // align: "center", + // dataIndex: 'regionName' + // }, + // { + // title: '父设备名称', + // align: "center", + // dataIndex: 'parentDeviceName' + // }, + // { + // title: '项目名称', + // align: "center", + // dataIndex: 'projectName' + // }, + // { + // title: '位置名称', + // align: "center", + // dataIndex: 'locationName' + // }, + // { + // title: '护理单元', + // align: "center", + // dataIndex: 'nuId_dictText', + // }, // { // title: '护理单元', // align: "center", // dataIndex: 'nuName' // }, + { + title: 'FTP地址', + align: "center", + dataIndex: 'ftpIp' + }, + { + title: 'FTP端口', + align: "center", + dataIndex: 'ftpPort' + }, + { + title: 'FTP用户', + align: "center", + dataIndex: 'ftpUsername' + }, + { + title: 'FTP密码', + align: "center", + dataIndex: 'ftpPassword' + }, + { + title: 'FTP上传路径', + align: "center", + dataIndex: 'ftpUploadpath' + }, ]; export const formSchema: FormSchema[] = [ @@ -103,63 +128,82 @@ export const formSchema: FormSchema[] = [ component: 'Input', dynamicDisabled: true }, + // { + // label: 'IP地址', + // field: 'ip', + // component: 'Input', + // dynamicDisabled: true + // }, + // { + // label: 'MAC地址', + // field: 'mac', + // component: 'Input', + // dynamicDisabled: true + // }, + // { + // label: '区域名称', + // field: 'regionName', + // component: 'Input', + // dynamicDisabled: true + // }, + // { + // label: '父设备名称', + // field: 'parentDeviceName', + // component: 'Input', + // dynamicDisabled: true + // }, + // { + // label: '项目ID', + // field: 'projectId', + // component: 'Input', + // show: false, + // }, + // { + // label: '项目名称', + // field: 'projectName', + // component: 'Input', + // dynamicDisabled: true + // }, + // { + // label: '位置名称', + // field: 'locationName', + // component: 'Input', + // dynamicDisabled: true + // }, + // { + // label: '护理单元', + // field: 'nuId', + // component: 'JSelectNu', + // componentProps: { + // rowKey: 'nuId', + // labelKey: 'nuName', + // selectType: true, + // }, + // }, { - label: 'IP地址', - field: 'ip', + label: 'FTP地址', + field: 'ftpIp', component: 'Input', - dynamicDisabled: true }, { - label: 'MAC地址', - field: 'mac', + label: 'FTP端口', + field: 'ftpPort', component: 'Input', - dynamicDisabled: true }, { - label: '区域名称', - field: 'regionName', + label: 'FTP用户', + field: 'ftpUsername', component: 'Input', - dynamicDisabled: true }, { - label: '父设备名称', - field: 'parentDeviceName', + label: 'FTP密码', + field: 'ftpPassword', component: 'Input', - dynamicDisabled: true }, { - label: '项目ID', - field: 'projectId', + label: 'FTP上传路径', + field: 'ftpUploadpath', component: 'Input', - show: false, - }, - { - label: '项目名称', - field: 'projectName', - component: 'Input', - dynamicDisabled: true - }, - { - label: '位置名称', - field: 'locationName', - component: 'Input', - dynamicDisabled: true - }, - { - label: '护理单元', - field: 'nuId', - component: 'JSelectNu', - componentProps: { - rowKey: 'nuId', - labelKey: 'nuName', - selectType: true, - }, - }, - { - label: '设备重启', - field: 'id', - component: 'Input', - slot: 'customInput', } ]; diff --git a/src/views/iot/tplink/camera/components/CameraPictureConfig.vue b/src/views/iot/tplink/camera/components/CameraPictureConfig.vue index dbf0ce8..9efabd1 100644 --- a/src/views/iot/tplink/camera/components/CameraPictureConfig.vue +++ b/src/views/iot/tplink/camera/components/CameraPictureConfig.vue @@ -185,7 +185,7 @@ import {ref, onMounted, reactive, onUnmounted} from "vue"; // getBatchProgress({}).then(res=>{}); // } - onMounted(()=>{ + /*onMounted(()=>{ console.log(router.currentRoute.value.query); formData.deviceIndex = router.currentRoute.value.query.deviceIndex; formData.parentId = router.currentRoute.value.query.parentId; @@ -201,11 +201,31 @@ import {ref, onMounted, reactive, onUnmounted} from "vue"; cameraData.value.scale = formData.scale; cameraData.value.parentId = formData.parentId; console.log(cameraData); - }) + })*/ // onUnmounted(()=>{ // // }) +function edit(record) { + formData.deviceIndex = record.deviceIndex; + formData.parentId = record.parentId; + formData.multitrans = record.multitrans; + formData.projectId = record.projectId; + formData.regionId = record.regionId; + formData.ip = record.ip; + + cameraData.value.deviceIndex = formData.deviceIndex; + cameraData.value.projectId = formData.projectId; + cameraData.value.regionId = formData.regionId; + cameraData.value.multitrans = formData.multitrans; + cameraData.value.scale = formData.scale; + cameraData.value.parentId = formData.parentId; +} + +defineExpose({ + edit, +}); + + diff --git a/src/views/iot/tplink/camera/index.vue b/src/views/iot/tplink/camera/index.vue index c19471b..272f745 100644 --- a/src/views/iot/tplink/camera/index.vue +++ b/src/views/iot/tplink/camera/index.vue @@ -1,3 +1,4 @@ + + + + + + + diff --git a/src/views/iot/tplink/plan/components/PlanAddForm.vue b/src/views/iot/tplink/plan/components/PlanAddForm.vue index 401941b..d31a511 100644 --- a/src/views/iot/tplink/plan/components/PlanAddForm.vue +++ b/src/views/iot/tplink/plan/components/PlanAddForm.vue @@ -72,10 +72,10 @@ record = {}; } initModel.value = record; - if(record.projectId!=''&&record.regionId!=''){ + // if(record.projectId!=''&&record.regionId!=''){ await fetchStorageDev(record.projectId,record.regionId); await fetchPlan(); - } + // } }, { deep: true, immediate: true } ); diff --git a/src/views/iot/tplink/plan/components/PlanAddTree.vue b/src/views/iot/tplink/plan/components/PlanAddTree.vue index 056c164..322b278 100644 --- a/src/views/iot/tplink/plan/components/PlanAddTree.vue +++ b/src/views/iot/tplink/plan/components/PlanAddTree.vue @@ -65,9 +65,9 @@ import {defineExpose, nextTick, onMounted, ref, unref, watch} from 'vue'; // 加载顶级区域信息 async function loadRootTreeData() { - if(model.value.projectId==''&&model.value.regionId==''){ +/* if(model.value.projectId==''&&model.value.regionId==''){ return ; - } + }*/ try { loading.value = true; treeData.value = []; diff --git a/src/views/iot/tplink/plan/index.vue b/src/views/iot/tplink/plan/index.vue index a42473d..caefe8f 100644 --- a/src/views/iot/tplink/plan/index.vue +++ b/src/views/iot/tplink/plan/index.vue @@ -1,3 +1,4 @@ + + + + + + + diff --git a/src/views/iot/tq/electricity/electricity.data.ts b/src/views/iot/tq/electricity/electricity.data.ts index d421bc2..9622191 100644 --- a/src/views/iot/tq/electricity/electricity.data.ts +++ b/src/views/iot/tq/electricity/electricity.data.ts @@ -3,27 +3,27 @@ import {FormSchema} from '/@/components/Table'; //列表数据 export const columns: BasicColumn[] = [ - { - title: '单元编码', - align: "center", - dataIndex: 'nuId' - }, - { - title: '单元名称', - align: "center", - dataIndex: 'nuName' - }, + // { + // title: '单元编码', + // align: "center", + // dataIndex: 'nuId' + // }, + // { + // title: '单元名称', + // align: "center", + // dataIndex: 'nuName' + // }, { title: '设备号', align: "center", dataIndex: 'address' }, - { - title: '机构名称', - align: "center", - dataIndex: 'departName', - width: 220, - }, + // { + // title: '机构名称', + // align: "center", + // dataIndex: 'departName', + // width: 220, + // }, // { // title: '采集器号', // align: "center", @@ -91,31 +91,31 @@ export const columns: BasicColumn[] = [ ]; export const searchFormSchema: FormSchema[] = [ - { - label: '机构', - field: 'deviceStatus', - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择机构', - dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc', - }, - colProps: { span: 6 }, - }, - { - label: '护理单元', - field: 'deviceStatus', - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择护理单元', - dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', - }, - colProps: { span: 6 }, - }, + // { + // label: '机构', + // field: 'deviceStatus', + // component: 'JDictSelectTag', + // componentProps: { + // placeholder: '请选择机构', + // dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc', + // }, + // colProps: { span: 6 }, + // }, + // { + // label: '护理单元', + // field: 'deviceStatus', + // component: 'JDictSelectTag', + // componentProps: { + // placeholder: '请选择护理单元', + // dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', + // }, + // colProps: { span: 6 }, + // }, { label: '设备号', field: 'address', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '设备状态', @@ -128,7 +128,7 @@ export const searchFormSchema: FormSchema[] = [ { label: '拉闸', value: '0' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '在线状态', @@ -141,7 +141,7 @@ export const searchFormSchema: FormSchema[] = [ { label: '离线', value: 'false' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '信号强度', @@ -155,6 +155,6 @@ export const searchFormSchema: FormSchema[] = [ { label: '低', value: '3' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, ]; diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue index 69250dd..e495583 100644 --- a/src/views/iot/tq/electricity/index.vue +++ b/src/views/iot/tq/electricity/index.vue @@ -47,7 +47,7 @@ - + @@ -63,12 +63,12 @@ import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue"; import ApiLogModal from "@/views/iot/tq/electricity/apilog/ApiLogModal.vue"; - import ElectricitySyncLogListModal from "/@/views/iot/SyncLog/ElectricitySyncLogListModal.vue"; + // import ElectricitySyncLogListModal from "/@/views/iot/SyncLog/ElectricitySyncLogListModal.vue"; import { defHttp } from '/@/utils/http/axios'; const queryParam = reactive({}); const apiLogModal = ref(); - const syncLogModal = ref(); + // const syncLogModal = ref(); const hldyUtilsModal = ref(); //注册model const [registerModal, {openModal}] = useModal(); @@ -108,7 +108,7 @@ import { defHttp } from '/@/utils/http/axios'; function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + //护理单元回调 function handleHldyParams(params){ defHttp.post({ @@ -120,10 +120,10 @@ import { defHttp } from '/@/utils/http/axios'; }) } //同步 - function handleSync(record: Recordable){ - syncLogModal.value.disableSubmit = true; - syncLogModal.value.init(record); - } + // function handleSync(record: Recordable){ + // syncLogModal.value.disableSubmit = true; + // syncLogModal.value.init(record); + // } /** * 操作栏 @@ -154,14 +154,13 @@ import { defHttp } from '/@/utils/http/axios'; label: '日志', onClick: showApiLog.bind(null, record), }, - { - label: '同步', - onClick: handleSync.bind(null, record), - }, + // { + // label: '同步', + // onClick: handleSync.bind(null, record), + // }, ] } - // 抄电表 async function handleRead(record: Recordable) { const params = { diff --git a/src/views/iot/tq/water/index.vue b/src/views/iot/tq/water/index.vue index c656c1e..30d3ad3 100644 --- a/src/views/iot/tq/water/index.vue +++ b/src/views/iot/tq/water/index.vue @@ -148,10 +148,10 @@ label: '日志', onClick: showApiLog.bind(null, record), }, - { - label: '同步', - onClick: handleSync.bind(null, record), - }, + // { + // label: '同步', + // onClick: handleSync.bind(null, record), + // }, ] } diff --git a/src/views/iot/tq/water/water.data.ts b/src/views/iot/tq/water/water.data.ts index f74a3bc..a9be9ba 100644 --- a/src/views/iot/tq/water/water.data.ts +++ b/src/views/iot/tq/water/water.data.ts @@ -3,27 +3,27 @@ import {FormSchema} from '/@/components/Table'; //列表数据 export const columns: BasicColumn[] = [ - { - title: '单元编码', - align: "center", - dataIndex: 'nuId' - }, - { - title: '单元名称', - align: "center", - dataIndex: 'nuName' - }, + // { + // title: '单元编码', + // align: "center", + // dataIndex: 'nuId' + // }, + // { + // title: '单元名称', + // align: "center", + // dataIndex: 'nuName' + // }, { title: '设备号', align: "center", dataIndex: 'address' }, - { - title: '机构名称', - align: "center", - dataIndex: 'departName', - width: 220, - }, + // { + // title: '机构名称', + // align: "center", + // dataIndex: 'departName', + // width: 220, + // }, // { // title: '采集器号', // align: "center", @@ -99,31 +99,31 @@ export const columns: BasicColumn[] = [ ]; export const searchFormSchema: FormSchema[] = [ - { - label: '机构', - field: 'deviceStatus', - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择机构', - dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc', - }, - colProps: { span: 6 }, - }, - { - label: '护理单元', - field: 'deviceStatus', - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择护理单元', - dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', - }, - colProps: { span: 6 }, - }, + // { + // label: '机构', + // field: 'deviceStatus', + // component: 'JDictSelectTag', + // componentProps: { + // placeholder: '请选择机构', + // dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc', + // }, + // colProps: { span: 6 }, + // }, + // { + // label: '护理单元', + // field: 'deviceStatus', + // component: 'JDictSelectTag', + // componentProps: { + // placeholder: '请选择护理单元', + // dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', + // }, + // colProps: { span: 6 }, + // }, { label: '设备号', field: 'address', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '设备状态', @@ -136,7 +136,7 @@ export const searchFormSchema: FormSchema[] = [ { label: '拉闸', value: '0' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '在线状态', @@ -149,7 +149,7 @@ export const searchFormSchema: FormSchema[] = [ { label: '离线', value: 'false' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '信号强度', @@ -163,6 +163,6 @@ export const searchFormSchema: FormSchema[] = [ { label: '低', value: '3' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, ]; diff --git a/src/views/iot/yiweilian/humid.data.ts b/src/views/iot/yiweilian/humid.data.ts index 1bdf047..bd3a726 100644 --- a/src/views/iot/yiweilian/humid.data.ts +++ b/src/views/iot/yiweilian/humid.data.ts @@ -3,16 +3,16 @@ import {FormSchema} from '/@/components/Table'; //列表数据 export const columns: BasicColumn[] = [ - { - title: '单元编码', - align: "center", - dataIndex: 'nuId' - }, - { - title: '单元名称', - align: "center", - dataIndex: 'nuName' - }, + // { + // title: '单元编码', + // align: "center", + // dataIndex: 'nuId' + // }, + // { + // title: '单元名称', + // align: "center", + // dataIndex: 'nuName' + // }, { title: '设备号', align: "center", @@ -23,10 +23,26 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'deviceName' }, + // { + // title: '机构', + // align: "center", + // dataIndex: 'departName' + // }, { - title: '机构', + title: '在线状态', align: "center", - dataIndex: 'departName' + dataIndex: 'status', + customRender:({record})=>{ + return record.status?(record.status=='0'?'在线':'离线'):''; + }, + }, + { + title: '启用状态', + align: "center", + dataIndex: 'delFlag', + customRender:({record})=>{ + return record.delFlag?(record.delFlag=='0'?'启用':'停用'):''; + }, }, { title: '温度', @@ -67,50 +83,35 @@ export const columns: BasicColumn[] = [ dataIndex: 'electricity', defaultHidden: true, }, - { - title: '在线状态', - align: "center", - dataIndex: 'status', - customRender:({record})=>{ - return record.status?(record.status=='0'?'在线':'离线'):''; - }, - }, - { - title: '启用状态', - align: "center", - dataIndex: 'delFlag', - customRender:({record})=>{ - return record.delFlag?(record.delFlag=='0'?'启用':'停用'):''; - }, - }, + ]; export const searchFormSchema: FormSchema[] = [ - { - label: '机构', - field: 'deviceStatus', - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择机构', - dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc', - }, - colProps: { span: 6 }, - }, - { - label: '护理单元', - field: 'deviceStatus', - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择护理单元', - dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', - }, - colProps: { span: 6 }, - }, + // { + // label: '机构', + // field: 'deviceStatus', + // component: 'JDictSelectTag', + // componentProps: { + // placeholder: '请选择机构', + // dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc', + // }, + // colProps: { span: 6 }, + // }, + // { + // label: '护理单元', + // field: 'deviceStatus', + // component: 'JDictSelectTag', + // componentProps: { + // placeholder: '请选择护理单元', + // dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', + // }, + // colProps: { span: 6 }, + // }, { label: '设备号', field: 'sn', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { label: '在线状态', @@ -123,7 +124,7 @@ export const searchFormSchema: FormSchema[] = [ { label: '离线', value: '1' }, ], }, - colProps: { span: 6 }, + colProps: { span: 4 }, }, ]; diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue index f212a06..e47ee1a 100644 --- a/src/views/iot/yiweilian/index.vue +++ b/src/views/iot/yiweilian/index.vue @@ -138,10 +138,10 @@ onClick: handleApiLogAlarm.bind(null, record), ifShow: ()=>{ return record.delFlag == '0' } }, - { - label: '同步', - onClick: handleSync.bind(null, record), - }, + // { + // label: '同步', + // onClick: handleSync.bind(null, record), + // }, ] } diff --git a/src/views/system/depart/components/TplinkUserTab.vue b/src/views/system/depart/components/TplinkUserTab.vue deleted file mode 100644 index 177677b..0000000 --- a/src/views/system/depart/components/TplinkUserTab.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - diff --git a/src/views/system/depart/depart.api.ts b/src/views/system/depart/depart.api.ts index cca38ca..f224f49 100644 --- a/src/views/system/depart/depart.api.ts +++ b/src/views/system/depart/depart.api.ts @@ -24,9 +24,6 @@ export enum Api { getUpdateDepartInfo = '/sys/user/getUpdateDepartInfo', doUpdateDepartInfo = '/sys/user/doUpdateDepartInfo', changeDepartChargePerson = '/sys/user/changeDepartChargePerson', - - getUser = '/iot/tplink/getUser', - saveUser = '/iot/tplink/saveUser', } /** @@ -123,11 +120,3 @@ export const deleteDepart = (id) => defHttp.delete({ url: Api.delete, params:{ i * @param params */ export const changeDepartChargePerson = (params) => defHttp.put({ url: Api.changeDepartChargePerson, params }); -/** - * 添加和编辑图门系统用户 - */ -export const saveUser = (params) => defHttp.post({ url: Api.saveUser, params }); -/** - * 获取图门系统用户 - */ -export const getUser = (params?) => defHttp.get({ url: Api.getUser, params }); diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts index 0f81f49..56153ca 100644 --- a/src/views/system/depart/depart.data.ts +++ b/src/views/system/depart/depart.data.ts @@ -226,98 +226,3 @@ export const orgCategoryOptions = { child: [{ value: '2', label: '部门' }], }; -export const tplinkUseFormSchema: FormSchema[] = [ - { - field: 'id', - label: 'id', - component: 'Input', - show: false, - }, - { - field: 'orgCode', - label: '所属机构', - component: 'Input', - required: true, - dynamicDisabled: true, - }, - { - field: 'tumsProjectId', - label: '所属项目ID', - component: 'Input', - required: true, - show: false, - }, - { - field: 'tumsProjectName', - label: '所属项目', - component: 'Input', - required: true, - dynamicDisabled: true, - }, - { - field: 'tumsUsername', - label: '用户名', - component: 'Input', - required: true, - }, - { - field: 'tumsPassword', - label: '密码', - required: true, - component: 'StrengthMeter', - rules: [ - { - required: true, - message: '请输入登录密码', - }, - { - pattern: - /^(?!.*(.)\1{2})(?=(?:.*[0-9].*[A-Z])|(?:.*[0-9].*[a-z])|(?:.*[0-9].*[~!@#$%^&*()_+={[}\]|\\:;'"<,>.?/ -])|(?:.*[A-Z].*[a-z])|(?:.*[A-Z].*[~!@#$%^&*()_+={[}\]|\\:;'"<,>.?/ -])|(?:.*[a-z].*[~!@#$%^&*()_+={[}\]|\\:;'"<,>.?/ -]))[0-9A-Za-z~!@#$%^&*()_+={[}\]|\\:;'"<,>.?/ -]{8,64}$/, - message: '密码由8位数字、大小写字母和特殊符号组成!', - }, - ], - // dynamicDisabled: ({ values }) => { - // return !!values.id; - // }, - }, - { - field: 'tumsRoleId', - label: '角色', - required: true, - component: 'JDictSelectTag', - componentProps: { - placeholder: '请选择类型', - options: [ - { label: '超级管理员', value: '1' }, - { label: '项目管理员', value: '2' }, - { label: '项目查看员', value: '3' }, - { label: '视频监控员', value: '4' }, - ], - }, - }, - { - field: 'ftpIp', - label: 'FTP地址', - component: 'Input', - }, - { - field: 'ftpPort', - label: 'FTP端口', - component: 'Input', - }, - { - field: 'ftpUsername', - label: 'FTP用户', - component: 'Input', - }, - { - field: 'ftpPassword', - label: 'FTP密码', - component: 'InputPassword', - }, - { - field: 'ftpUploadpath', - label: 'FTP上传路径', - component: 'Input', - }, -]; diff --git a/src/views/system/depart/index.vue b/src/views/system/depart/index.vue index 92f261b..f14a9b4 100644 --- a/src/views/system/depart/index.vue +++ b/src/views/system/depart/index.vue @@ -21,11 +21,6 @@ - -
- -
-
@@ -42,7 +37,6 @@ import DepartFormTab from './components/DepartFormTab.vue'; import DepartRuleTab from './components/DepartRuleTab.vue'; import DataSourceTab from './components/DataSourceTab.vue'; - import TplinkUserTab from './components/TplinkUserTab.vue'; const { prefixCls } = useDesign('depart-manage'); provide('prefixCls', prefixCls);