n20-common-lib 2.7.0-beta.16 → 2.7.0-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.0-beta.16",
+  "version": "2.7.0-beta.18",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-layout-header.scss

@@ -345,6 +345,18 @@ $--header-color: #3d4a57;
 
 }
 
+.wrapper-mask {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  width: 100vw;
+  height: 100vh;
+  background: hsla(0, 0%, 100%, 0);
+  z-index: 900;
+}
+
 .menu.show_drawer {
   max-height: calc(90vh - 50px);
   min-height: 350px;

package/src/components/AdvancedFilter/FormItem.vue

@@ -3,10 +3,10 @@ import getWidth from '../../utils/asciiWidth.js'
 const prefixClass = 'n20-advanced-filter-item'
 
 export default {
-  name: "FormItem",
+  name: 'FormItem',
   props: {
     label: {
-      type:String,
+      type: String,
       default: ''
     }
   },
@@ -16,8 +16,8 @@ export default {
     }
   },
   computed: {
-    width(){
-      return this._lang === 'zh'? this.label.length: getWidth(this.label)
+    width() {
+      return this._lang === 'zh' ? this.label.length : getWidth(this.label)
     }
   }
 }
@@ -25,17 +25,10 @@ export default {
 
 <template>
   <div :class="prefixClass">
-    <div :class="prefixClass +'__name'">{{label}}</div>
-    <div :class="[prefixClass+ '__value']">
+    <div :class="prefixClass + '__name'">{{ label }}</div>
+    <div :class="[prefixClass + '__value']">
       <slot></slot>
     </div>
     <i class="filter_remove n20-icon-yichu"></i>
   </div>
 </template>
-
-
-<style lang="scss">
-.n20-advanced-filter-item {
-
-}
-</style>

package/src/components/DateChoose/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="inline_block ">
+  <div class="inline_block">
     <el-select v-model="showValue" select collapse-tags clearable multiple disabled v-title="showValue.toString()">
       <el-option v-for="item in showValue" :key="item" :label="item" :value="item" />
     </el-select>
@@ -78,7 +78,7 @@
             <div class="flex-box flex-lr">
               <span>
                 <span>{{
-                  options.find(item2 => {
+                  options.find((item2) => {
                     return item2.value === item.type
                   }).label
                 }}</span>
@@ -190,15 +190,15 @@ export default {
   created() {},
   mounted() {
     console.log(this.optionsSelect)
-    this.filterOptions = JSON.parse(JSON.stringify(this.options)).filter(item => {
+    this.filterOptions = JSON.parse(JSON.stringify(this.options)).filter((item) => {
       return this.optionsSelect.includes(item.label)
     })
     this.setView()
   },
   methods: {
     setView() {
-      this.showValue = this.value.map(item => {
-        const type = this.options.find(item2 => {
+      this.showValue = this.value.map((item) => {
+        const type = this.options.find((item2) => {
           return item2.value === item.type
         }).label
         let week = ''
@@ -268,11 +268,9 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-.list {
-  li {
+<stylescoped>
+.list li {
     height: 24px;
     line-height: 24px;
   }
-}
-</style>
+</stylescoped>

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -19,8 +19,8 @@
     />
     <!-- <el-divider class="header-wrap-logo-hr" direction="vertical" /> -->
     <div class="m-l-m"></div>
-    <h3 class="header-title m-r-s">{{ headerTitle | $l }}</h3>
-    <div class="m-r-auto p-a-ss pointer header_change_system_box" @click="handleChangeSystem">
+    <h3 :class="['header-title ', showNavigation ? 'm-r-s' : 'm-r-auto']">{{ headerTitle | $l }}</h3>
+    <div v-if="showNavigation" class="m-r-auto p-a-ss pointer header_change_system_box" @click="handleChangeSystem">
       <svg class="icon" aria-hidden="true">
         <use xlink:href="#n20-icon-caidan"></use>
       </svg>
@@ -224,6 +224,20 @@
             <i class="el-icon-caret-right m-l-auto m-r-0"></i>
           </div>
         </el-dropdown-item>
+        <!-- 系统切换 -->
+        <el-dropdown-item v-if="systemChange && systemList && systemList.length">
+          <el-dropdown trigger="hover" size="medium" placement="left-start" style="width: 100%">
+            <div class="flex-box flex-v">
+              <span>{{ '系统切换' | $lc }}</span>
+              <i class="el-icon-caret-right m-l-auto m-r-0"></i>
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-for="(item, i) in systemList" :key="i" @click.native="clickSystemChange(item)">
+                <span>{{ item.NAME }}</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-dropdown-item>
         <slot name="header-dropdown"></slot>
         <el-dropdown-item command="logOut">
           <div class="flex-box flex-v">
@@ -289,7 +303,72 @@ dayjs.extend(duration)
 import { siteTree2menus } from '../../LoginTemporary/utils'
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
-
+const SYSTEM_LIST = [
+  {
+    NO: 'CSZHYW',
+    NAME: '财司综合业务系统',
+    ICON: '',
+    LOGIN_MODE: ['account'],
+    LOGIN_FORGET_MODE: ['phoneCode'],
+    OPEN: true
+  },
+  {
+    NO: 'CSYWGL',
+    NAME: '财司业务管理系统',
+    ICON: '',
+    LOGIN_MODE: ['account'],
+    LOGIN_FORGET_MODE: [],
+    OPEN: true
+  },
+  {
+    NO: 'CSFZJC',
+    NAME: '财司辅助决策系统',
+    ICON: '',
+    LOGIN_MODE: ['pthon'],
+    LOGIN_FORGET_MODE: ['ukCode'],
+    OPEN: true
+  },
+  {
+    NO: 'CSWY',
+    NAME: '财司网银系统',
+    ICON: '',
+    LOGIN_MODE: ['qrcode', 'account'],
+    LOGIN_FORGET_MODE: ['phoneCode'],
+    OPEN: true
+  },
+  {
+    NO: 'JTZL',
+    NAME: '财司直连平台系统',
+    ICON: '',
+    LOGIN_MODE: ['accountPthon'],
+    LOGIN_FORGET_MODE: ['phoneCode'],
+    OPEN: true
+  },
+  {
+    NO: 'JRWG',
+    NAME: '金融网关系统',
+    ICON: '',
+    LOGIN_MODE: ['account'],
+    LOGIN_FORGET_MODE: ['ukCode'],
+    OPEN: true
+  },
+  {
+    NO: 'JTSKYWGK',
+    NAME: '集团司库业务管控系统',
+    ICON: '',
+    LOGIN_FORGET_MODE: ['phoneCode'],
+    LOGIN_MODE: ['pthon', 'account'],
+    OPEN: true
+  },
+  {
+    NO: 'JTSKSJFX',
+    NAME: '集团数据分析系统',
+    ICON: '',
+    LOGIN_FORGET_MODE: ['phoneCode'],
+    LOGIN_MODE: ['account'],
+    OPEN: true
+  }
+]
 export default {
   components: {
     dialogWrap,
@@ -303,7 +382,7 @@ export default {
       type: Function,
       default: undefined
     },
-    systemChange: {
+    drawerVisible: {
       type: Boolean,
       default: false
     },
@@ -344,6 +423,8 @@ export default {
       hideTheme: undefined,
       userInfo: {},
       userMd: undefined,
+      showNavigation: false,
+      systemChange: false,
       userNo: window.sessionStorage.getItem('userNo'),
       durationTime: $lc('00小时00分00秒'),
       cpwdV: false,
@@ -356,7 +437,6 @@ export default {
       afficheNum: 0,
       rolesList: [],
       headerSystem: [],
-      showDrawerBox: false,
       scV: false,
       underway: false,
       /*  */
@@ -386,10 +466,15 @@ export default {
       this.hideLang = _layoutData.hideLang
       this.hideDowApp = _layoutData.hideDowApp
       this.hideTheme = _layoutData.hideTheme
+      this.showNavigation = _layoutData.showNavigation
+      this.systemChange = _layoutData.systemChange
 
       if (_loginSetting !== 'JSON') {
         this.headerTitle = sessionStorage.getItem('headerTitle') || this.headerTitle
       }
+      if (this.systemChange) {
+        this.systemList = JSON.parse(localStorage.getItem('SYSTEM_LIST')) || SYSTEM_LIST
+      }
       this.show = true
 
       this.getUserImg().catch(() => {
@@ -428,19 +513,12 @@ export default {
   methods: {
     async handleChangeSystem() {
       let menuTree = JSON.parse(sessionStorage.getItem('allMenuTree'))
-      if (!menuTree) {
-        this.getTreeList().finally(async () => {
-          let tree = JSON.parse(sessionStorage.getItem('allMenuTree'))
-          this.setMenuData(tree)
-        })
-      } else {
-        this.setMenuData(menuTree)
-      }
+      console.log(menuTree)
+      this.setMenuData(menuTree)
     },
     setMenuData(menuTree) {
-      let system_list = JSON.parse(localStorage.getItem('SYSTEM_LIST'))
-      this.headerSystem = system_list
-        .map((system) => {
+      try {
+        this.headerSystem = SYSTEM_LIST.map((system) => {
           const icon =
             {
               CSZHYW: '#n20-icon-zhcsyw',
@@ -454,35 +532,56 @@ export default {
             }[system.NO] || ''
 
           system.icon = icon
-          system.menuTree = menuTree
-            ?.filter((menu) => menu.systemNo === system.NO && menu.isBackmenu === '0' && menu.children?.length > 0)
-            .map((menu) => ({
-              ...menu,
-              icon:
-                {
-                  CSZHYW: '#n20-icon-zhcsyw',
-                  CSYWGL: '#n20-icon-bianzu',
-                  CSFZJC: '#n20-icon-a-bianzu70',
-                  CSWY: '#n20-icon-a-bianzu69',
-                  JTZL: '#n20-icon-a-bianzu3',
-                  JRWG: '#n20-icon-a-bianzu1',
-                  JTSKYWGK: '#n20-icon-a-bianzu701',
-                  JTSKSJFX: '#n20-icon-a-bianzu2'
-                }[menu.NO] || ''
-            }))
-
+          system.menuTree = menuTree?.filter(
+            (menu) => menu.systemNo === system.NO && menu.isBackmenu === '0' && menu.children?.length > 0
+          )
+          // .map((menu) => ({
+          //   ...menu,
+          //   icon:
+          //     {
+          //       CSZHYW: '#n20-icon-zhcsyw',
+          //       CSYWGL: '#n20-icon-bianzu',
+          //       CSFZJC: '#n20-icon-a-bianzu70',
+          //       CSWY: '#n20-icon-a-bianzu69',
+          //       JTZL: '#n20-icon-a-bianzu3',
+          //       JRWG: '#n20-icon-a-bianzu1',
+          //       JTSKYWGK: '#n20-icon-a-bianzu701',
+          //       JTSKSJFX: '#n20-icon-a-bianzu2'
+          //     }[menu.NO] || ''
+          // }))
+          console.log(system)
           return system
-        })
-        .filter((item) => item.menuTree?.length > 0)
-      this.showDrawerBox = !this.showDrawerBox
-      console.log(this.headerSystem)
-      this.$emit('clickSystem', this.headerSystem, this.showDrawerBox)
+        }).filter((item) => item.menuTree?.length > 0)
+        console.log(this.headerSystem)
+      } catch (error) {
+        console.log(error)
+      }
+
+      this.$emit('update:drawerVisible', !this.drawerVisible)
+      this.$emit('clickSystem', this.headerSystem)
     },
+    async clickSystemChange(item) {
+      await this.getTreeList(item)
+      // localStorage.setItem('pageInType', 'toFront')
+      window.localStorage.setItem('pageInSystemNo', item.NO)
+      // 切换系统的时候清除缓存的页签
+      window.sessionStorage.removeItem('tab-list')
+      let { base = '/' } = this.$router.options
+      if (!/\/$/.test(base)) base += '/'
 
-    async getTreeList(item = {}) {
-      let { data } = await axios.get(`/bems/1.0/menuTree/tree?t=${Date.now()}`, item, { loading: false })
+      window.location.href = window.location.origin + base + 'dashboard/workplace'
+    },
+    async getTreeList(item) {
+      let { data } = await axios.get(
+        `/bems/1.0/menuTree/tree?t=${Date.now()}`,
+        {
+          resType: 1,
+          systemNo: item.NO
+        },
+        { loading: false }
+      )
       let layoutMenus = siteTree2menus(data || [])
-      sessionStorage.setItem('allMenuTree', JSON.stringify(layoutMenus))
+      sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
     },
 
     handleUser() {

package/src/components/Layout/indexN.vue

@@ -7,12 +7,14 @@
       :operation-status="operationStatus"
       :before-logout="beforeLogout"
       :after-logout="afterLogout"
+      :drawerVisible.sync="showDrawerBox"
       @clickSystem="clickSystem"
       @custom-event="(par) => $emit('custom-event', par)"
     >
       <slot slot="header-ectad" name="header-ectad"></slot>
       <slot slot="header-dropdown" name="header-dropdown"></slot>
     </headerWrap>
+    <div v-if="showDrawerBox" class="wrapper-mask" @click="showDrawerBox = false"></div>
     <menuDrawer
       :class="showDrawerBox ? 'show_drawer' : ''"
       :menus="systemMenu"
@@ -199,8 +201,7 @@ export default {
         refreshTab && this.tabRefresh(refreshTab)
       }
     },
-    clickSystem(menu, drawerVisible) {
-      this.showDrawerBox = drawerVisible
+    clickSystem(menu) {
       this.systemMenu = menu
     },
     getCollapse() {

package/src/components/LoginTemporary/indexN.vue

@@ -23,8 +23,6 @@
       }"
       :style="{ backgroundImage: loginBg }"
     >
-      <component :is="'style'">{{ wrapStyle }}</component>
-
       <div class="login-logo-box flex-box flex-v">
         <img
           v-if="loginLogo"
@@ -35,37 +33,9 @@
         <h3 class="login-logo-text">{{ loginLogoText | $l }}</h3>
       </div>
 
-      <!-- <el-dropdown
-        v-if="!jsonData.hideLang"
-        class="login-language-box m-l-lg"
-        :style="{ right: _lang == 'en' ? '260px' : '200px' }"
-        @command="setLang"
-      >
-        <span
-          class="set-user-btn iconfont header-color"
-          :class="{
-            'icon-zhongwen': langVal === 'zh-cn',
-            'icon-fanti': langVal === 'zh-hk',
-            'icon-yuyanqiehuan': langVal === 'en'
-          }"
-        ></span>
-
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="zh-cn"
-            ><i class="iconfont icon-zhongwen f-s-icon"></i>{{ '简体中文' | $lc }}</el-dropdown-item
-          >
-          <el-dropdown-item command="zh-hk"
-            ><i class="iconfont icon-fanti f-s-icon"></i>{{ '繁体中文' | $lc }}</el-dropdown-item
-          >
-          <el-dropdown-item command="en"
-            ><i class="iconfont icon-yuyanqiehuan f-s-icon"></i>{{ '英文' | $lc }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown> -->
-
       <div v-if="inspectionCenter" class="login-verify-box" @click="inspectionV = true">{{ '查验中心' | $lc }} ></div>
 
-      <template v-if="form.LOGIN_TYPE === 'T1'">
+      <template v-if="form.LOGIN_TYPE === 'T1' && showSystem">
         <div class="sys-title">{{ '系统选择区' | $lc }}</div>
         <div class="sys-carousel">
           <div class="swiper-wrapper">
@@ -85,7 +55,7 @@
         <div class="swiper-button-prev" @click="slidePrev"></div>
         <div class="swiper-button-next" @click="slideNext"></div>
       </template>
-      <template v-if="form.LOGIN_TYPE === 'T2'">
+      <template v-if="form.LOGIN_TYPE === 'T2' && showSystem">
         <div class="sys-title">{{ '系统选择区' | $lc }}</div>
         <div class="sys-carousel overflow-clear">
           <div
@@ -251,6 +221,7 @@ export default {
       langVal: window.localStorage.getItem('pageLang') || 'zh-cn',
       operateType: 'login',
       alV: false,
+      showSystem: false,
       form: {
         LOGIN_URL: '',
         LOGIN_MODE: [],
@@ -404,17 +375,11 @@ export default {
     if (window.sessionStorage.getItem('_auto_login_ing_')) return this.autoLoginSS()
     this.removeStorage()
 
-    // this.setWrapSty()
-    // window.addEventListener('resize', this.setWrapSty)
-
     this.init()
     this.getIsImgCode()
     localStorage.removeItem('pageInType')
-    localStorage.setItem('pageInSystemNo', this.form.SYSTEM_LIST[0].NO)
-  },
-  beforeDestroy() {
-    // window.removeEventListener('resize', this.setWrapSty)
   },
+  beforeDestroy() {},
   methods: {
     getIsImgCode() {
       axios
@@ -433,23 +398,6 @@ export default {
         await this.loginThen()
       }
     },
-    // setWrapSty() {
-    //   let winW = document.documentElement.clientWidth
-    //   let winH = document.documentElement.clientHeight
-    //   let ratioO = winW / winH
-    //   let W = 1440
-    //   let H = 900
-    //   let ratio = W / H
-    //   if (winW >= W && winH >= H) {
-    //     this.wrapStyle = ''
-    //     return false
-    //   }
-    //   if (ratioO > ratio) {
-    //     this.wrapStyle = `.login-wrap{width:${Math.floor(H * ratioO)}px; height:${H}px; transform: scale(${winH / H});}`
-    //   } else {
-    //     this.wrapStyle = `.login-wrap{width:${W}px; height:${Math.floor(W / ratioO)}px; transform: scale(${winW / W});}`
-    //   }
-    // },
     // 系统分辨率是否缩放
     getScreenSetting() {
       var ratio = 0
@@ -482,9 +430,10 @@ export default {
     },
 
     async init() {
-      const { _layoutData = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
+      const { _layoutData = {}, loginSetting, screenInspect, showSystem } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
-      if (_loginSetting !== 'JSON') {
+      this.showSystem = showSystem
+      if (_loginSetting !== 'JSON' && showSystem) {
         await this.getSysSet()
       }
       screenInspect && this.getScreenSetting()

package/src/index.js

@@ -64,10 +64,10 @@ import Upload from './components/Upload/index.vue'
 import WornPagination from './components/WornPagination/index.vue'
 
 import AdvancedFilter from './components/AdvancedFilter/index.vue'
+import DateChoose from './components/DateChoose/index.vue'
 import ElectronicArchive from './components/ElectronicArchive/index.vue'
 import SelectTreePro from './components/SelectTree/pro.vue'
 import Tree from './components/Tree/index.vue'
-// import DateChoose from './components/DateChoose/index.vue'
 
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
@@ -204,7 +204,7 @@ const components = [
   WorkCard,
   UploadMsg,
   Tree,
-  // DateChoose,
+  DateChoose,
   SelectTreePro,
   AdvancedFilter,
   ElectronicArchive,
@@ -280,6 +280,7 @@ export {
   // 组件
   ContentLoading,
   ContentNull,
+  DateChoose,
   DatePicker,
   DatePickerPor,
   Descriptions,
@@ -334,7 +335,6 @@ export {
   TertiaryTab,
   TimePicker,
   Tree,
-  // DateChoose,
   Upload,
   UploadMsg,
   WorkCard,