This commit is contained in:
wangweidong 2025-10-31 08:50:43 +08:00
commit 1cc4e152bd
16 changed files with 1495 additions and 901 deletions

View File

@ -65,13 +65,13 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身高" v-bind="validateInfos.height" id="EmployeesApplyForm-height" name="height">
<a-form-item label="身高(cm)" v-bind="validateInfos.height" id="EmployeesApplyForm-height" name="height">
<a-input-number v-model:value="formData.height" placeholder="请输入身高" style="width: 100%" disabled />
<!-- <span>{{ formData.height }}cm</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="体重" v-bind="validateInfos.weight" id="EmployeesApplyForm-weight" name="weight">
<a-form-item label="体重(kg)" v-bind="validateInfos.weight" id="EmployeesApplyForm-weight" name="weight">
<a-input-number v-model:value="formData.weight" placeholder="请输入体重" style="width: 100%" disabled />
<!-- <span>{{ formData.weight }}kg</span> -->
</a-form-item>
@ -153,7 +153,7 @@
</a-form>
</template>
</JFormContainer>
<JFormContainer>
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
name="EmployeesApplyForm">
@ -251,6 +251,13 @@
</a-tabs>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
name="EmployeesApplyForm">
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<div v-if="formData.applyType == 0">

View File

@ -239,7 +239,9 @@ function handleChangeValidateStatus(record,checked) {
// console.log("🚀 ~ reload ~ list:", list.records)
defHttp.get({url: '/nuBaseInfo/nuBaseInfo/qyList',params:queryParam}).then(res => {
console.log("🌊 ~ reload ~ res1111111:", res)
console.log("🚀 ~ defHttp.get ~ res:", res)
tableData.value = res.records;
});

View File

@ -197,4 +197,5 @@ export const applyObj = {
elderModifyStatus: '长者信息变更状态 1修改申请中 2通过 3驳回',
elderModifyContent: '长者信息变更驳回原因',
elderModifyId: '长者变更信息对应子表id nu_biz_elder_modify_info.id',
guardianIdCardPositive:'监护人身份证正面',
};

View File

@ -4,8 +4,8 @@
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
name="ElderInfoForm">
<a-row>
<a-col :span="24">
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'长者信息'" />
</a-col>
<a-col :span="12">
@ -61,16 +61,19 @@
<span>{{ formData.houseAddress }}</span>
</a-form-item>
</a-col>
<a-col :span="24">
</a-row>
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'监护人信息'" />
</a-col>
<a-col :span="24">
<a-col :span="12">
<a-form-item label="关系" v-bind="validateInfos.relationship" id="ElderInfoForm-relationship"
name="relationship">
<!-- <a-input v-model:value="formData.relationship" placeholder="请输入关系" allow-clear></a-input> -->
<span>{{ formData.relationship }}</span>
<a-form-item label="身份证正面" v-bind="validateInfos.guardianIdCardPositive" id="ElderInfoForm-guardianIdCardPositive"
name="guardianIdCardPositive">
<j-image-upload :fileMax="1" :value="opeMediaAddress + formData.guardianIdCardPositive"></j-image-upload>
</a-form-item>
</a-col>
</a-col>
<a-col :span="12">
<a-form-item label="姓名" v-bind="validateInfos.guardianName" id="ElderInfoForm-guardianName"
name="guardianName">
@ -78,6 +81,13 @@
<span>{{ formData.guardianName }}</span>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="关系" v-bind="validateInfos.relationship" id="ElderInfoForm-relationship"
name="relationship">
<!-- <a-input v-model:value="formData.relationship" placeholder="请输入关系" allow-clear></a-input> -->
<span>{{ formData.relationship }}</span>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证号" v-bind="validateInfos.guardianIdCard" id="ElderInfoForm-guardianIdCard"
name="guardianIdCard">
@ -106,7 +116,9 @@
<span>{{ formData.guardianWorkUnit }}</span>
</a-form-item>
</a-col>
<a-col :span="24">
</a-row>
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'长者身份证'" />
</a-col>
<a-col :span="12">
@ -192,6 +204,11 @@ const formData = reactive<Record<string, any>>({
issuingAuthority: '',
startTime: '',
endTime: '',
guardianBirthDate: '',
guardianSex: '',
guardianNational: '',
guardianCardHome: '',
guardianIdCardPositive: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
@ -311,4 +328,17 @@ defineExpose({
.antd-modal-form {
// padding: 14px;
}
.card-class {
padding-top: 24px;
padding-bottom: 24px;
padding-left: 14px;
padding-right: 14px;
// background-color: rgba(255, 255, 255, 0.9);
background-color: #fcfdff;
border-radius: 10px;
// box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
margin-bottom: 14px;
}
</style>

View File

@ -38,7 +38,8 @@
</a-table>
</a-col>
</a-row>
<a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData"
:label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
@ -156,6 +157,11 @@ const filteredTableData = computed(() => {
// && item.d1 !== 'elderModifyStatus'
// && item.d1 !== 'elderModifyContent'
// && item.d1 !== 'elderModifyId'
&& item.d1 !== 'guardianBirthDate'
&& item.d1 !== 'guardianSex'
&& item.d1 !== 'guardianNational'
&& item.d1 !== 'guardianCardHome'
&& item.d1 !== 'guardianIdCardPositive'
);
});

View File

@ -77,7 +77,7 @@ const { createMessage } = useMessage();
const labelCol = { span: 4 }; //
const wrapperCol = { span: 18 }; //
const isImg = (v_) => {
return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
return v_ == 'guardianIdCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
}
const provinceOptions = ref({})
const formData = reactive<Record<string, any>>({
@ -155,6 +155,10 @@ const filteredTableData = computed(() => {
&& item.d1 !== 'elderModifyStatus'
&& item.d1 !== 'elderModifyContent'
&& item.d1 !== 'elderModifyId'
&& item.d1 !== 'guardianBirthDate'
&& item.d1 !== 'guardianSex'
&& item.d1 !== 'guardianNational'
&& item.d1 !== 'guardianCardHome'
);
});

View File

@ -143,6 +143,55 @@ export const columns3: BasicColumn[] = [
},
];
export const columns4: BasicColumn[] = [
{
title: '物料',
align: "center",
dataIndex: 'materialName'
},
{
title: '物料编码',
align: "center",
dataIndex: 'materialNo'
},
{
title: '规格型号',
align: "center",
dataIndex: 'specificationModel'
},
{
title: '一级分类',
align: "center",
dataIndex: 'categoryId_dictText'
},
{
title: '二级分类',
align: "center",
dataIndex: 'typeId_dictText'
},
{
title: '三级分类',
align: "center",
dataIndex: 'medicationId_dictText'
},
{
title: '库存数量',
align: "center",
dataIndex: 'kcsl'
},
{
title: '物料上限',
align: "center",
dataIndex: 'upperLimit'
},
{
title: '物料下限',
align: "center",
dataIndex: 'lowerLimit'
},
];
//列表数据
export const ckcolumns: BasicColumn[] = [
{

View File

@ -67,7 +67,9 @@
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'warehouseMaterialInfo:bl_warehouse_material_info:add'" @click="handleAdd"
preIcon="ant-design:plus-outlined"> 选择物料</a-button>
preIcon="ant-design:plus-outlined"> 添加物料</a-button>
<a-button type="primary" v-auth="'warehouseMaterialInfo:bl_warehouse_material_info:add'" @click="handleDel"
preIcon="ant-design:plus-outlined"> 移除物料</a-button>
</template>
<!--操作栏-->
<template #action="{ record }">
@ -78,8 +80,10 @@
</BasicTable>
<!-- 表单区域 -->
<BlWarehouseMaterialInfoModal ref="registerModal" @success="handleSuccess"></BlWarehouseMaterialInfoModal>
<!-- 选择物料 -->
<!-- 添加物料 -->
<CheckWuliaoModal ref="registerAddModal" @success="handleSuccess"></CheckWuliaoModal>
<!-- 移除物料 -->
<DelWuliaoModal ref="registerDelModal" @success="handleSuccess"></DelWuliaoModal>
<!-- 出入库详情 -->
<NuWarehouseMaterialCrkInfoListModal ref="registerCrkModal" @success="handleSuccess">
</NuWarehouseMaterialCrkInfoListModal>
@ -95,20 +99,25 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BlWa
import { downloadFile } from '/@/utils/common/renderUtils';
import BlWarehouseMaterialInfoModal from './components/BlWarehouseMaterialInfoModal.vue'
import CheckWuliaoModal from './components/CheckWuliaoModal.vue'
import DelWuliaoModal from './components/DelWuliaoModal.vue'
import NuWarehouseMaterialCrkInfoListModal from '/@/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoListModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { JInput } from '/@/components/Form';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const registerAddModal = ref();
const registerDelModal = ref();
const registerCrkModal = ref();
const userStore = useUserStore();
const { createConfirm } = useMessage();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
@ -169,6 +178,14 @@ function handleAdd() {
registerAddModal.value.disableSubmit = false;
registerAddModal.value.edit(params);
}
/**
* 新增事件
*/
function handleDel() {
var params = { nuId: queryParam.nuId }
registerDelModal.value.disableSubmit = false;
registerDelModal.value.edit(params);
}
/**
* 编辑事件
@ -245,9 +262,26 @@ function getTableAction(record) {
];
}
function handleQyty(record, izEnabled) {
var title = "是否启用";
var content = "是否启用此物料";
if(izEnabled == '1'){
title = "是否停用";
content = "是否停用此物料";
}
createConfirm({
iconType: 'warning',
title: title,
content: content,
okText: '确认',
cancelText: '取消',
onOk: () => {
defHttp.put({ url: '/invoicing/blWarehouseMaterialInfo/edit', params: { id: record.id, izEnabled: izEnabled } }).then(res => {
handleSuccess();
});
}
});
}

View File

@ -54,6 +54,9 @@
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { JInput } from '/@/components/Form';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm , createMessage } = useMessage();
const formRef = ref();
const queryParam = reactive<any>({areaFlag:'3'});
@ -151,11 +154,38 @@ import { defHttp } from '/@/utils/http/axios';
},
];
}
function handleQyty(record,izEnabled) {
defHttp.put({ url: '/nuBaseInfo/nuBaseInfo/edit', params: { id: record.id,status:izEnabled} }).then(res => {
handleSuccess();
async function handleQyty(record,izEnabled) {
var title = "是否启用";
var content = "是否启用此仓库";
var sfjx = "0";
if(izEnabled == '5'){
title = "是否停用";
content = "是否停用此仓库";
await defHttp.get({ url: '/invoicing/blWarehouseMaterialInfo/sfkytyList', params: { nuId: record.nuId} }).then(res => {
console.log("🚀 ~ handleQyty ~ res:", res.total)
if(res.total > 0){
sfjx = "1";
}
});
}
if(sfjx == '1'){
createMessage.error("此仓库下的物料库存不为零,请将物料的库存归零后再进行操作!");
return;
}
// createConfirm({
// iconType: 'warning',
// title: title,
// content: content,
// okText: '',
// cancelText: '',
// onOk: () => {
// defHttp.put({ url: '/nuBaseInfo/nuBaseInfo/edit', params: { id: record.id,status:izEnabled} }).then(res => {
// handleSuccess();
// });
// }
// });
}
/**

View File

@ -210,10 +210,18 @@ import { defHttp } from '/@/utils/http/axios';
})
// emit('ok',selectedRows.value);
}
function submitAllForm() {
defHttp.post({url:'/invoicing/blWarehouseMaterialInfo/addAllWuliao',params:{nuId:formData.nuId}}).then(res=>{
console.log("🚀 ~ submitForm ~ res:", res)
emit('ok');
})
// emit('ok',selectedRows.value);
}
defineExpose({
edit,
submitForm,
submitAllForm
});

View File

@ -4,7 +4,8 @@
<CheckWuliaoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CheckWuliaoForm>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
<a-button type="primary" style="margin-right: 8px" @click="handleAllOk" v-if="!disableSubmit">添加全部</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">添加</a-button>
</template>
</a-drawer>
</template>
@ -37,7 +38,7 @@
* @param record
*/
function edit(record) {
title.value = '选择物料';
title.value = '添加物料';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
@ -50,6 +51,12 @@
function handleOk() {
registerForm.value.submitForm();
}
/**
* 确定按钮点击事件
*/
function handleAllOk() {
registerForm.value.submitAllForm();
}
/**
* form保存回调事件

View File

@ -10,17 +10,17 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="负责人" v-bind="validateInfos.fzr" id="BlWarehouseMaterialInfoForm-nuId" name="nuId" >
<a-form-item label="负责人" v-bind="validateInfos.fzr" id="BlWarehouseMaterialInfoForm-fzr" name="fzr" >
<a-input v-model:value="formData.fzr" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-wlId" name="wlId" >
<a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-fzrTel" name="fzrTel" >
<a-input v-model:value="formData.fzrTel" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="负责人头像" v-bind="validateInfos.fzrHeadPath" id="BlWarehouseMaterialInfoForm-upperLimit" name="upperLimit">
<a-form-item label="负责人头像" v-bind="validateInfos.fzrHeadPath" id="BlWarehouseMaterialInfoForm-fzrHeadPath" name="fzrHeadPath">
<j-image-upload :fileMax="1" text="无" v-model:value="formData.fzrHeadPath"></j-image-upload>
</a-form-item>
</a-col>
@ -65,6 +65,7 @@
//
const validatorRules = reactive({
nuName: [{ required: true, message: '请输入库房名称!' },],
fzrTel: [{ required: false, message: '请输入负责人电话!' },{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

View File

@ -0,0 +1,254 @@
<template>
<div>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="paramWlxx">
<template #label><span title="物料信息">物料信息</span></template>
<a-input placeholder="请填写物料信息" v-model:value="queryParam.paramWlxx" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)"/>
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
</div>
</template>
<script lang="ts" name="materialInfo-nuConfigMaterialInfo" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns4 } from '../BlWarehouseMaterialInfo.data';
import { list, batchDelete } from '../BlWarehouseMaterialInfo.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
const { createMessage,createConfirm } = useMessage();
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
const emit = defineEmits(['register', 'ok']);
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formBpm: { type: Boolean, default: true }
});
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: 'nu_config_material_info',
api: list,
columns: columns4,
canResize:false,
useSearchForm: false,
immediate: false,
showActionColumn: false,
showTableSetting: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
});
const formData = reactive<Record<string, any>>({
id: '',
nuId: '',
wlId: '',
upperLimit: '',
lowerLimit: '',
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
});
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
async function edit(record) {
console.log("🚀 ~ edit ~ record:", record)
selectedRowKeys.value = [];
selectedRows.value = [];
nextTick(() => {
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
tmpData[key] = record[key]
}
})
//
Object.assign(formData, tmpData);
});
// var checkId = "";
// for(let item of record){
// checkId += item.id + ",";
// }
// if(checkId.length > 0){
// checkId = checkId.substring(0,checkId.length - 1);
// }
queryParam.nuId = formData.nuId;
reload();
}
function submitForm() {
var list = selectedRows.value;
if(list.length == 0){
createMessage.warning('请选择想要移除的物料!');
return;
}
var ids = "";
for(let item of list){
if(parseFloat(item.kcsl) == 0){
ids += item.id + ",";
}else{
createMessage.warning('库存数量大于0的物料不予移除,请重新选择!');
return;
}
}
if(ids.length == 0){
createMessage.warning('请选择想要移除的物料,库存数量大于0的物料不予移除');
return;
}
if(ids.length > 0){
ids = ids.substring(0,ids.length - 1);
}
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
defHttp.get({url:'/invoicing/blWarehouseMaterialInfo/deleteBatch',params:{ids}}).then(res=>{
console.log("🚀 ~ submitForm ~ res:", res)
emit('ok');
})
}
});
// batchDelete(ids,emit('ok'))
// emit('ok',selectedRows.value);
}
function handleAllDel() {
defHttp.get({url:'/invoicing/blWarehouseMaterialInfo/deleteAllWuliao',params:{nuId:formData.nuId}}).then(res=>{
emit('ok');
})
}
defineExpose({
edit,
submitForm,
handleAllDel
});
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>

View File

@ -0,0 +1,87 @@
<template>
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<DelWuliaoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DelWuliaoForm>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" style="margin-right: 8px" @click="handleAllDel" v-if="!disableSubmit">移除全部</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">移除</a-button>
</template>
</a-drawer>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import DelWuliaoForm from './DelWuliaoForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('80%');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = '移除物料';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
function handleAllDel() {
registerForm.value.handleAllDel();
}
/**
* form保存回调事件
*/
function submitCallback(record) {
console.log("🚀 11111~ submitCallback ~ record:", record)
handleCancel();
emit('success',record);
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style lang="less">
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>
<style lang="less" scoped></style>

View File

@ -6,25 +6,25 @@
<div id="videview" style="height:0px;"></div>
</a-col>
<!-- <a-col :span="24" style="margin-top: -120px;margin-left:40px;" v-show="formData.ptz == '1'"> -->
<a-col :span="24" style="margin-top: -120px " >
<a-col :span="24" style="margin-top: -120px ">
<table style="width: 130px;height:96px;margin: 5px 0px 5px 0px;">
<tbody>
<tr>
<td></td>
<td style="width:100px;text-align:center;">
<div class="fxjImgUp" @mousedown="moveCtrl(1,1,1)" @mouseup="moveCtrl(1,0,1)"></div>
<div class="fxjImgUp" @mousedown="moveCtrl(1, 1, 1)" @mouseup="moveCtrl(1, 0, 1)"></div>
</td>
<td></td>
</tr>
<tr>
<td style="width:90px;text-align:center;">
<div class="fxjImgLeft" @mousedown="moveCtrl(3,1,1)" @mouseup="moveCtrl(3,0,1)"></div>
<div class="fxjImgLeft" @mousedown="moveCtrl(3, 1, 1)" @mouseup="moveCtrl(3, 0, 1)"></div>
</td>
<td style="width:100px;text-align:center;">
<div class="fxjImgDown" @mousedown="moveCtrl(7,1,1)" @mouseup="moveCtrl(7,0,1)"></div>
<div class="fxjImgDown" @mousedown="moveCtrl(7, 1, 1)" @mouseup="moveCtrl(7, 0, 1)"></div>
</td>
<td style="width:100px;text-align:center;">
<div class="fxjImgRight" @mousedown="moveCtrl(5,1,1)" @mouseup="moveCtrl(5,0,1)"></div>
<div class="fxjImgRight" @mousedown="moveCtrl(5, 1, 1)" @mouseup="moveCtrl(5, 0, 1)"></div>
</td>
</tr>
</tbody>
@ -50,9 +50,9 @@
<div class="selectDiv" @click="setFishEyeDisplayMode('FISHEYE_LONGITUDE')">全景拉伸</div>
</div>
</template>
<span class="buttonSpan fpImg"><span style="margin-left:30px;">分屏</span></span>
</a-popover>
<a-popover>
<span class="buttonSpan fpImg"><span style="margin-left:30px;">分屏</span></span>
</a-popover>
<a-popover>
<template #content>
<div style="text-align: center;">
<div class="selectDiv" @click="changeSwitch('flip_type','off')">关闭</div>
@ -62,8 +62,8 @@
</div>
</template>
<span class="buttonSpan hmxzImg"><span style="margin-left:30px;">画面旋转</span></span>
</a-popover>
</a-col> -->
</a-popover>
</a-col> -->
<!-- <a-popover title="变焦">
<template #content>
<div style="line-height: 50px;">
@ -160,37 +160,37 @@
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import { getValueType } from '/@/utils';
import { Form } from 'ant-design-vue';
import {
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import { getValueType } from '/@/utils';
import { Form } from 'ant-design-vue';
import {
getImageCommon,
getMultitransUrl,
getPreviewUrl,
setImageCommon,
testAudio,
motionCtrl
} from "../camera.api";
} from "../camera.api";
const props = defineProps({
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true }
});
});
const formRef = ref();
const player = ref();
const resolution = ref<string>('流畅');
const izPlaying = ref<boolean>(true);
const izRecording = ref<boolean>(false);
const izPhone = ref<boolean>(false);
const fishEyeDisplayMode = ref<string>('ORIGIN');
const flipType = ref<string>('off');
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
const formRef = ref();
const player = ref();
const resolution = ref<string>('流畅');
const izPlaying = ref<boolean>(true);
const izRecording = ref<boolean>(false);
const izPhone = ref<boolean>(false);
const fishEyeDisplayMode = ref<string>('ORIGIN');
const flipType = ref<string>('off');
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
//
deviceIndex: '',//
@ -204,42 +204,42 @@
flip_type: '',// "off"// "left_and_right"// "up_and_down"// "center"//
zoom: 1, //
sliderValue : 1,//
ptz : 0,//
smartCode : 0,//
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
sliderValue: 1,//
ptz: 0,//
smartCode: 0,//
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
//
const disabled = computed(() => {
if (props.formBpm === true) {
if (props.formData.disabled === false) {
return false;
}else{
} else {
return true;
}
}
return props.formDisabled;
});
});
/**
/**
* 详情
*/
async function edit(record) {
async function edit(record) {
await nextTick(() => {
confirmLoading.value=true;
confirmLoading.value = true;
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
if (record.hasOwnProperty(key)) {
tmpData[key] = record[key]
}
})
@ -248,20 +248,20 @@
});
createPreview();
getSwitch();
}
}
/**
/**
* 创建预览
*/
async function createPreview(){
await getPreviewUrl({"deviceIndex":formData.deviceIndex,"streamType":formData.streamType}).then(res=>{
async function createPreview() {
await getPreviewUrl({ "deviceIndex": formData.deviceIndex, "streamType": formData.streamType }).then(res => {
formData.url = res.url;
formData.backupUrl = res.backupUrl;
formData.wsUrl = res.wsUrl;
formData.wssUrl = res.wssUrl;
confirmLoading.value=false;
confirmLoading.value = false;
});
if (player.value){
if (player.value) {
player.value.destroy().then(() => {
}); //
player.value = null;
@ -286,129 +286,129 @@
}
izPlaying.value = true;
}
}
}
/**
/**
* 切换超清/流程
*/
function switchResolution(){
if(formData.streamType == 0){
function switchResolution() {
if (formData.streamType == 0) {
resolution.value = '流畅';
formData.streamType = 1;
}else{
} else {
resolution.value = '超清';
formData.streamType = 0;
}
createMessage.info('正在切换至'+resolution.value);
createMessage.info('正在切换至' + resolution.value);
createPreview();
}
}
/**
/**
* 播放
*/
function play(){
function play() {
izPlaying.value = true;
player.value.play();
}
}
/**
/**
* 暂停
*/
function pause(){
function pause() {
izPlaying.value = false;
player.value.pause();
}
}
/**
/**
* 截屏
*/
function screenshot(){
function screenshot() {
player.value.screenshot();
}
}
/**
/**
* 鱼眼画面显示模式
*/
function setFishEyeDisplayMode(value){
function setFishEyeDisplayMode(value) {
player.value.setFishEyeDisplayMode(value);
}
}
/**
/**
* 获取画面翻转
*/
function getSwitch(){
if(formData.deviceIndex==null){
function getSwitch() {
if (formData.deviceIndex == null) {
return
}
getImageCommon({
"deviceIndex": formData.deviceIndex,
"type": "switch"
}).then(res=>{
}).then(res => {
formData.flip_type = res.flip_type; //
});
}
}
/**
/**
* 画面翻转
*/
function changeSwitch(attr,value){
function changeSwitch(attr, value) {
let param = {};
param[attr] = value;
setImageCommon({
"deviceIndex": formData.deviceIndex,
"type": "switch",
"param": param
}).then(res=>{ });
}
}).then(res => { });
}
/**
/**
* 手动报警
*/
function manualAlarm(){
function manualAlarm() {
let params = {
"deviceIndex": formData.deviceIndex,
"force": 1,
"id": '0'
};
testAudio(params);
}
}
/**
/**
* 开始录制
*/
function recordingStart(){
function recordingStart() {
izRecording.value = true;
player.value.startRecording({micStream:true}).then((res) => {
player.value.startRecording({ micStream: true }).then((res) => {
// resolve
}).catch((errData) => {
//
// errData.error_code
createMessage.error('录制错误,'+errData.msg);
createMessage.error('录制错误,' + errData.msg);
});
}
}
/**
/**
* 结束录制
*/
function recordingEnd(){
function recordingEnd() {
izRecording.value = false;
let fileName = formData.deviceIndex+'-'+(new Date().getTime());
let fileName = formData.deviceIndex + '-' + (new Date().getTime());
player.value.stopRecording(fileName, true).then((res) => {
// resolve
}).catch((errData) => {
//
// errData.error_code
createMessage.error('录制错误,'+errData.msg);
createMessage.error('录制错误,' + errData.msg);
});
}
}
/**
/**
* 开始电话
*/
function startPhone(){
function startPhone() {
getMultitransUrl({
"videoDevId":formData.deviceIndex
}).then(res=>{
"videoDevId": formData.deviceIndex
}).then(res => {
player.value.startVoiceIntercom({
"url": res.url, // url
"wssUrl": res.wssUrl,
@ -416,54 +416,54 @@
});
izPhone.value = true;
});
}
}
/**
/**
* 结束电话
*/
function stopPhone(){
function stopPhone() {
player.value.stopVoiceIntercom();
izPhone.value = false;
}
}
/**
/**
* 缩放
*/
function zoomInOut(type){
function zoomInOut(type) {
let delayTime = 6000;
if(type == 'in'){
formData.zoom = formData.zoom+0.4;
if(formData.zoom > 4){
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;
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){
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);
moveCtrl(9, 1, 1);
if (formData.sliderValue <= 2) {
delayTime = 0.4 * 6000;
} else {
delayTime = 0.2 * 6000;
}
delayExecute(moveCtrl, [9, 0, 1], delayTime);
}
}
/**
/**
* 控制球机
*/
function moveCtrl(direction,startOrNot,speed){
function moveCtrl(direction, startOrNot, speed) {
let params = {
"deviceIndex": formData.deviceIndex,
"direction": direction,
@ -471,145 +471,189 @@
"speed": speed,
};
motionCtrl(params);
}
}
function delayExecute(fn, args, delay) {
function delayExecute(fn, args, delay) {
setTimeout(() => {
fn.apply(this,args) // 使apply
fn.apply(this, args) // 使apply
}, delay)
}
}
/**
/**
* 销毁
*/
function destroy(){
if (player){
function destroy() {
if (player) {
player.value.destroy().then(() => {
}); //
player.value = null;
}
}
}
defineExpose({
defineExpose({
edit,
destroy
});
});
</script>
<style lang="less" scoped>
.antd-modal-form {
.antd-modal-form {
padding: 14px;
}
#video-container {
}
#video-container {
padding: 0px 25px;
width: 600px;
height: 500px;
background: #1a1a1a;
}
.buttonSpan{
display: inline-flex; align-items: flex-end;
}
.buttonSpan {
display: inline-flex;
align-items: flex-end;
margin-left: 20px;
border: 1px solid #f6faff;
padding: 5px 10px;
}
.buttonSpan:hover{
}
.buttonSpan:hover {
border: 1px solid #1ea0fa;
color: #1ea0fa;
border-radius: 10px;
cursor: pointer;
}
.buttonImg{
width:20px;margin-right:10px;vertical-align: bottom;
}
.fxjImgUp{
width:50px;height: 50px;
margin-right:10px;vertical-align: bottom;
cursor: pointer;
border-radius: 5px;transform: rotate(270deg);
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgUp:hover{
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.fxjImgLeft{
width:50px;height: 50px;margin-right:10px;vertical-align: bottom;transform: rotate(180deg);
cursor: pointer;
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgLeft:hover{
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.fxjImgDown{
width:50px;height: 50px;margin-right:10px;vertical-align: bottom;transform: rotate(90deg);
cursor: pointer;
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgDown:hover{
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.fxjImgRight{
width:50px;height: 50px;margin-right:10px;vertical-align: bottom;
cursor: pointer;
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgRight:hover{
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
}
.selectDiv{
.buttonImg {
width: 20px;
margin-right: 10px;
vertical-align: bottom;
}
.fxjImgUp {
width: 50px;
height: 50px;
margin-right: 10px;
vertical-align: bottom;
cursor: pointer;
border-radius: 5px;
transform: rotate(270deg);
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgUp:hover {
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.fxjImgLeft {
width: 50px;
height: 50px;
margin-right: 10px;
vertical-align: bottom;
transform: rotate(180deg);
cursor: pointer;
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgLeft:hover {
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.fxjImgDown {
width: 50px;
height: 50px;
margin-right: 10px;
vertical-align: bottom;
transform: rotate(90deg);
cursor: pointer;
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgDown:hover {
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.fxjImgRight {
width: 50px;
height: 50px;
margin-right: 10px;
vertical-align: bottom;
cursor: pointer;
background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat;
}
.fxjImgRight:hover {
background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat;
}
.selectDiv {
text-align: center;
border: 1px solid #f6faff;
padding: 3px 10px;
width: 100px;
margin-top:5px;
}
.selectDiv:hover{
border: 1px solid #a2a3a3;
background: #a2a3a3;
color:white;
margin-top: 5px;
}
.selectDiv:hover {
border: 1px solid #f4f5fa;
background: #f4f5fa;
color: #037FEA;
border-radius: 10px;
cursor: pointer;
}
.djImg{
}
.djImg {
background: url('../../../../../assets/iot/monitor_1.png') left/contain no-repeat;
}
.djImg:hover{
}
.djImg:hover {
background: url('../../../../../assets/iot/monitor_1_1.png') left/contain no-repeat;
}
.qxdImg{
}
.qxdImg {
background: url('../../../../../assets/iot/monitor_5.png') left/contain no-repeat;
}
.qxdImg:hover{
}
.qxdImg:hover {
background: url('../../../../../assets/iot/monitor_5_1.png') left/contain no-repeat;
}
.lzImg{
}
.lzImg {
background: url('../../../../../assets/iot/monitor_4.png') left/contain no-repeat;
}
.lzImg:hover{
}
.lzImg:hover {
background: url('../../../../../assets/iot/monitor_4_1.png') left/contain no-repeat;
}
.jtImg{
}
.jtImg {
background: url('../../../../../assets/iot/monitor_3.png') left/contain no-repeat;
}
.jtImg:hover{
}
.jtImg:hover {
background: url('../../../../../assets/iot/monitor_3_1.png') left/contain no-repeat;
}
.bjImg{
}
.bjImg {
background: url('../../../../../assets/iot/monitor_8.png') left/contain no-repeat;
}
.bjImg:hover{
}
.bjImg:hover {
background: url('../../../../../assets/iot/monitor_8_1.png') left/contain no-repeat;
}
.fpImg{
}
.fpImg {
background: url('../../../../../assets/iot/monitor_6.png') left/contain no-repeat;
}
.fpImg:hover{
}
.fpImg:hover {
background: url('../../../../../assets/iot/monitor_6_1.png') left/contain no-repeat;
}
.hmxzImg{
}
.hmxzImg {
background: url('../../../../../assets/iot/monitor_7.png') left/contain no-repeat;
}
.hmxzImg:hover{
}
.hmxzImg:hover {
background: url('../../../../../assets/iot/monitor_7_1.png') left/contain no-repeat;
}
}
</style>

View File

@ -3,7 +3,8 @@
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<div v-if="showCamera">
<CameraPreviewForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CameraPreviewForm>
<CameraPreviewForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
</CameraPreviewForm>
</div>
@ -13,17 +14,22 @@
<a-col :span="20" style="text-align: center;margin-top: 15px;margin-bottom: 15px;">
<!-- 对讲停止对讲 切换 -->
<!-- <img src="../../../../../assets/iot/monitor_1.png" class="buttonImg"/> -->
<span class="buttonSpan djImg" @click="startPhone" v-show="!izPhone"><span style="margin-left:30px;">对讲</span></span>
<span class="buttonSpan djImg" @click="stopPhone" v-show="izPhone"><span style="margin-left:30px;">结束</span></span>
<span class="buttonSpan djImg" @click="startPhone" v-show="!izPhone"><span
style="margin-left:30px;">对讲</span></span>
<span class="buttonSpan djImg" @click="stopPhone" v-show="izPhone"><span
style="margin-left:30px;">结束</span></span>
<!-- 流畅超清 切换 -->
<span class="buttonSpan qxdImg" @click="switchResolution"><span style="margin-left:30px;">{{ resolution }}</span></span>
<span class="buttonSpan qxdImg" @click="switchResolution"><span style="margin-left:30px;">{{ resolution
}}</span></span>
<!-- 录制结束录制 切换 -->
<span class="buttonSpan lzImg" @click="recordingStart" v-show="!izRecording"><span style="margin-left:30px;">录制</span></span>
<span class="buttonSpan lzImg" @click="recordingEnd" v-show="izRecording"><span style="margin-left:30px;">结束</span></span>
<span class="buttonSpan lzImg" @click="recordingStart" v-show="!izRecording"><span
style="margin-left:30px;">录制</span></span>
<span class="buttonSpan lzImg" @click="recordingEnd" v-show="izRecording"><span
style="margin-left:30px;">结束</span></span>
<span class="buttonSpan jtImg" @click="screenshot"><span style="margin-left:30px;">截图</span></span>
<span class="buttonSpan bjImg" @click="manualAlarm"><span style="margin-left:30px;">报警</span></span>
<a-popover >
<a-popover>
<template #content>
<div style="text-align: center;">
<div class="selectDiv" @click="setFishEyeDisplayMode('ORIGIN')">原图</div>
@ -38,10 +44,10 @@
<a-popover>
<template #content>
<div style="text-align: center;">
<div class="selectDiv" @click="changeSwitch('flip_type','off')">关闭</div>
<div class="selectDiv" @click="changeSwitch('flip_type','left_and_right')">左右</div>
<div class="selectDiv" @click="changeSwitch('flip_type','up_and_down')">上下</div>
<div class="selectDiv" @click="changeSwitch('flip_type','center')">中心</div>
<div class="selectDiv" @click="changeSwitch('flip_type', 'off')">关闭</div>
<div class="selectDiv" @click="changeSwitch('flip_type', 'left_and_right')">左右</div>
<div class="selectDiv" @click="changeSwitch('flip_type', 'up_and_down')">上下</div>
<div class="selectDiv" @click="changeSwitch('flip_type', 'center')">中心</div>
</div>
</template>
<span class="buttonSpan hmxzImg"><span style="margin-left:30px;">画面旋转</span></span>
@ -56,47 +62,47 @@
</template>
<script lang="ts" setup>
import CameraPreviewForm from './CameraPreviewForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
import CameraPreviewForm from './CameraPreviewForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('70%');
const visible = ref<boolean>(false);
const showCamera = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success', 'ok']);
const title = ref<string>('');
const width = ref<string>('70%');
const visible = ref<boolean>(false);
const showCamera = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success', 'ok']);
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '@/utils/http/axios';
import { useMessage } from '@/hooks/web/useMessage';
import { getValueType } from '@/utils';
import { Form } from 'ant-design-vue';
import {
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '@/utils/http/axios';
import { useMessage } from '@/hooks/web/useMessage';
import { getValueType } from '@/utils';
import { Form } from 'ant-design-vue';
import {
getImageCommon,
getMultitransUrl,
getPreviewUrl,
setImageCommon,
testAudio,
motionCtrl
} from "../camera.api";
} from "../camera.api";
const props = defineProps({
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true }
});
});
const formRef = ref();
const player = ref();
const resolution = ref<string>('流畅');
const izPlaying = ref<boolean>(true);
const izRecording = ref<boolean>(false);
const izPhone = ref<boolean>(false);
const fishEyeDisplayMode = ref<string>('ORIGIN');
const flipType = ref<string>('off');
const useForm = Form.useForm;
const formData = reactive<Record<string, any>>({
const formRef = ref();
const player = ref();
const resolution = ref<string>('流畅');
const izPlaying = ref<boolean>(true);
const izRecording = ref<boolean>(false);
const izPhone = ref<boolean>(false);
const fishEyeDisplayMode = ref<string>('ORIGIN');
const flipType = ref<string>('off');
const useForm = Form.useForm;
const formData = reactive<Record<string, any>>({
//
deviceIndex: '',//
@ -110,28 +116,28 @@
flip_type: '',// "off"// "left_and_right"// "up_and_down"// "center"//
zoom: 1, //
sliderValue : 1,//
ptz : 0,//
smartCode : 0,//
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
sliderValue: 1,//
ptz: 0,//
smartCode: 0,//
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
/**
/**
* 编辑
* @param record
*/
async function edit(record) {
async function edit(record) {
title.value = record.deviceName;
showCamera.value = true;
visible.value = true;
@ -139,11 +145,11 @@
registerForm.value.edit(record);
});
await nextTick(() => {
confirmLoading.value=true;
confirmLoading.value = true;
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
if (record.hasOwnProperty(key)) {
tmpData[key] = record[key]
}
})
@ -152,39 +158,39 @@
});
createPreview();
getSwitch();
}
/**
}
/**
* 确定按钮点击事件
*/
function handleOk() {
function handleOk() {
registerForm.value.submitForm();
}
}
/**
/**
* form保存回调事件
*/
function submitCallback() {
function submitCallback() {
handleCancel();
}
}
/**
/**
* 取消按钮回调事件
*/
function handleCancel() {
function handleCancel() {
visible.value = false;
nextTick(() => {
registerForm.value.destroy();
showCamera.value = false;
});
}
}
/**
/**
* 开始电话
*/
function startPhone(){
function startPhone() {
getMultitransUrl({
"videoDevId":formData.deviceIndex
}).then(res=>{
"videoDevId": formData.deviceIndex
}).then(res => {
player.value.startVoiceIntercom({
"url": res.url, // url
"wssUrl": res.wssUrl,
@ -192,29 +198,29 @@
});
izPhone.value = true;
});
}
}
/**
/**
* 结束电话
*/
function stopPhone(){
function stopPhone() {
player.value.stopVoiceIntercom();
izPhone.value = false;
}
}
/**
/**
* 创建预览
*/
async function createPreview(){
await getPreviewUrl({"deviceIndex":formData.deviceIndex,"streamType":formData.streamType}).then(res=>{
async function createPreview() {
await getPreviewUrl({ "deviceIndex": formData.deviceIndex, "streamType": formData.streamType }).then(res => {
formData.url = res.url;
formData.backupUrl = res.backupUrl;
formData.wsUrl = res.wsUrl;
formData.wssUrl = res.wssUrl;
confirmLoading.value=false;
confirmLoading.value = false;
});
if (player.value){
if (player.value) {
player.value.destroy().then(() => {
}); //
player.value = null;
@ -239,200 +245,224 @@
}
izPlaying.value = true;
}
}
}
/**
/**
* 切换超清/流程
*/
function switchResolution(){
if(formData.streamType == 0){
function switchResolution() {
if (formData.streamType == 0) {
resolution.value = '流畅';
formData.streamType = 1;
}else{
} else {
resolution.value = '超清';
formData.streamType = 0;
}
createMessage.info('正在切换至'+resolution.value);
createMessage.info('正在切换至' + resolution.value);
createPreview();
}
}
/**
/**
* 播放
*/
function play(){
function play() {
izPlaying.value = true;
player.value.play();
}
}
/**
/**
* 暂停
*/
function pause(){
function pause() {
izPlaying.value = false;
player.value.pause();
}
}
/**
/**
* 截屏
*/
function screenshot(){
function screenshot() {
player.value.screenshot();
}
}
/**
/**
* 鱼眼画面显示模式
*/
function setFishEyeDisplayMode(value){
function setFishEyeDisplayMode(value) {
player.value.setFishEyeDisplayMode(value);
}
}
/**
/**
* 获取画面翻转
*/
function getSwitch(){
if(formData.deviceIndex==null){
function getSwitch() {
if (formData.deviceIndex == null) {
return
}
getImageCommon({
"deviceIndex": formData.deviceIndex,
"type": "switch"
}).then(res=>{
}).then(res => {
formData.flip_type = res.flip_type; //
});
}
}
/**
/**
* 画面翻转
*/
function changeSwitch(attr,value){
function changeSwitch(attr, value) {
let param = {};
param[attr] = value;
setImageCommon({
"deviceIndex": formData.deviceIndex,
"type": "switch",
"param": param
}).then(res=>{ });
}
}).then(res => { });
}
/**
/**
* 手动报警
*/
function manualAlarm(){
function manualAlarm() {
let params = {
"deviceIndex": formData.deviceIndex,
"force": 1,
"id": '0'
};
testAudio(params);
}
}
/**
/**
* 开始录制
*/
function recordingStart(){
function recordingStart() {
izRecording.value = true;
player.value.startRecording({micStream:true}).then((res) => {
player.value.startRecording({ micStream: true }).then((res) => {
// resolve
}).catch((errData) => {
//
// errData.error_code
createMessage.error('录制错误,'+errData.msg);
createMessage.error('录制错误,' + errData.msg);
});
}
}
/**
/**
* 结束录制
*/
function recordingEnd(){
function recordingEnd() {
izRecording.value = false;
let fileName = formData.deviceIndex+'-'+(new Date().getTime());
let fileName = formData.deviceIndex + '-' + (new Date().getTime());
player.value.stopRecording(fileName, true).then((res) => {
// resolve
}).catch((errData) => {
//
// errData.error_code
createMessage.error('录制错误,'+errData.msg);
createMessage.error('录制错误,' + errData.msg);
});
}
}
defineExpose({
defineExpose({
edit,
disableSubmit,
});
});
</script>
<style lang="less">
/**隐藏样式-modal确定按钮 */
.jee-hidden {
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
}
.ant-modal-body {
.ant-modal-body {
height: auto !important;
overflow: hidden !important;
}
}
</style>
<style lang="less" scoped>
.selectDiv{
.selectDiv {
text-align: center;
border: 1px solid #f6faff;
border: 1px solid white;
padding: 3px 10px;
width: 100px;
margin-top:5px;
}
.selectDiv:hover{
border: 1px solid #a2a3a3;
background: #a2a3a3;
color:white;
margin-top: 5px;
}
.selectDiv:hover {
border: 1px solid #f4f5fa;
background: #f4f5fa;
color: #037FEA;
border-radius: 10px;
cursor: pointer;
}
.buttonSpan{
}
.buttonSpan {
display: inline-flex;
align-items: flex-end;
margin-left: 20px;
//border: 1px solid #f6faff;
padding: 6px 6px;
}
.djImg{
}
.buttonSpan:hover {
//border: 1px solid #1ea0fa;
color: #1ea0fa;
border-radius: 10px;
cursor: pointer;
}
.djImg {
background: url('../../../../../assets/iot/monitor_1.png') left/contain no-repeat;
}
.djImg:hover{
}
.djImg:hover {
background: url('../../../../../assets/iot/monitor_1_1.png') left/contain no-repeat;
}
.qxdImg{
}
.qxdImg {
background: url('../../../../../assets/iot/monitor_5.png') left/contain no-repeat;
}
.qxdImg:hover{
}
.qxdImg:hover {
background: url('../../../../../assets/iot/monitor_5_1.png') left/contain no-repeat;
}
.lzImg{
}
.lzImg {
background: url('../../../../../assets/iot/monitor_4.png') left/contain no-repeat;
}
.lzImg:hover{
}
.lzImg:hover {
background: url('../../../../../assets/iot/monitor_4_1.png') left/contain no-repeat;
}
.jtImg{
}
.jtImg {
background: url('../../../../../assets/iot/monitor_3.png') left/contain no-repeat;
}
.jtImg:hover{
}
.jtImg:hover {
background: url('../../../../../assets/iot/monitor_3_1.png') left/contain no-repeat;
}
.bjImg{
}
.bjImg {
background: url('../../../../../assets/iot/monitor_8.png') left/contain no-repeat;
}
.bjImg:hover{
}
.bjImg:hover {
background: url('../../../../../assets/iot/monitor_8_1.png') left/contain no-repeat;
}
.fpImg{
}
.fpImg {
background: url('../../../../../assets/iot/monitor_6.png') left/contain no-repeat;
}
.fpImg:hover{
}
.fpImg:hover {
background: url('../../../../../assets/iot/monitor_6_1.png') left/contain no-repeat;
}
.hmxzImg{
}
.hmxzImg {
background: url('../../../../../assets/iot/monitor_7.png') left/contain no-repeat;
}
.hmxzImg:hover{
}
.hmxzImg:hover {
background: url('../../../../../assets/iot/monitor_7_1.png') left/contain no-repeat;
}
}
</style>