[Fix 0000] 修复瓦斯巡检的部分问题

src/views/vent/gas/gasInspect/gasInspect.data.ts

@@ -305,7 +305,11 @@ export const taskschemas: FormSchema[] = [
   {
     label: '任务班次',
     field: 'classType',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'classType',
+      placeholder: '请选择任务班次',
+    },
   },
 ];
 

src/views/vent/gas/gasInspect/index2.vue

@@ -39,7 +39,7 @@
           </template>
         </BasicTable>
       </BasicModal>
-      <BasicModal :destroy-on-close="true" :width="1200" :show-ok-btn="false" @register="registerModal3">
+      <BasicModal :destroy-on-close="true" title="任务管理列表" :width="1200" :show-ok-btn="false" @register="registerModal3">
         <a-space class="search-area mb-10px">
           <div class="item-text">巡检地址：</div>
           <a-input style="width: 240px" v-model:value="searchParams3.deviceName" placeholder="请输入巡检地址" />

src/views/vent/gas/gasInspectNonfc/components/addressAdd2.vue

@@ -15,17 +15,17 @@
       </a-form-item>
     </a-form>
     <div class="edit-btn">
-      <a-button type="primary" @click="confirmAddress">确定</a-button>
       <a-button @click="cancelAddress">取消</a-button>
+      <a-button type="primary" @click="confirmAddress">确定</a-button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-  import { reactive, onMounted } from 'vue';
+  import { ref, onMounted } from 'vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
-  let formAddress = reactive<any>({
+  let formAddress = ref<any>({
     insType: '',
     strremark: '',
     strinstallpos: '',
@@ -35,11 +35,14 @@
 
   //确定
   let confirmAddress = () => {
-    $emit('confirmAddress', formAddress);
+    $emit('confirmAddress', {
+      ...formAddress.value,
+      isSensor: formAddress.value.isSensor ? '1' : '0',
+    });
   };
   //取消
   let cancelAddress = () => {
-    formAddress = {
+    formAddress.value = {
       insType: '',
       strremark: '',
       strinstallpos: '',

src/views/vent/gas/gasInspectNonfc/components/inspectEdit2.vue

@@ -18,14 +18,14 @@
       </a-form-item>
     </a-form>
     <div class="edit-btn">
-      <a-button type="primary" @click="confirmEdit">提交</a-button>
       <a-button @click="cancelEdit">取消</a-button>
+      <a-button type="primary" @click="confirmEdit">提交</a-button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-  import { ref, reactive, onMounted, watch } from 'vue';
+  import { ref, onMounted, watch } from 'vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { queryAllDisTeam } from '../gasInspectNonfc.api';
 
@@ -38,7 +38,7 @@
     },
   });
 
-  let formStateEdit = reactive<any>({
+  let formStateEdit = ref<any>({
     id: '',
     strinstallpos: '',
     isSensor: false,
@@ -63,11 +63,14 @@
   }
   //编辑提交
   let confirmEdit = () => {
-    $emit('confirmEdit', formStateEdit);
+    $emit('confirmEdit', {
+      ...formStateEdit.value,
+      isSensor: formStateEdit.value.isSensor ? '1' : '0',
+    });
   };
   //编辑取消
   let cancelEdit = () => {
-    formStateEdit = {
+    formStateEdit.value = {
       id: '',
       strinstallpos: '',
       isSensor: false,
@@ -79,7 +82,10 @@
   watch(
     () => props.inspectEditData,
     (newV) => {
-      formStateEdit = Object.assign({}, newV);
+      formStateEdit.value = {
+        ...newV,
+        isSensor: newV.isSensor == '1',
+      };
     },
     { immediate: true }
   );