n20-common-lib 2.1.4 → 2.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "private": false,
   "main": "src/index.js",
   "scripts": {

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

@@ -116,14 +116,12 @@
             <span class="_edit el-icon-edit" @click="editByLabel"></span>
           </div>
         </div>
-        <dialogWrap
-          :title="'修改密码' | $lc"
-          :visible.sync="cpwdV"
-          append-to-body
-          :width="_lang == 'zh' ? '400px' : '460px'"
-        >
-          <changePwd :visible.sync="cpwdV" />
-        </dialogWrap>
+        <el-dropdown-item command="changePassword">
+          <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-item>
         <el-dropdown-item v-if="customOpt.agency" command="myAgency">
           <div class="flex-box flex-v">
             <span>{{ '工作代理' | $lc }}</span>

package/src/components/LoginSetting/indexN.vue

@@ -35,7 +35,13 @@
         </div>
       </div>
       <template v-for="item in munList">
-        <SetItem v-if="activateMunId === item.id" :key="item.id" class="flex-item" :id-no="activateMunId" />
+        <SetItem
+          v-if="activateMunId === item.id"
+          :key="item.id + siKey"
+          class="flex-item"
+          :id-no="activateMunId"
+          @renewal="siKey = siKey + 1"
+        />
       </template>
     </div>
     <div slot="footer" style="height: 44px"></div>
@@ -51,7 +57,8 @@ export default {
     return {
       userNo: sessionStorage.getItem('userNo'),
       munList: [],
-      activateMunId: undefined
+      activateMunId: undefined,
+      siKey: 0
     }
   },
   created() {

package/src/components/LoginSetting/setItem.vue

@@ -163,56 +163,56 @@ export default {
         LOGIN_TYPE: 'T1',
         SYSTEM_LIST: [
           {
-            NO: 'N01',
+            NO: 'CSZHYW',
             NAME: '财司综合业务系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: true
           },
           {
-            NO: 'N02',
+            NO: 'CSYWGL',
             NAME: '财司业务管理系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N03',
+            NO: 'CSFZJC',
             NAME: '财司辅助决策系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N04',
+            NO: 'CSWY',
             NAME: '财司网银系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N05',
+            NO: 'JTZL',
             NAME: '财司直连平台系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N06',
+            NO: 'JRWG',
             NAME: '金融网管系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N07',
+            NO: 'JTSKYWGK',
             NAME: '集团司库业务管控系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N08',
+            NO: 'JTSKSJFX',
             NAME: '集团数据分析系统',
             ICON: undefined,
             LOGIN_MODE: [],
@@ -320,7 +320,11 @@ export default {
       }
 
       this.$axios.post(`/bems/1.0/sysSetting`, data).then((res) => {
-        this.countDown()
+        this.$message({
+          type: 'success',
+          message: `设置成功.`
+        })
+        this.$emit('renewal')
       })
     },
     Logout() {

package/src/components/LoginTemporary/form.vue

@@ -181,6 +181,10 @@ export default {
     asyncRelaNos: {
       type: Boolean,
       default: false
+    },
+    extraForm: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -570,7 +574,10 @@ export default {
       this.loadingAdd()
       let { data } = await axios.get(
         '/bems/1.0/menuTree/tree',
-        { resType: this.asyncRelaNos ? '1' : undefined },
+        {
+          resType: this.asyncRelaNos ? '1' : undefined,
+          ...this.extraForm
+        },
         { loading: this.loadingSub }
       )
       data || (data = [])

package/src/components/LoginTemporary/indexN.vue

@@ -56,6 +56,7 @@
             v-for="(item, i) in systemList"
             :key="item.NO"
             class="sys-item float-left"
+            :class="{ active: item.NO === sltSys.NO }"
             :style="{
               marginRight: (i + 1) % 4 ? '32px' : undefined,
               marginBottom: systemList.length > 4 && i < 4 ? '54px' : undefined
@@ -76,8 +77,9 @@
         v-if="operateType === 'login'"
         :before-login="beforeLogin"
         :login-types="loginTypes"
-        :login-then="loginThen"
+        :login-then="loginThenT"
         :async-rela-nos="asyncRelaNos"
+        :extra-form="extraForm"
         class="login-form"
         @changType="getChangetype"
       >
@@ -200,56 +202,56 @@ export default {
         LOGIN_TYPE: undefined,
         SYSTEM_LIST: [
           {
-            NO: 'N01',
+            NO: 'CSZHYW',
             NAME: '财司综合业务系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N02',
+            NO: 'CSYWGL',
             NAME: '财司业务管理系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N03',
+            NO: 'CSFZJC',
             NAME: '财司辅助决策系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N04',
+            NO: 'CSWY',
             NAME: '财司网银系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N05',
+            NO: 'JTZL',
             NAME: '财司直连平台系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N06',
+            NO: 'JRWG',
             NAME: '金融网管系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N07',
+            NO: 'JTSKYWGK',
             NAME: '集团司库业务管控系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N08',
+            NO: 'JTSKSJFX',
             NAME: '集团数据分析系统',
             ICON: undefined,
             LOGIN_MODE: [],
@@ -257,7 +259,7 @@ export default {
           }
         ]
       },
-      sltSys: undefined,
+      sltSys: {},
       inspectionV: false
     }
   },
@@ -300,6 +302,16 @@ export default {
     },
     systemList() {
       return this.form.SYSTEM_LIST.filter((d) => d.OPEN)
+    },
+    extraForm() {
+      let form = {}
+      if (this?.sltSys?.NO) {
+        form.systemNo = this.sltSys.NO
+      } else if (this.systemList.length === 1) {
+        form.systemNo = this.systemList[0].NO
+      }
+
+      return form
     }
   },
   created() {
@@ -316,6 +328,16 @@ export default {
     window.removeEventListener('resize', this.setWrapSty)
   },
   methods: {
+    async loginThenT() {
+      if (this.sltSys?.NO) {
+        localStorage.setItem('pageInSystemNo', this.sltSys.NO)
+      } else {
+        localStorage.removeItem('pageInSystemNo')
+      }
+      if (this.loginThen) {
+        await this.loginThen()
+      }
+    },
     setWrapSty() {
       let winW = document.documentElement.clientWidth
       let winH = document.documentElement.clientHeight
@@ -377,8 +399,18 @@ export default {
       this.jsonData = _layoutData
 
       this.$nextTick(() => {
+        let systemNo = localStorage.getItem('pageInSystemNo')
+        let acSysI = this.systemList.findIndex((s) => s.NO === systemNo)
+
         if (this.form.LOGIN_TYPE === 'T1') {
           this.newSwiper()
+          if (acSysI !== -1) {
+            window.loginSwiperSys(acSysI)
+          }
+        } else {
+          if (acSysI !== -1) {
+            this.selSystem(this.systemList[acSysI])
+          }
         }
       })
     },
@@ -661,6 +693,10 @@ export default {
   background: linear-gradient(180deg, rgba(153, 165, 186, 0.53), rgba(96, 108, 133, 0.15));
   border-radius: 6px;
 }
+.login-wrap-2 .sys-item:hover,
+.login-wrap-2 .sys-item.active {
+  background: linear-gradient(180deg, #327bff, rgba(74, 102, 158, 0.3));
+}
 .login-wrap-2 .sys-item-title {
   height: 58px;
   font-size: 14px;

package/src/components/LoginTemporary/systemIconMap.js

@@ -1,10 +1,10 @@
 export default {
-  N01: '/server-assets/N01.png',
-  N02: '/server-assets/N02.png',
-  N03: '/server-assets/N03.png',
-  N04: '/server-assets/N04.png',
-  N05: '/server-assets/N05.png',
-  N06: '/server-assets/N06.png',
-  N07: '/server-assets/N07.png',
-  N08: '/server-assets/N08.png'
+  CSZHYW: '/server-assets/N01.png',
+  CSYWGL: '/server-assets/N02.png',
+  CSFZJC: '/server-assets/N03.png',
+  CSWY: '/server-assets/N04.png',
+  JTZL: '/server-assets/N05.png',
+  JRWG: '/server-assets/N06.png',
+  JTSKYWGK: '/server-assets/N07.png',
+  JTSKSJFX: '/server-assets/N08.png'
 }