修改弹出层样式，改成抽屉样式

src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuIssueInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIssueInfoForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +15,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('70%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/admin/IssueInfo/components/IssueInfoModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuIssueInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIssueInfoForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +15,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('70%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/admin/appVersionConfig/AppVersionConfigList.vue

@@ -38,27 +38,10 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button>批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)"  />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
         <template v-if="column.dataIndex === 'versionUrl'">
@@ -99,7 +82,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right',
     },
     beforeFetch: async (params) => {
@@ -195,14 +178,6 @@ function getTableAction(record) {
       label: '编辑',
       onClick: handleEdit.bind(null, record)
     },
-  ];
-}
-
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
@@ -214,6 +189,14 @@ function getDropDownAction(record) {
         placement: 'topLeft',
       }
     }
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
   ]
 }
 

src/views/admin/appVersionConfig/components/AppVersionConfigModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <AppVersionConfigForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AppVersionConfigForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +15,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('70%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/admin/workorder/components/WorkOrderModal.vue

@@ -1,21 +1,51 @@
 <template>
-  <j-modal :title="title" :width="'70vw'" :visible="visible" @ok="handleOk"
+  <!-- <j-modal :title="title" :width="'70vw'" :visible="visible" @ok="handleOk"
     :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  </j-modal> -->
+
+  
+  <a-drawer :title="title" :width="'70vw'"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <WorkOrderForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </WorkOrderForm>
-  </j-modal>
+    <template #footer>
-  <j-modal title="机构详情" :width="'70vw'" :visible="orgDetailVisible" @cancel="handleOrgDetailCancel">
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
+
+
+  <!-- <j-modal title="机构详情" :width="'70vw'" :visible="orgDetailVisible" @cancel="handleOrgDetailCancel">
     <template #footer>
       <a-button @click="handleOrgDetailCancel">关闭</a-button>
     </template>
+  </j-modal> -->
+
+  
+  <a-drawer :title="`机构详情`" :width="'70vw'"  v-model:visible="orgDetailVisible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleOrgDetailCancel">
     <OrgInfoForm ref="orgDetailRef" :formDisabled="true" :formBpm="false" />
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleOrgDetailCancel">关闭</a-button>
+    </template>
+  </a-drawer>
+
+
   <j-modal title="反馈" :width="'70vw'" :visible="orgFankuiVisible"  @ok="handleFankuiOk" @cancel="handleOrgFankuiCancel" cancelText="关闭">
     <!-- <template #footer>
       <a-button @click="handleOrgFankuiCancel">关闭</a-button>
     </template> -->
-    <WorkOrderFankui ref="orgFankuiRef" :formDisabled="false" @ok="handleOrgFankuiFankuiCancel" :formBpm="false" />
   </j-modal>
+
+  
+  <a-drawer :title="`反馈`" :width="'70vw'"  v-model:visible="orgFankuiVisible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleOrgFankuiCancel">
+    <WorkOrderFankui ref="orgFankuiRef" :formDisabled="false" @ok="handleOrgFankuiFankuiCancel" :formBpm="false" />
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleOrgFankuiCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!handleFankuiOk">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>

src/views/iot/baseIot/compoents/DbModal.vue

@@ -1,7 +1,13 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" okText="同步" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <DbForm ref="registerForm" @ok="submitCallback"></DbForm>
-  </j-modal>
+    <ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>

src/views/iot/baseIot/compoents/SbModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" okText="同步" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <SbForm ref="registerForm" @ok="submitCallback"></SbForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>

src/views/iot/baseIot/compoents/SxtModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" okText="同步" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <SxtForm ref="registerForm" @ok="submitCallback"></SxtForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>

src/views/iot/baseIot/compoents/WsdModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" okText="同步" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <WsdForm ref="registerForm" @ok="submitCallback"></WsdForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>

src/views/iot/tplink/camera/components/CameraPictureConfigModal.vue

@@ -1,7 +1,14 @@
 <template>
-  <j-modal :title="title" :width="width" :fullscreen="true" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <!-- <j-modal :title="title" :width="width" :fullscreen="true" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  </j-modal> -->
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <CameraPictureConfig ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CameraPictureConfig>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>

src/views/iot/tq/electricity/apilog/ApiLogModal.vue

@@ -1,7 +1,14 @@
 <template>
-  <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <DepartUtilsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DepartUtilsList>
-  </j-modal>
+    <ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +17,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue

@@ -1,7 +1,13 @@
 <template>
-  <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <WaterApiLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WaterApiLogList>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +16,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/iot/tq/electricity/index.vue

@@ -84,7 +84,7 @@ import { defHttp } from '/@/utils/http/axios';
         //labelWidth: 120,
         schemas: searchFormSchema,
         autoSubmitOnEnter:true,
-        showAdvancedButton:true,
+        showAdvancedButton:false,
         fieldMapToNumber: [
         ],
         fieldMapToTime: [

src/views/iot/tq/water/index.vue

@@ -94,7 +94,7 @@
         //labelWidth: 120,
         schemas: searchFormSchema,
         autoSubmitOnEnter:true,
-        showAdvancedButton:true,
+        showAdvancedButton:false,
         fieldMapToNumber: [
         ],
         fieldMapToTime: [

src/views/iot/yiweilian/components/ApiLogAlarmModal.vue

@@ -1,7 +1,15 @@
 <template>
-  <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  </j-modal> -->
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <ApiLogAlarmList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiLogAlarmList>
-  </j-modal>
+    <ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +18,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();