修改bug

index.html

@@ -156,9 +156,9 @@
       <div class="app-loading">
         <div class="app-loading-wrap">
           <img src="<%= basePublicPath %>/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
-          <div class="app-loading-title"><%= title %></div>
+          <!-- <div class="app-loading-title"><%= title %></div> -->
-          <div class="app-loading-dots">
+          <div class="app-loading-dots" style="margin-top: -165px;">
-            <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
+            <span class="dot dot-spin" style="width:140px;height: 140px;"><i></i><i></i><i></i><i></i><i></i><i></i></span>
           </div>
         </div>
       </div>
@@ -166,7 +166,7 @@
     <script type="module" src="/src/main.ts"></script>
     <script src="/static/tums-player/tums-player.umd.min.js"></script>
     <!-- 百度统计 -->
-    <script>
+    <!-- <script>
       var _hmt = _hmt || [];
       (function () {
         var hm = document.createElement('script');
@@ -174,8 +174,8 @@
         var s = document.getElementsByTagName('script')[0];
         s.parentNode.insertBefore(hm, s);
       })();
-    </script>
+    </script> -->
     <!-- 腾讯地图 -->
-    <script src="https://map.qq.com/api/gljs?v=1.exp&key=2E6BZ-ZC3E3-BMX3D-OWFUI-FLY2F-MLFFJ"></script>
+    <!-- <script src="https://map.qq.com/api/gljs?v=1.exp&key=2E6BZ-ZC3E3-BMX3D-OWFUI-FLY2F-MLFFJ"></script> -->
   </body>
 </html>

src/components/Form/src/jeecg/components/JImageUpload.vue

@@ -255,10 +255,21 @@
       /**
        * 预览图片
        */
-      function handlePreview(file) {
+      async function handlePreview(file) {
-        previewImage.value = file.url || file.thumbUrl;
+        if (!file.url && !file.preview) {
+          file.preview = (await getBase64(file.originFileObj)) as string;
+        }
+        previewImage.value = file.url || file.preview;
         previewVisible.value = true;
       }
+      function getBase64(file: File) {
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader();
+          reader.readAsDataURL(file);
+          reader.onload = () => resolve(reader.result);
+          reader.onerror = error => reject(error);
+        });
+      }
 
       function getAvatarView() {
         if (uploadFileList.length > 0) {

src/components/Icon/src/IconList.vue

@@ -71,7 +71,7 @@
       //每页条数
       const pageSize = ref<number>(140);
       //下拉分页显示
-      const pageSizeOptions = ref<any>(['10', '20', '50', '100', '140']);
+      const pageSizeOptions = ref<any>(['15', '50', '80', '100']);
       //下拉搜索值
       const searchIconValue = ref<string>('');
       const { clipboardRef, isSuccessRef } = useCopyToClipboard(props.value);

src/utils/midiaManage/MediaResourcePicker.vue

@@ -120,7 +120,7 @@ const pagination = reactive({
   total: 0,
   showSizeChanger: true,
   showQuickJumper: true,
-  pageSizeOptions: ['10', '20', '30', '50'],
+  pageSizeOptions: ['15', '50', '80', '100'],
   showTotal: total => `共 ${total} 条`
 });
 

src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue

@@ -59,7 +59,7 @@
     </div>
     <div>
         <div style="width:300px;float: left;">
-          <div style="background: white; border-radius: 8px;padding: 8px;margin-right: 8px;min-height: 400px;">
+          <div style="background: white; border-radius: 8px;padding: 8px;margin-right: 8px;height: 740px;overflow-y:auto;">
             <div style="text-align: right;">
               <a-radio-group v-model:value="treeParam.izEnabled" @change="getTreeData">
                 <a-radio-button value="">全部</a-radio-button>

src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue

@@ -4,17 +4,17 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialInfoForm">
           <a-row>
-						<a-col :span="8" >
+						<a-col :span="8" hidden>
 							<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialInfoForm-categoryId" name="categoryId">
                 <j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  allow-clear @change="formData.typeId = null , formData.medicationId = null" disabled/>
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" >
+						<a-col :span="8" hidden>
 							<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialInfoForm-typeId" name="typeId">
                 <j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null" disabled  allow-clear />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" >
+						<a-col :span="8" hidden>
 							<a-form-item label="三级分类" v-bind="validateInfos.medicationId" id="ConfigMaterialInfoForm-medicationId" name="medicationId">
                 <j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类"  allow-clear disabled />
 							</a-form-item>

src/views/services/serviceDirective/ConfigServiceDirectiveList.vue

@@ -333,8 +333,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     scroll: { y: '58vh' },
     pagination: {
       current: 1,
-      pageSize: 10,
+      pageSize: 15,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
     },
     actionColumn: {
       width: 70,

src/views/services/serviceDirective/components/DirectiveRespositoryList.vue

@@ -140,8 +140,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     scroll: { y: '58vh' },
     pagination: {
       current: 1,
-      pageSize: 10,
+      pageSize: 15,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
     },
     actionColumn: {
       width: 200,