n20-common-lib 2.1.4 → 2.1.6

package/package.json

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

package/src/components/InputNumber/index.vue

@@ -154,7 +154,7 @@ export default {
           val = ev.code === 'ArrowUp' ? val + this.step : val - this.step
           let valueStr = Number(val.toFixed(9)).toString()
           this.valueStr = valueStr
-          this.inputFn(valueStr)
+          this.changeFn(valueStr)
         }
       }
     },
@@ -162,36 +162,30 @@ export default {
       if (valStr !== '-' && isNaN(valStr)) {
         this.valueStr = this.preValue
       } else {
-        if (valStr !== '-') {
-          let val = Number(valStr)
-          if (val < this.min) {
-            this.valueStr = this.min
-          } else if (val > this.max) {
-            this.valueStr = this.max
-          } else if (this.stepStrictly) {
-            let N = val / this.step
-            if (Number(N.toFixed(9)) === Math.round(N)) {
-              this.preValue = valStr
-            } else {
-              val = Math.round(N) * this.step
-              this.valueStr = val.toString()
-            }
-          } else {
-            this.preValue = valStr
-          }
-        }
+        this.preValue = valStr
       }
     },
     changeFn(valStr) {
       valStr = valStr.replace(/,/g, '')
-      let val = Number(valStr)
 
-      if (!valStr.trim() || isNaN(val)) {
+      if (!valStr.trim() || isNaN(valStr)) {
         this.valueStr = ''
         this.$emit('input', undefined)
         this.$emit('change', undefined)
         return
       }
+
+      let val = Number(valStr)
+      if (val < this.min) {
+        val = this.min
+      } else if (val > this.max) {
+        val = this.max
+      } else if (this.stepStrictly) {
+        let N = val / this.step
+        if (Number(N.toFixed(9)) !== Math.round(N)) {
+          val = Math.round(N) * this.step
+        }
+      }
       this.valueStr = this.num2str(val)
 
       switch (this.type) {

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

@@ -36,6 +36,7 @@
         {{ '单位' | $lc }}: <span class="color-666">{{ userInfo.companyName }}</span>
       </span>
     </sapn>
+    <span v-else-if="byLabel" class="uif-by">{{ byLabel }}</span>
     <el-button v-if="inBack" class="header-hdyy f-s-s" plain round size="mini" @click="toSystem">回到应用</el-button>
     <!-- YSCW-end -->
     <el-dropdown class="m-l-lg" @command="setLang">
@@ -116,14 +117,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/index.vue

@@ -255,7 +255,7 @@ export default {
           this.$message.error($lc('登录首页文字显示信息不能为空'))
           break
         case 'LOGIN_MODE':
-          this.$message.error($lc('登陆方式至少勾选一种方式'))
+          this.$message.error($lc('登录方式至少勾选一种方式'))
           break
       }
     },
@@ -292,7 +292,7 @@ export default {
       let secondsToGo = 5
       this.$message({
         type: 'success',
-        message: `设置成功,系统将在 ${secondsToGo} 秒后退出到登陆页面.`
+        message: `设置成功,系统将在 ${secondsToGo} 秒后退出到登录页面.`
       })
       const interval = setInterval(() => {
         secondsToGo -= 1

package/src/components/LoginSetting/indexN.vue

@@ -3,7 +3,7 @@
     <div class="flex-box" style="height: 100%; overflow: auto">
       <div class="bd-r" style="width: 290px">
         <div class="flex-box flex-v p-l">
-          <span>登陆页设置</span>
+          <span>登录页设置</span>
           <el-button class="m-l-auto bd-none" plain size="mini" @click="addItem"
             ><i class="n20-icon-xinzeng m-r-ss"></i>新增</el-button
           >
@@ -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() {
@@ -82,7 +89,7 @@ export default {
       })
     },
     async addItem() {
-      let { value } = await this.$prompt('请输入登陆页名称', '新增', {
+      let { value } = await this.$prompt('请输入登录页名称', '新增', {
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -91,7 +98,7 @@ export default {
       this.Init(value)
     },
     async updateItem(item) {
-      let { value } = await this.$prompt('请输入登陆页名称', '修改', {
+      let { value } = await this.$prompt('请输入登录页名称', '修改', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputValue: item.logName

package/src/components/LoginSetting/setItem.vue

@@ -3,25 +3,12 @@
   <div class="p-l-lg" style="overflow: auto">
     <el-form ref="form" :model="form" class="m-l-lg" label-position="top">
       <el-form-item
-        label="登陆页URL"
+        label="登录页URL"
         prop="LOGIN_URL"
-        :rules="{ required: true, message: '登陆页URL不能为空', trigger: 'change' }"
+        :rules="{ required: true, message: '登录页URL不能为空', trigger: 'change' }"
       >
         <el-input v-model="form.LOGIN_URL" class="input-w-u" clearable />
       </el-form-item>
-      <el-form-item
-        label="登录方式设置"
-        prop="LOGIN_MODE"
-        :rules="{ type: 'array', required: true, message: '至少选择一种登录方式', trigger: 'change' }"
-      >
-        <span slot="label"
-          ><span>登录方式设置</span
-          ><span class="color-danger m-l-s f-s-s">({{ '至少选择一种登录方式' | $lc }})</span></span
-        >
-        <el-checkbox-group v-model="form.LOGIN_MODE">
-          <el-checkbox v-for="item in plainOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
       <el-form-item
         label="集团名称设置"
         prop="GROUP_NAME"
@@ -29,105 +16,120 @@
       >
         <el-input v-model="form.GROUP_NAME" class="input-w-u" clearable />
       </el-form-item>
-      <el-form-item
-        label="登录首页文字显示信息"
-        prop="LOGIN_SLOGAN"
-        :rules="{ required: true, message: '登录首页文字显示信息不能为空', trigger: 'change' }"
-      >
-        <el-input v-model="form.LOGIN_SLOGAN" class="input-w-u" clearable />
+      <el-form-item label="登录首页文字显示信息">
+        <el-input v-model="form.LOGIN_SLOGAN" type="textarea" class="input-w-u" rows="1" />
       </el-form-item>
       <el-form-item
         label="登录背景图片设置"
         prop="LOGIN_BG"
         :rules="{ required: true, message: '登录背景图片不能为空', trigger: 'change' }"
       >
-        <cl-upload
-          :drag="true"
-          :action="`/bems/1.0/upload/${idNo}_bg`"
-          :file-url.sync="form.LOGIN_BG"
-          accept="image/*"
-          msg-type="message"
-          style="width: 536px; height: 294px"
-        >
-          <template slot="trigger">
-            <i class="drag-icon n20-icon-shangchuan"></i>
-            <span class="drag-text">点击或将文件拖拽到这里上传</span>
-            <span class="drag-tip">建议图片尺寸：1920*1080，支持图片格式：png、jpg、bmp</span>
-          </template>
-        </cl-upload>
+        <div class="login-form-bg-box">
+          <img :key="key_1" class="login-preview" :src="form.LOGIN_BG" />
+          <div>
+            <div class="flex-box">
+              <span class="m-r">上传图片</span>
+              <cl-upload
+                :action="`/bems/1.0/upload/${idNo}_bg`"
+                :file-url.sync="form.LOGIN_BG"
+                accept="image/*"
+                msg-type="message"
+                placeholder="选择附件"
+                :on-success="() => (key_1 = key_1 + 1)"
+              />
+            </div>
+            <div class="color-placeholder f-s-s">建议图片尺寸：1920*1080，支持图片格式：png、jpg、bmp、svg。</div>
+          </div>
+        </div>
       </el-form-item>
       <el-form-item
         label="公司LOGO图片设置"
         prop="LOGIN_LOGO"
         :rules="{ required: true, message: '公司LOGO图片不能为空', trigger: 'change' }"
       >
-        <cl-upload
-          :drag="true"
-          :action="`/bems/1.0/upload/${idNo}_logo`"
-          :file-url.sync="form.LOGIN_LOGO"
-          accept="image/*"
-          msg-type="message"
-          style="width: 536px; height: 294px"
-        >
-          <template slot="trigger">
-            <i class="drag-icon n20-icon-shangchuan"></i>
-            <span class="drag-text">点击或将文件拖拽到这里上传</span>
-            <span class="drag-tip">建议图片尺寸：108*30，支持图片格式：png、jpg、bmp</span>
-          </template>
-        </cl-upload>
-      </el-form-item>
-      <cl-expandable-pane title="信息内容展开" title-class="m-t-0">
-        <div class="bd-l bd-t bd-r m-t-lg m-b">
-          <el-table :data="form.SYSTEM_LIST" highlight-current-row @row-click="sltRow">
-            <el-table-column label="系统名称" prop="NAME" />
-            <el-table-column label="是否在登陆页显示" align="center">
-              <template slot-scope="{ row }">
-                <el-switch v-model="row.OPEN" @change="openCg" />
-              </template>
-            </el-table-column>
-          </el-table>
+        <div class="login-form-bg-box">
+          <img :key="key_1" class="login-preview" :src="form.LOGIN_LOGO" />
+          <div>
+            <div class="flex-box">
+              <span class="m-r">上传图片</span>
+              <cl-upload
+                :action="`/bems/1.0/upload/${idNo}_logo`"
+                :file-url.sync="form.LOGIN_LOGO"
+                accept="image/*"
+                msg-type="message"
+                placeholder="选择附件"
+                :on-success="() => (key_2 = key_2 + 1)"
+              />
+            </div>
+            <div class="color-placeholder f-s-s">建议图片尺寸：108*30，支持图片格式：png、jpg、bmp、svg。</div>
+          </div>
         </div>
-        <el-form-item
-          label="页面展示方式"
-          :rules="{ required: true, message: '页面展示方式不能为空', trigger: 'change' }"
-        >
-          <el-select v-model="form.LOGIN_TYPE" class="input-w-u" :disabled="loginTypeDisabled">
-            <el-option label="平铺展示" value="T0" />
-            <el-option label="左右切换" value="T1" />
-            <el-option label="平铺展示" value="T2" />
-          </el-select>
-        </el-form-item>
-        <template v-if="systemItem">
-          <el-form-item label="系统名称设置" class="is-required">
-            <el-input ref="sys-name" v-model="systemItem.NAME" class="input-w-u" clearable />
-          </el-form-item>
-          <el-form-item label="系统标识设置" class="is-required">
-            <cl-upload
-              :drag="true"
-              :action="`/bems/1.0/upload/${idNo}_${form.NO}_icon`"
-              :file-url.sync="systemItem.ICON"
-              accept="image/*"
-              msg-type="message"
-              style="width: 536px; height: 294px"
+      </el-form-item>
+
+      <div class="bd-l bd-t bd-r m-t-lg m-b">
+        <el-table :data="form.SYSTEM_LIST">
+          <el-table-column label="系统名称" prop="NAME" />
+          <el-table-column label="是否在登录页显示" align="center">
+            <template slot-scope="{ row }">
+              <el-switch v-model="row.OPEN" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-form-item
+        label="页面展示方式"
+        :rules="{ required: true, message: '页面展示方式不能为空', trigger: 'change' }"
+      >
+        <el-select v-model="form.LOGIN_TYPE" class="input-w-u">
+          <el-option label="左右切换" value="T1" />
+          <el-option label="平铺展示" value="T2" />
+        </el-select>
+      </el-form-item>
+      <cl-expandable-pane title="系统详情设置" title-class="m-t-0">
+        <template v-for="(systemItem, i) in form.SYSTEM_LIST">
+          <div v-if="systemItem.OPEN" :key="i">
+            <el-form-item
+              label="系统名称设置"
+              :prop="`SYSTEM_LIST.${i}.NAME`"
+              :rules="{ required: true, message: '系统名称不能为空', trigger: 'change' }"
             >
-              <template slot="trigger">
-                <i class="drag-icon n20-icon-shangchuan"></i>
-                <span class="drag-text">点击或将文件拖拽到这里上传</span>
-                <span class="drag-tip">建议图片尺寸：80*80，支持图片格式：png、jpg、bmp</span>
-              </template>
-            </cl-upload>
-          </el-form-item>
-          <el-form-item label="登录方式设置" class="is-required">
-            <span slot="label"
-              ><span>登录方式设置</span
-              ><span class="color-danger m-l-s f-s-s">({{ '至少选择一种登录方式' | $lc }})</span></span
+              <el-input ref="sys-name" v-model="systemItem.NAME" class="input-w-u" clearable />
+            </el-form-item>
+            <el-form-item label="系统标识图片设置" class="is-required">
+              <div class="login-form-bg-box">
+                <img :key="keyS[i]" class="login-preview" :src="systemItem.ICON || `/server-assets/N0${i + 1}.png`" />
+                <div>
+                  <div class="flex-box">
+                    <span class="m-r">上传图片</span>
+                    <cl-upload
+                      :action="`/bems/1.0/upload/${idNo}_${systemItem.NO}_icon`"
+                      :file-url.sync="systemItem.ICON"
+                      accept="image/*"
+                      msg-type="message"
+                      placeholder="选择附件"
+                      :on-success="() => (keyS[i] = keyS[i] + 1)"
+                    />
+                  </div>
+                  <div class="color-placeholder f-s-s">建议图片尺寸：80*80，支持图片格式：png、jpg、bmp、svg。</div>
+                </div>
+              </div>
+            </el-form-item>
+            <el-form-item
+              label="登录方式设置"
+              :prop="`SYSTEM_LIST.${i}.LOGIN_MODE`"
+              :rules="{ type: 'array', required: true, message: '至少选择一种登录方式', trigger: 'change' }"
             >
-            <el-checkbox-group v-model="systemItem.LOGIN_MODE">
-              <el-checkbox v-for="item in plainOptions" :key="item.value" :label="item.value">{{
-                item.label
-              }}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
+              <span slot="label"
+                ><span>登录方式设置</span
+                ><span class="color-danger m-l-s f-s-s">({{ '至少选择一种登录方式' | $lc }})</span></span
+              >
+              <el-checkbox-group v-model="systemItem.LOGIN_MODE">
+                <el-checkbox v-for="item in plainOptions" :key="item.value" :label="item.value">{{
+                  item.label
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </div>
         </template>
       </cl-expandable-pane>
     </el-form>
@@ -152,69 +154,67 @@ export default {
     this.setingId = {}
     return {
       userNo: sessionStorage.getItem('userNo'),
-      loginTypeDisabled: false,
       form: {
         LOGIN_URL: '',
-        LOGIN_MODE: [],
         GROUP_NAME: '',
         LOGIN_SLOGAN: '',
-        LOGIN_BG: undefined,
-        LOGIN_LOGO: undefined,
+        LOGIN_BG: '',
+        LOGIN_LOGO: '',
         LOGIN_TYPE: 'T1',
         SYSTEM_LIST: [
           {
-            NO: 'N01',
+            NO: 'CSZHYW',
             NAME: '财司综合业务系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: true
           },
           {
-            NO: 'N02',
+            NO: 'CSYWGL',
             NAME: '财司业务管理系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N03',
+            NO: 'CSFZJC',
             NAME: '财司辅助决策系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N04',
+            NO: 'CSWY',
             NAME: '财司网银系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N05',
+            NO: 'JTZL',
             NAME: '财司直连平台系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N06',
+            NO: 'JRWG',
             NAME: '金融网管系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N07',
+            NO: 'JTSKYWGK',
             NAME: '集团司库业务管控系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           },
           {
-            NO: 'N08',
+            NO: 'JTSKSJFX',
             NAME: '集团数据分析系统',
-            ICON: undefined,
+            ICON: '',
             LOGIN_MODE: [],
             OPEN: false
           }
@@ -226,7 +226,10 @@ export default {
         { label: $lc('二维码扫码登录'), value: 'qrcode' },
         { label: $lc('账户密码验证码登录'), value: 'accountPthon' }
       ],
-      systemItem: undefined
+      systemItem: undefined,
+      key_1: 0,
+      key_2: 0,
+      keyS: [0, 0, 0, 0, 0, 0, 0, 0]
     }
   },
   created() {
@@ -270,34 +273,19 @@ export default {
             })
           }
         }
-        this.openCg()
-
         // this.$axios.get(`/bems/1.0/download/${this.idNo}_bg`, null, { responseType: 'blob' })
       })
     },
     sltRow(row) {
       this.systemItem = row
     },
-    openCg() {
-      if (this.form.SYSTEM_LIST.filter((d) => d.OPEN).length <= 1) {
-        this.form.LOGIN_TYPE = 'T0'
-        this.loginTypeDisabled = true
-      } else {
-        this.loginTypeDisabled = false
-      }
-    },
-    async save() {
-      await this.$refs['form'].validate()
-      let errItem = this.form.SYSTEM_LIST.find((d) => d.OPEN && !d.NAME)
-      if (errItem) {
-        this.systemItem = errItem
-        this.$nextTick(() => {
-          this.$refs['sys-name'].focus()
-        })
-        this.$message.error($lc('系统名称设置不能为空'))
-        return
-      }
 
+    async save() {
+      let vPro = this.$refs['form'].validate()
+      vPro.catch(() => {
+        this.$message.error($lc('必填项不能为空'))
+      })
+      await vPro
       let data = []
       for (let k in this.form) {
         if (k !== 'SYSTEM_LIST') {
@@ -320,7 +308,11 @@ export default {
       }
 
       this.$axios.post(`/bems/1.0/sysSetting`, data).then((res) => {
-        this.countDown()
+        this.$message({
+          type: 'success',
+          message: `设置成功.`
+        })
+        this.$emit('renewal')
       })
     },
     Logout() {
@@ -330,7 +322,7 @@ export default {
       let secondsToGo = 5
       this.$message({
         type: 'success',
-        message: `设置成功,系统将在 ${secondsToGo} 秒后退出到登陆页面.`
+        message: `设置成功,系统将在 ${secondsToGo} 秒后退出到登录页面.`
       })
       const interval = setInterval(() => {
         secondsToGo -= 1
@@ -351,4 +343,19 @@ export default {
 .input-w-u {
   width: 430px;
 }
+.login-form-bg-box {
+  display: flex;
+  align-items: flex-end;
+}
+.login-preview {
+  width: 125px;
+  height: 125px;
+  margin-right: 16px;
+}
+.login-preview:hover {
+  background: rgba(0, 0, 0, 0.1);
+}
+::v-deep .el-upload {
+  width: 220px;
+}
 </style>

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

@@ -33,8 +33,8 @@
 
         <div class="sys-carousel">
           <div class="swiper-wrapper">
-            <div v-for="(item, i) in systemList" :key="item.NO" class="swiper-slide">
-              <div class="sys-item" :onclick="`loginSwiperSys(${i})`">
+            <div v-for="(item, i) in systemListAs" :key="i" class="swiper-slide">
+              <div class="sys-item" :onclick="`loginSwiperSys(${i},'${item.NO}')`">
                 <div class="sys-item-title flex-box flex-v flex-c">
                   <span>{{ item.NAME }}</span>
                 </div>
@@ -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,23 @@ export default {
     },
     systemList() {
       return this.form.SYSTEM_LIST.filter((d) => d.OPEN)
+    },
+    systemListAs() {
+      if (this.systemList.length === 2) {
+        return [...this.systemList, ...this.systemList, ...this.systemList]
+      } else {
+        return this.systemList
+      }
+    },
+    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 +335,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
@@ -376,9 +405,23 @@ export default {
       }
       this.jsonData = _layoutData
 
+      if (this.systemList.length <= 1) {
+        this.$set(this.form, 'LOGIN_TYPE', 'T0')
+      }
+
       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])
+          }
         }
       })
     },
@@ -437,9 +480,10 @@ export default {
         centeredSlides: true,
         loop: true
       })
-      window.loginSwiperSys = (i) => {
+      window.loginSwiperSys = (i, NO) => {
         this.swiper.slideTo(i + 3)
-        this.selSystem(this.systemList[i])
+        let item = this.systemList.find((s) => (s.NO = NO))
+        this.selSystem(item)
       }
     },
     slidePrev() {
@@ -661,6 +705,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'
 }

package/src/components/Upload/index.vue

@@ -274,12 +274,12 @@ export default {
       }
     },
     successFn(response, file, fileList) {
+      this.fileNameC = this.multiple ? '' : file.name
+      this.fileUrlC = response.data
+      this.fileList = fileList
+
       if (this.onSuccess) {
         this.onSuccess(response, file, fileList)
-      } else {
-        this.fileNameC = this.multiple ? '' : file.name
-        this.fileUrlC = response.data
-        this.fileList = fileList
       }
 
       if (this.msgType === 'dialog') {

package/src/i18n.json

@@ -1466,7 +1466,7 @@
   "登录首页文字显示信息不能为空": {
     "en": "Login homepage text display information cannot be empty"
   },
-  "登陆方式至少勾选一种方式": {
-    "en": "Login method Check at least one method"
+  "登录方式至少勾选一种方式": {
+    "en": "Check at least one login method"
   }
 }

package/src/utils/axios.js

@@ -63,26 +63,23 @@ axios.interceptors.request.use((opt) => {
   return opt
 })
 
-function errorFn(status, msg, noMsg) {
-  if (status === 401) {
-    if (navigator.userAgent.indexOf('NSTC-WebEntry') > -1) {
-      showMsg($lc('超时未操作，请重新登录！'))
-      setTimeout(() => {
+function errorFn(status, msg, noMsg, isErr) {
+  if (status === 401 || (msg.includes('401') && isErr)) {
+    noMsg || showMsg($lc('超时未操作，请重新登录！'))
+    setTimeout(() => {
+      if (navigator.userAgent.includes('NSTC-WebEntry')) {
         localStorage.clear()
         sessionStorage.clear()
         window.top.webQuit()
-      }, 3000)
-    } else {
-      noMsg || showMsg($lc('超时未操作，请重新登录！'))
-      setTimeout(() => {
+      } else {
         auth.removeToken()
-      }, 1000)
-    }
-  } else if (status === 400) {
+      }
+    }, 1000)
+  } else if (status === 400 || (msg.includes('400') && isErr)) {
     noMsg || showMsg($lc('400，参数错误！'))
-  } else if (status === 404) {
+  } else if (status === 404 || (msg.includes('404') && isErr)) {
     noMsg || showMsg($lc('404，网络连接失败！'))
-  } else if (status === 500) {
+  } else if (status === 500 || (msg.includes('500') && isErr)) {
     noMsg || showMsg($lc('500，服务器链接失败！'))
   } else if (status === 'ECONNABORTED' && msg.includes('timeout')) {
     showMsg($lc('请求超时'))
@@ -111,7 +108,7 @@ axios.interceptors.response.use(
     let msg = err.message || ''
     let noMsg = err.config && err.config.noMsg
 
-    return errorFn(status, msg, noMsg)
+    return errorFn(status, msg, noMsg, true)
   }
 )