[Fix 0000] 修复粉尘监测报表录入无法正确获取到表单配置的问题

src/layouts/default/setting/handler.ts

@@ -160,7 +160,6 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
 
     // ============header==================
     case HandlerEnum.HEADER_THEME:
-      console.log('debug here');
       updateHeaderBgColor(value);
       return { headerSetting: { bgColor: value } };
 

src/views/vent/home/configurable/components/preset/MeasureDetail.vue

@@ -54,7 +54,6 @@
   watch(
     () => props.compositeData,
     (newS) => {
-      console.log('debug', newS);
       selectData.value = newS;
     },
     {

src/views/vent/monitorManager/alarmMonitor/common/closeWall.vue

@@ -42,10 +42,10 @@
       </div>
       <div class="pl-10px pr-10px">
         <div class="mb-10px">
-          <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">启动注氮机</AButton>
+          <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">应急启动</AButton>
         </div>
         <div>
-          <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">关闭注氮机</AButton>
+          <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">应急关闭</AButton>
         </div>
       </div>
     </div>
@@ -403,6 +403,7 @@
     const passWord = ref('');
     Modal.confirm({
       title: '是否确认执行该操作？',
+      maskClosable: true,
       content: () => {
         return h(Input, {
           placeholder: '请输入密码',

src/views/vent/monitorManager/comment/components/DeviceBaseInfo.vue

@@ -11,7 +11,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineEmits, onUnmounted, watch, PropType, nextTick, computed } from 'vue';
+  import { onMounted, ref, defineEmits, onUnmounted, watch, computed } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { FormSchema } from '/@/components/Form';
@@ -22,10 +22,10 @@
 
   const emit = defineEmits(['close', 'register']);
   const props = defineProps({
-    formSchema: {
-      type: Array as PropType<FormSchema[]>,
-      default: () => [],
-    },
+    // formSchema: {
+    //   type: Array as PropType<FormSchema[]>,
+    //   default: () => [],
+    // },
     deviceType: {
       type: String,
       default: '',
@@ -33,9 +33,9 @@
   });
   const FormRef = ref();
   const tabType = ref('deviceInfo');
-  const formSchema = ref<FormSchema[]>([]);
+  const formSchema = ref<Array<FormSchema>>([]);
   const formData = ref({});
-  const deviceTypeName = ref('');
+  // const props.deviceType ref('');
   const deviceType = computed(() => props.deviceType);
 
   // const arrToFormColumns = (tableHeaderColumns = [], devicetype) => {
@@ -288,14 +288,14 @@
   });
 
   const [registerForm, { resetSchema, getFieldsValue, setFieldsValue, resetFields }] = useForm({
-    schemas: <FormSchema[]>formSchema.value,
+    schemas: formSchema.value,
     showActionButtonGroup: false,
   });
 
   function getColumns() {
-    let formSchemaArr = getFormSchemaColumns(tabType.value === 'deviceInfo' ? `${deviceTypeName.value}_edit` : `${deviceTypeName.value}_input`) || [];
+    let formSchemaArr = getFormSchemaColumns(tabType.value === 'deviceInfo' ? `${props.deviceType}_edit` : `${props.deviceType}_input`) || [];
     if (formSchemaArr && formSchemaArr.length < 1) {
-      const arr = deviceTypeName.value.split('_');
+      const arr = props.deviceType.split('_');
       formSchemaArr = getFormSchemaColumns(tabType.value === 'deviceInfo' ? arr[0] + '_edit' : arr[0] + '_input') || [];
     }
     arrToFormColumns(formSchemaArr);
@@ -303,8 +303,7 @@
 
   watch(
     () => props.deviceType,
-    (devicetype) => {
-      deviceTypeName.value = devicetype;
+    () => {
       getColumns();
       if (FormRef.value) resetSchema(formSchema.value);
     }

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -570,7 +570,7 @@
   import gaspatrolTable from '../../../comment/gaspatrolTable.vue';
   import dustMonitorTable from '../../../comment/dustMonitorTable.vue';
   import bundleMonitorTable from '../../../comment/bundleMonitorTable.vue';
-  import DustingTable from '../../../comment/dustingTable.vue';
+  import DustingTable from '../../../comment/DustingTable.vue';
   import bundleSpyMonitorTable from '../../../comment/bundleSpyMonitorTable.vue';
   import HistoryBall from './modal/history-ball.vue';
   import { TreeProps, message, Progress, Input, Select } from 'ant-design-vue';