Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

index.html

@@ -25,157 +25,7 @@
       })();
     </script>
     <div id="app">
-      <style>
-        html[data-theme='dark'] .app-loading {
-          background-color: #2c344a;
-        }
-
-        html[data-theme='dark'] .app-loading .app-loading-title {
-          color: rgba(255, 255, 255, 0.85);
-        }
-
-        .app-loading {
-          display: flex;
-          width: 100%;
-          height: 100%;
-          justify-content: center;
-          align-items: center;
-          flex-direction: column;
-          background-color: #f4f7f9;
-        }
-
-        .app-loading .app-loading-wrap {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          display: flex;
-          -webkit-transform: translate3d(-50%, -50%, 0);
-          transform: translate3d(-50%, -50%, 0);
-          justify-content: center;
-          align-items: center;
-          flex-direction: column;
-        }
-
-        .app-loading .dots {
-          display: flex;
-          padding: 98px;
-          justify-content: center;
-          align-items: center;
-        }
-
-        .app-loading .app-loading-title {
-          display: flex;
-          margin-top: 10px;
-          margin-bottom: 20px;
-          font-size: 30px;
-          color: rgba(0, 0, 0, 0.85);
-          justify-content: center;
-          align-items: center;
-        }
-
-        .app-loading .app-loading-logo {
-          display: block;
-          width: 90px;
-          margin: 0 auto;
-          margin-bottom: 20px;
-        }
-
-        .dot {
-          position: relative;
-          display: inline-block;
-          width: 48px;
-          height: 48px;
-          margin-top: 30px;
-          font-size: 32px;
-          transform: rotate(45deg);
-          box-sizing: border-box;
-          animation: antRotate 1.2s infinite linear;
-        }
-
-        .dot i {
-          position: absolute;
-          display: block;
-          width: 20px;
-          height: 20px;
-          background-color: #0065cc;
-          border-radius: 100%;
-          opacity: 0.3;
-          transform: scale(0.75);
-          animation: antSpinMove 1s infinite linear alternate;
-          transform-origin: 50% 50%;
-        }
-
-        .dot i:nth-child(1) {
-          top: 0;
-          left: 0;
-        }
-
-        .dot i:nth-child(2) {
-          top: 0;
-          right: 0;
-          -webkit-animation-delay: 0.4s;
-          animation-delay: 0.4s;
-        }
-
-        .dot i:nth-child(3) {
-          right: 0;
-          bottom: 0;
-          -webkit-animation-delay: 0.8s;
-          animation-delay: 0.8s;
-        }
-
-        .dot i:nth-child(4) {
-          bottom: 0;
-          left: 0;
-          -webkit-animation-delay: 1.2s;
-          animation-delay: 1.2s;
-        }
-        @keyframes antRotate {
-          to {
-            -webkit-transform: rotate(405deg);
-            transform: rotate(405deg);
-          }
-        }
-        @-webkit-keyframes antRotate {
-          to {
-            -webkit-transform: rotate(405deg);
-            transform: rotate(405deg);
-          }
-        }
-        @keyframes antSpinMove {
-          to {
-            opacity: 1;
-          }
-        }
-        @-webkit-keyframes antSpinMove {
-          to {
-            opacity: 1;
-          }
-        }
-      </style>
-      <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-dots">
-            <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
-          </div>
-        </div>
-      </div>
     </div>
     <script type="module" src="/src/main.ts"></script>
-    <script src="/static/tums-player/tums-player.umd.min.js"></script>
-    <!-- 百度统计 -->
-    <script>
-      var _hmt = _hmt || [];
-      (function () {
-        var hm = document.createElement('script');
-        hm.src = 'https://hm.baidu.com/hm.js?0febd9e3cacb3f627ddac64d52caac39';
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(hm, s);
-      })();
-    </script>
-    <!-- 腾讯地图 -->
-    <script src="https://map.qq.com/api/gljs?v=1.exp&key=2E6BZ-ZC3E3-BMX3D-OWFUI-FLY2F-MLFFJ"></script>
   </body>
 </html>

src/components/Application/src/AppLogo.vue

@@ -3,7 +3,7 @@
  * @Description: logo component
 -->
 <template>
-  <div class="anticon" :class="getAppLogoClass" @click="goHome" style="background: #e3f6fc;text-align: center;">
+  <div class="anticon" :class="getAppLogoClass" @click="goHome" style="background: #ceeef7;text-align: center;">
     <img src="../../../assets/images/logo.png" />
     <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
       {{ shortTitle }}
@@ -92,7 +92,4 @@
     }
   }
   
-  .advisoryClass{
-    background-image: url(/@/assets/images/bj.png);
-  }
 </style>

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

@@ -42,7 +42,6 @@
     :bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }"
     :footer="null"
     @cancel="handleCancel"
-    :style="{ maxWidth: '90vw' }"
   >
     <img
       ref="previewImgRef"
@@ -256,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/components/Modal/src/index.less

@@ -27,6 +27,11 @@
   }
 }
 
+.ant-drawer-body {
+  // background: url(../resource/img/modalback.png);
+  
+  background: linear-gradient(135deg, #f6faff 0%, #f1f7ff 100%);
+}
 .ant-modal {
   width: 520px;
   padding-bottom: 0;
@@ -47,9 +52,11 @@
 
   .ant-modal-body {
     padding: 0;
-    background: url(../resource/img/modalback.png);
+    
-    background-repeat: no-repeat;
+    background: linear-gradient(135deg, #f6faff 0%, #f1f7ff 100%);
-    background-size: cover;
+    // background: url(../resource/img/modalback.png);
+    // background-repeat: no-repeat;
+    // background-size: cover;
 
     > .scrollbar > .scrollbar__bar.is-horizontal {
       display: none;

src/components/Table/src/BasicTable.vue

@@ -273,7 +273,7 @@
           ...unref(getProps),
           ...unref(getHeaderProps),
           scroll: unref(getScrollRef),
-          loading: unref(getLoading),
+          loading: false,
           tableLayout: 'fixed',
           rowSelection: unref(getRowSelectionRef),
           rowKey: unref(getRowKey),

src/layouts/default/header/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Header :class="getHeaderClass" style="background-image: url('../resource/img/bj.png');">
+  <Header :class="getHeaderClass"  class="headClass">
     <!-- left start -->
     <div :class="`${prefixCls}-left`" >
       <!-- logo -->
@@ -11,7 +11,7 @@
       />
       <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
       <!-- 欢迎语 -->
-      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background: #e3f6fc !important;" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> {{t('layout.header.welcomeIn')}} {{ title }} </span>
+      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background: #ceeef7 !important;" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> {{t('layout.header.welcomeIn')}} {{ title }} </span>
     </div>
     <!-- left end -->
 
@@ -261,4 +261,10 @@
   border-bottom: 0px;
   border-left: 0px;
 }
+.headClass{
+  background-image: url('../resource/img/bj.png')  !important;
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+  background-color: #e5f5f9 !important;
+}
 </style>

src/main.ts

@@ -68,7 +68,7 @@ async function bootstrap(props?: MainAppProps) {
   registerGlobComp(app);
 
   //CAS单点登录
-  await useSso().ssoLogin();
+  // await useSso().ssoLogin();
 
   // 配置路由
   setupRouter(app);
@@ -83,10 +83,10 @@ async function bootstrap(props?: MainAppProps) {
   setupErrorHandle(app);
 
   // 注册第三方组件
-  await registerThirdComp(app);
+  // await registerThirdComp(app);
 
   // 当路由准备好时再执行挂载( https://next.router.vuejs.org/api/#isready)
-  await router.isReady();
+  // await router.isReady();
 
   // 挂载应用
   app.mount(getMountContainer(props), true);

src/settings/componentSetting.ts

@@ -18,7 +18,7 @@ export default {
       totalField: 'total',
     },
     // 可选的分页选项
-    pageSizeOptions: ['10', '50', '80', '100'],
+    pageSizeOptions: ['15', '50', '80', '100'],
     // 表格默认尺寸
     defaultSize: 'middle',
     //默认每页显示多少条

src/utils/midiaManage/MediaResourcePicker.vue

@@ -117,7 +117,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/admin/orgapplyinfo/OrgApplyInfoList.vue

@@ -369,8 +369,3 @@ async function setRangeQuery() {
   display: none !important;
 }
 </style>
-<style lang="less">
-.ant-drawer-body {
-      background: url(../resource/img/modalback.png);
-}
-</style>

src/views/services/serviceDirective/ConfigServiceDirectiveList.vue

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

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

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

src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue

@@ -126,8 +126,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     immediate: false,
     pagination: {
       current: 1,
-      pageSize: 10,
+      pageSize: 15,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
     },
     beforeFetch: async (params) => {
       queryParam.izEnabled = '0'

src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue

@@ -135,7 +135,7 @@
           :dataSource="targetChooseType == 'one' ? (targetType == 'needsync' ? rightNeedAddList : rightSourceList) : rightNeedAddList"
           :columns="targetChooseType == 'one' ? (targetType == 'needsync' ? targetColumns : targetSourceColumns) : targetSourceColumns"
           size="small" :scroll="{ y: '57vh' }"
-          :pagination="{ current: 1, pageSize: 50, total: rightNeedAddList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
+          :pagination="{ current: 1, pageSize: 50, total: rightNeedAddList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
           <template v-slot:bodyCell="{ column, record, index, text }">
             <template v-if="column.dataIndex === 'izExist'">
               <a-tag v-if="rightSourceList.some(item => item.id === record.id)" color="orange">更新</a-tag>
@@ -224,7 +224,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     pagination: {
       current: 1,
       pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
     },
     beforeFetch: async (params) => {
       queryParam.izEnabled = '0'

src/views/synchronization/directive/serviceDirective/DirectiveChooseCom分步骤版本.vue

@@ -112,7 +112,7 @@
       <a-col :lg="12" :sm="24">
         <a-tag color="green" style="margin-left: 10px;margin-top: 10px;">已选择 {{ rightList.length }} 条</a-tag>
         <BasicTable :dataSource="rightList" :columns="sourceColumns" size="small" :scroll="{ y: '46vh' }"
-          :pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
+          :pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
         </BasicTable>
       </a-col>
     </a-row>
@@ -157,7 +157,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     pagination: {
       current: 1,
       pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
     },
     beforeFetch: async (params) => {
       queryParam.izEnabled = '0'

src/views/synchronization/directive/syncStep/SyncStepList分步骤源_指令_目标.vue

@@ -53,7 +53,7 @@
         <a-tag color="green" style="margin-left: 10px;margin-top: 10px;">待同步 {{ leftList?.length }} 条</a-tag>
         <BasicTable :dataSource="leftList" :columns="columns" size="small" :scroll="{ y: '61vh' }"
           :showIndexColumn="false"
-          :pagination="{ current: 1, pageSize: 50, total: leftList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
+          :pagination="{ current: 1, pageSize: 50, total: leftList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
         </BasicTable>
       </a-col>
       <a-col :lg="12" :sm="24">