Merge branch 'main' of http://git.hivekion.com:3000/IDCDatasync/IDCDatasync-vue

src/assets/less/Suless.less

@@ -1,11 +1,11 @@
 @bordercolor      : rgb(98,133,151);
 @headercolor      : #ffffff;
 @backcolor        : #ffffff;
-@inpuitbordercolor   : rgb(10,63,85);
+@inpuitbordercolor: rgb(45,103,132);
 @inpuitbackcolor  : rgb(4,27,43);
 @labelDeaultColor : rgb(98,133,151);
 @defaultWhiteColor: rgb(98,133,151);
-@fontfamily       : 'MyCustomFont1', sans-serif;
+@fontfamily       : 'MyCustomFont3', sans-serif;
 @tableheadColor   : #E5E8EB;
 @tableheadBgColor : linear-gradient(180deg, rgb(20,108,173),rgb(11,57,90));
 @tableColor   : rgb(98,133,151);
@@ -29,6 +29,10 @@
   font-style: normal;
 }
 
+body{
+  font-family: 'MyCustomFont3', sans-serif !important;
+}
+
 .datanum{
   font-family: 'MyCustomFont2', sans-serif;
 }
@@ -111,11 +115,6 @@ body {
   color: @headercolor !important;
 }
 
-/* chrome 记住密码样式 */
-.user-layout-login .has-success input:-webkit-autofill {
-  box-shadow: inset 0 0 1000px 1000px #0f142a  !important;
-  -webkit-text-fill-color: #fff  !important;
-}
 
 .ant-layout {
   background-image: url('~@/assets/img/layoutbg.png') !important;
@@ -633,13 +632,11 @@ textarea,
 }
 
 .ant-dropdown-menu,
-.ant-modal-content,
 .ant-drawer-content {
   overflow  : hidden !important;
   background: @backcolor  !important;
   border    : 1px solid #5a91c7 !important;
 
-  .ant-modal-header,
   .ant-drawer-header {
     border-bottom: 0;
     background   : @headercolor  !important;
@@ -834,14 +831,22 @@ textarea,
 .ant-menu-horizontal .ant-menu-item-active {
   background-image: url('~@/assets/img/menuSelect.png') !important;
 }
+.ant-menu-dark .ant-menu-sub{
+  background: transparent !important;
+}
 
 .ant-menu-vertical .ant-menu-item,
 .ant-menu-submenu.ant-menu-submenu-vertical {
-  background   : url('~@/assets/img/MenuSecDefault.png') no-repeat;
+  background-image: url('~@/assets/img/MenuSecDefault.png');
-  width        : 195px !important;
+  background-size: 100% 100%;
-  height       : 44px !important;
+  width        : 165px !important;
+  height       : 40px !important;
   margin-bottom: 0 !important;
   margin-top   : -1px !important;
+  text-align: left;
+  float: left;
+  margin-right: 20px;
+  padding: 0 0 0 10px !important;
 }
 
 .ant-menu-vertical .ant-menu-submenu-title {
@@ -866,6 +871,33 @@ textarea,
   overflow-y: hidden;
 }
 
+.ant-modal-content{
+  background: url('~@/assets/img/文件上传.png') !important;
+}
+
+.ant-modal-header{
+  background: transparent !important;
+  border-bottom: none !important;
+}
+.ant-modal-title{
+  color: #fff !important;
+  font-size: 20px !important;
+  font-family: 'MyCustomFont2', sans-serif;
+}
+.result-wrapper{
+  background: rgb(15,41,61) !important;
+  border: none !important;
+  height: 360px;
+  .item{
+    font-family: 'MyCustomFont3', sans-serif;
+    color: #fff !important;
+  }
+
+}
+.ant-modal-footer{
+  border-top: none !important;
+}
+
 .ant-card,
 .ant-card-body,
 .ant-layout-footer,

src/components/menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="208px"
+    width="408px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

src/components/menu/index.js

@@ -30,7 +30,8 @@ export default {
     return {
       openKeys: [],
       selectedKeys: [],
-      cachedOpenKeys: []
+      cachedOpenKeys: [],
+      latestOpenKey: [],
     }
   },
   computed: {
@@ -59,10 +60,15 @@ export default {
   methods: {
     // select menu item
     onOpenChange (openKeys) {
-
+      console.log('openKeys',openKeys)
+      if(openKeys.length == 1) this.latestOpenKey = openKeys
+      if(openKeys.length == 2) this.latestOpenKey = [openKeys[1]]
+      // openKeys = this.latestOpenKey
+      console.log('latestOpenKey',this.latestOpenKey)
+      console.log('selectedKeys',this.selectedKeys)
       // 在水平模式下时执行，并且不再执行后续
       if (this.mode === 'horizontal') {
-        this.openKeys = openKeys
+        this.openKeys = this.latestOpenKey
         return
       }
       // 非水平模式时

src/components/page/GlobalHeader.vue

@@ -32,7 +32,7 @@
         <div class="header-index-center" >
           <div class="header-index-wide">
             <div class="header-index-center" :style="topMenuStyle.topmenuCenter">
-              <s-menu mode="horizontal" :menu="menus" :theme="theme"></s-menu>
+              <s-menu mode="horizontal" :menu="menus" :theme="theme" :triggerSubMenuAction="triggerSubMenuAction"></s-menu>
             </div>
           </div>
         </div>
@@ -73,6 +73,11 @@ export default {
       required: false,
       default: 'dark',
     },
+    triggerSubMenuAction: {
+      type: String,
+      required: false,
+      default: 'click',
+    },
     collapsed: {
       type: Boolean,
       required: false,

src/components/page/GlobalLayout.vue

@@ -146,4 +146,10 @@ body {
     filter: invert(80%);
   }
 }
+.ant-menu-submenu-popup,
+.ant-menu-submenu-content{
+  left: 50px !important;
+  top: 155px !important;
+  z-index: 10 !important;
+}
 </style>

src/views/fileManage/index.vue

@@ -30,6 +30,7 @@
       </div>
       <div class="righttop">
         <div class="linese"></div>
+        <div style="height:130px">
         <a-row class="quarter-div">
           <a-col :span="11">
             <img src="~@/assets/img/文件总数.png" />
@@ -84,11 +85,12 @@
             <div>文档</div>
           </a-col>
         </a-row>
-        <div class="linese" style="float: left"></div>
+        </div>
-        <div class="linese" style="float: left"></div>
+        <div class="linese"></div>
+        <div class="linese" style="margin-top: 20px"></div>
 
         <div class="search">
-          <a-row>
+          <a-row :gutter="30">
             <a-col :span="11">
               <a-form layout="inline">
                 <a-form-item>
@@ -455,7 +457,7 @@ export default {
   float: left;
 }
 .righttop .search{
-  /* height: 40px; */
+  height: 58px;
 }
 
 .quarter-div {
@@ -482,7 +484,6 @@ export default {
   font-size: 26px;
 }
 .rtable {
-  height: calc(100vh - 525px);
+  height: calc(100vh - 516px);
-  margin-top: 15px;
 }
 </style>

src/views/fileManage/modules/SliceUpload.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <a-row type="flex">
+    <a-row>
-      <a-col flex="auto">
+      <a-col>
-        <a-select show-search placeholder="选择任务" option-filter-prop="children" size="large" v-model="taskId" style="width: 200px;">
+        <a-select show-search placeholder="选择任务" option-filter-prop="children" size="large" v-model="taskId" style="width: 260px;margin-right: 20px;">
             <a-select-option v-for="d in allTask" :key="d.id">
               {{ d.name }}
           </a-select-option>
@@ -17,7 +17,7 @@
           :multiple="true"
           @change="handleChange">
           <!-- <a-input style="width:100%" :value="fileList.map(item=> item.name).join('、')" /> -->
-          <a-button :disabled="maxFile && tableDate.length >= maxFile">
+          <a-button :disabled="maxFile && tableDate.length >= maxFile" class="uploadbutton">
             <a-icon type="upload" /> 文档上传
           </a-button>
         </a-upload>
@@ -432,11 +432,17 @@ export default {
 <style lang="less" scoped>
 .upload-wrapper{
   display: inline-block;
+  margin-top: 10px;
   /deep/.ant-upload{
     width: 100%;
   }
 }
 
+.uploadbutton{
+  position: absolute;
+  top: 2px
+}
+
 .result-wrapper {
   margin-top: 10px;
   width: 100%;

src/views/fileManage/modules/uploadModal.vue

@@ -1,12 +1,12 @@
 <template>
   <a-modal wrap
     :title="title"
-    :width="800"
+    :width="939"
+    :height="585"
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
-    :ok-button-props="{ style: { display: 'none' } }"
     okText="保存"
     cancelText="关闭">
 
@@ -80,4 +80,14 @@ import SliceUpload from './SliceUpload'
 .disabled{
   pointer-events: none;
 }
+/deep/ .ant-modal-footer{
+  text-align: center;
+}
+/deep/ .ant-modal-content{
+  height: 100%;
+}
+/deep/ .ant-modal-body{
+  height: calc(100% - 112px);
+}
+
 </style>

src/views/user/Login.vue

@@ -4,21 +4,25 @@
       <div class="header">
         <img src="~@/assets/img/logo.png"/>
       </div>
-      <div class="name">
+      <!-- <div class="name">
         <span class="title"></span>
-      </div>
+      </div> -->
       <a-form-item label=" " :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-right: 100px">
         <img class="aicon" src="~@/assets/img/icon-账户.png"/>
+        <div class="inputbg">
           <a-input size="large" v-decorator="['username']" type="text" placeholder="请输入账号"> </a-input>
+        </div>
       </a-form-item>
 
       <a-form-item label=" " :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-right: 100px">
         <img class="aicon" src="~@/assets/img/icon-密码.png"/>
+        <div class="inputbg">
           <a-input v-decorator="['password']" size="large" type="password" autocomplete="false" placeholder="请输入密码">
         </a-input>
+        </div>
       </a-form-item>
 
-      <a-form-item style="margin-top: 17px; margin-left: 80px">
+      <a-form-item style="margin-top: 76px; margin-left: 80px">
         <a-button
           size="large"
           type="primary"
@@ -299,8 +303,8 @@ export default {
   .header {
     position: absolute;
     text-align: center;
-    top:280px;
+    top:200px;
-    left:1080px;
+    left:1218px;
     .title {
       font-family: 'REEJI-FlashSansGB-Flash-Heavy';
       font-weight: 800;
@@ -324,26 +328,42 @@ export default {
   }
 }
 .user-layout-login .ant-form-item {
-  margin-bottom: 20px !important;
+  margin-bottom: 30px !important;
 }
 .user-layout-login input {
   font-size: 20px;
   width: 444px;
   height: 60px;
-  background: #0f142a;
+  background: transparent !important;
   color: rgba(255, 255, 255, 0.85);
   padding-left: 80px;
-  border: 1px solid #11929D !important;
+  border: none !important;
   outline: none !important;
   box-shadow: none !important;
   cursor: pointer;
 }
 
+/* chrome 记住密码样式 */
+.user-layout-login  input:-webkit-autofill {
+  -webkit-box-shadow: none  !important;
+  -webkit-text-fill-color: #fff  !important;
+  background: transparent !important;
+  font-size: 20px;
+  transition: background-color 5000s ease-in-out 0s;
+}
+
+.user-layout-login .inputbg
+{
+  width: 444px;
+  height: 60px;
+  background: url(~@assets/img/login_button.png) !important;
+}
+
 .user-layout-login .aicon
 {
   position: absolute;
   left: 30px;
-  top: -7px;
+  top: 20px;
   z-index: 11;
 }
 .user-layout-login input::placeholder {