修改bug

This commit is contained in:
yangjun 2026-03-19 14:25:31 +08:00
parent fee3cb60f7
commit 173b328bc9
10 changed files with 54 additions and 31 deletions

View File

@ -15,7 +15,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('70vw');
const width = ref<string>('1200');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

View File

@ -275,6 +275,23 @@
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane key="7" tab="头像">
<a-row>
<a-col :span="24" v-if="!!formData.headPath">
<a-form-item label="头像" v-bind="validateInfos.headPath" id="BizEmployeesInfoForm-headPath"
name="headPath" :labelCol="labelCol3">
<j-image-upload text="无" :fileMax="1" :bizPath="`employeesZzxx`"
:value="opeMediaAddress + (!formData.headPath ? mrtxPic : formData.headPath)"
disabled></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="24" v-else>
<div style="display: flex; flex-direction: column; align-items: center; width: 100%;">
<img :src="opeMediaAddress + defaultPrePic" style="height: 150px; margin-bottom: 8px;" />
</div>
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>
</a-col>
</a-row>
@ -333,6 +350,7 @@ const props = defineProps({
});
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const defaultPrePic = import.meta.env.VITE_DEFAULT_ZANWUZHENGJIAN_PIC//
const mrtxPic = import.meta.env.VITE_DEFAULT_MORENTOUXIANG_PIC//
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);

View File

@ -272,15 +272,19 @@
</a-tab-pane>
<a-tab-pane key="7" tab="头像">
<a-row>
<a-col :span="24">
<a-col :span="24" v-if="!!formData.headPath">
<a-form-item label="头像" v-bind="validateInfos.headPath" id="BizEmployeesInfoForm-headPath"
name="headPath" :labelCol="labelCol3">
<j-image-upload v-if="!!formData.headPath" text="无" :fileMax="1" :bizPath="`employeesZzxx`"
:value="!formData.headPath ? opeMediaAddress + mrtxPic : formData.headPath"
<j-image-upload text="无" :fileMax="1" :bizPath="`employeesZzxx`"
:value="opeMediaAddress + (!formData.headPath ? mrtxPic : formData.headPath)"
disabled></j-image-upload>
<span v-else>未上传</span>
</a-form-item>
</a-col>
<a-col :span="24" v-else>
<div style="display: flex; flex-direction: column; align-items: center; width: 100%;">
<img :src="opeMediaAddress + defaultPrePic" style="height: 150px; margin-bottom: 8px;" />
</div>
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>

View File

@ -8,6 +8,16 @@
:formBpm="false">
</BizEmployeesInfoForm>
</a-drawer>
<!-- 接单配额 -->
<a-drawer :title="title" width="600px" :visible="jdpevisible" :closable="true" :footer-style="{ textAlign: 'right' }"
:bodyStyle="{ padding: '14px' }" @close="handleCancel">
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
</template>
<BizEmployeesInfoForm v-if="jdpevisible" ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit"
:formBpm="false">
</BizEmployeesInfoForm>
</a-drawer>
</template>
<script lang="ts" setup>
@ -18,6 +28,7 @@ import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('90%');
const visible = ref<boolean>(false);
const jdpevisible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
@ -47,7 +58,7 @@ function edit(record) {
function editJdpe(record) {
title.value = '接单配额';
visible.value = true;
jdpevisible.value = true;
nextTick(() => {
registerForm.value.editJdpe(record);
});
@ -73,6 +84,7 @@ function submitCallback() {
*/
function handleCancel() {
visible.value = false;
jdpevisible.value = false;
}
defineExpose({

View File

@ -16,7 +16,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('1600px');
const width = ref<string>('1400px');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

View File

@ -16,7 +16,7 @@
<j-dict-select-tag v-model:value="queryParam.areaFlag" dictCode="nu_type" placeholder="请选择区域属性" allow-clear @change="changeAreaFlag" />
</a-form-item>
</a-col>
<a-col :lg="5">
<!-- <a-col :lg="5">
<a-form-item name="status">
<template #label><span title="区域状态">区域状态</span></template>
<a-select placeholder="请选择区域状态" v-model:value="queryParam.status" allow-clear v-if="queryParam.areaFlag == '1'">
@ -35,8 +35,8 @@
<a-select-option value="5">停用</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="9" :md="9" :sm="24">
</a-col> -->
<a-col :lg="14" :md="14" :sm="24">
<span style="float: right; overflow: hidden" class="table-page-search-submitButtons">
<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>
@ -73,23 +73,12 @@
<p style="margin-top: -10px;"><span v-if="item.areaFlag=='3'">负责人{{item.fzr_dictText}}</span>&nbsp;</p>
<div style=" margin-top: 10px;height: 60px;display: flex;flex-wrap: wrap;">
<div style="line-height: 30px;">
<!-- <a-popover title="二维码" >
<template #content>
<QRCodeWithLogo
:text="item.nuId"
:logoUrl="logoUrl"
:size="150"
:logoSize="40"
/>
</template>
<a-button type="dashed" size="small" style="margin-right:10px;width:71px;"> 二维码</a-button>
</a-popover> -->
<a-button type="dashed" size="small" @click="handleEwm(item)" style="margin-right:10px;width:71px;">二维码</a-button>
<a-button type="dashed" size="small" @click="handleEdit(item)" style="margin-right:10px">区域名称</a-button>
<a-button type="dashed" size="small" @click="handleWlsb(item)" style="margin-right:10px" >设备管理</a-button>
<a-button type="dashed" size="small" @click="handlePerssion(item)" style=" margin-right:10px" >区域功能</a-button>
<a-button type="dashed" size="small" @click="handleKgxx(item)" style="margin-right:10px" v-if="item.areaFlag=='3'">库管信息</a-button>
<a-button type="dashed" size="small" @click="handleWlgl(item)" style=" margin-right:10px" v-if="item.areaFlag=='3'">物料管理</a-button>
<!-- <a-button type="dashed" size="small" @click="handleKgxx(item)" style="margin-right:10px" v-if="item.areaFlag=='3'">库管信息</a-button>
<a-button type="dashed" size="small" @click="handleWlgl(item)" style=" margin-right:10px" v-if="item.areaFlag=='3'">物料管理</a-button> -->
</div>
</div>

View File

@ -41,7 +41,7 @@
<a-col :span="12" style="margin-top: -11px;text-align:right;">
<span v-if="item.maintainStatus == 0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus == 1" style="font-weight:700;font-size:16px;color:red;">损坏</span>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">设备状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
@ -100,7 +100,7 @@
<a-col :span="12" style="margin-top: 0px;text-align:right;">
<span v-if="item.maintainStatus == 0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus == 1" style="font-weight:700;font-size:16px;color:red;">损坏</span>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">设备状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
@ -172,7 +172,7 @@
<a-col :span="12" style="margin-top: 0px;text-align:right;">
<span v-if="item.maintainStatus == 0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus == 1" style="font-weight:700;font-size:16px;color:red;">损坏</span>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">设备状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
@ -235,7 +235,7 @@
<a-col :span="24" style="padding: 12px 0 0 5px;margin-top:10px;">
<a-row>
<a-col :span="11" style="text-align: center;">
<span><img src="../../../../assets/iot/a8.png" style="width:25px;margin-top: -1px;" /></span>
<span><img src="../../../../assets/iot/a8.png" style="width:25px;margin-top: -14px;" /></span>
<span style="font-size: 30px;font-weight:700;">{{ item.temperature ? item.temperature : '-' }}</span>
<span style="font-size: 16px;"></span>
</a-col>
@ -255,7 +255,7 @@
<a-col :span="12" style="margin-top: 10px;text-align:right;">
<span v-if="item.maintainStatus == 0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus == 1" style="font-weight:700;font-size:16px;color:red;">损坏</span>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">设备状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />

View File

@ -17,7 +17,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(800);
const width = ref<number>(600);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

View File

@ -16,7 +16,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('80%');
const width = ref<string>('1400');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

View File

@ -66,7 +66,7 @@ import CameraPreviewForm from './CameraPreviewForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('70%');
const width = ref<string>('1300');
const visible = ref<boolean>(false);
const showCamera = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);