n20-common-lib 2.1.26 → 2.1.28

package/src/components/LoginTemporary/indexN.vue

@@ -16,27 +16,32 @@
       class="login-wrap"
       :class="{
         'login-wrap-1': form.LOGIN_TYPE === 'T1',
-        'login-wrap-2': form.LOGIN_TYPE === 'T2'
+        'login-wrap-2': form.LOGIN_TYPE === 'T2',
+        'login-bg-light': form.LOGIN_BG_TYPE === 'light'
       }"
       :style="{ backgroundImage: loginBg }"
     >
       <component :is="'style'">{{ wrapStyle }}</component>
 
       <div class="login-logo-box flex-box flex-v">
-        <img v-if="loginLogo" :src="loginLogo" :style="{ width: loginLogoWidth, height: loginLogoHeight }" />
+        <img
+          v-if="loginLogo"
+          :src="loginLogo"
+          onerror="imgLoad(this)"
+          :style="{ width: loginLogoWidth, height: loginLogoHeight }"
+        />
         <h3 class="login-logo-text">{{ loginLogoText | $l }}</h3>
       </div>
       <div class="login-verify-box" @click="inspectionV = true">{{ '查验中心' | $lc }} ></div>
 
       <template v-if="form.LOGIN_TYPE === 'T1'">
         <div class="sys-title">{{ '系统选择区' | $lc }}</div>
-
         <div class="sys-carousel">
           <div class="swiper-wrapper">
             <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-icon">
-                  <img :src="item | realUrl" />
+                  <img :src="item | realUrl" onerror="imgLoad(this)" />
                 </div>
                 <div class="sys-item-title flex-box flex-v flex-c">
                   <span>{{ item.NAME }}</span>
@@ -64,7 +69,7 @@
             @click="selSystem(item)"
           >
             <div class="sys-item-icon">
-              <img :src="item | realUrl" />
+              <img :src="item | realUrl" onerror="imgLoad(this)" />
             </div>
             <div class="sys-item-title flex-box flex-v flex-c">
               <span>{{ item.NAME }}</span>
@@ -134,6 +139,9 @@ import Inspection from './inspection/index.vue'
 import IconMap from './systemIconMap'
 import OLogin from './index.vue'
 
+import imgLoad from '../../utils/imgLoad'
+window.imgLoad = imgLoad
+
 export default {
   name: 'Login',
   components: {
@@ -198,6 +206,7 @@ export default {
         GROUP_NAME: '',
         LOGIN_SLOGAN: '',
         LOGIN_BG: undefined,
+        LOGIN_BG_TYPE: 'dark',
         LOGIN_LOGO: undefined,
         LOGIN_TYPE: undefined,
         SYSTEM_LIST: [
@@ -260,6 +269,7 @@ export default {
         ]
       },
       sltSys: {},
+      loginBg: 'none',
       inspectionV: false
     }
   },
@@ -273,14 +283,8 @@ export default {
         return this.jsonData.loginTypes || ['account']
       }
     },
-    loginBg() {
-      if (this.form.LOGIN_BG) {
-        return `url(${this.form.LOGIN_BG})`
-      } else if (this.jsonData.loginBg) {
-        return `url(${realUrl(this.jsonData.loginBg)})`
-      } else {
-        return 'none'
-      }
+    loginBgAs() {
+      return this.form.LOGIN_BG + '_' + this.jsonData.loginBg
     },
     loginLogo() {
       return this.form.LOGIN_LOGO || (this.jsonData.loginLogo && realUrl(this.jsonData.loginLogo)) || undefined
@@ -321,6 +325,17 @@ export default {
       return form
     }
   },
+  watch: {
+    loginBgAs() {
+      if (this.form.LOGIN_BG) {
+        imgLoad(this.form.LOGIN_BG).then((url) => {
+          this.loginBg = `url(${url})`
+        })
+      } else if (this.jsonData.loginBg) {
+        this.loginBg = `url(${realUrl(this.jsonData.loginBg)})`
+      }
+    }
+  },
   created() {
     if (this.autoLogin) return this.autoLoginSC()
     if (window.sessionStorage.getItem('_auto_login_ing_')) return this.autoLoginSS()
@@ -410,6 +425,7 @@ export default {
       }
 
       this.$nextTick(() => {
+        sessionStorage.setItem('headerTitle', this.form.GROUP_NAME)
         let systemNo = localStorage.getItem('pageInSystemNo')
         let acSysI = this.systemList.findIndex((s) => s.NO === systemNo)
 
@@ -482,7 +498,7 @@ export default {
       })
       window.loginSwiperSys = (i, NO) => {
         this.swiper.slideTo(i + 3)
-        let item = this.systemList.find((s) => (s.NO = NO))
+        let item = this.systemList.find((s) => s.NO === NO)
         this.selSystem(item)
       }
     },
@@ -509,6 +525,9 @@ export default {
   left: 116px;
   color: #ffffff;
 }
+.login-bg-light .login-logo-box {
+  color: #333333;
+}
 
 .login-logo-text {
   margin-left: 28px;
@@ -521,20 +540,22 @@ export default {
   right: 103px;
   top: 50%;
   transform: translateY(-50%);
-  width: 300px;
-  min-height: 340px;
-  padding: 30px !important;
+  padding: 30px 30px 18px !important;
   background: #f7f6f6;
 }
+.login-bg-light .login-form {
+  background: #ffffff;
+}
 
 .login-verify-box {
   box-sizing: border-box;
   position: absolute;
   top: 57px;
   right: 103px;
-  width: 86px;
   height: 28px;
   line-height: 26px;
+  padding-left: 8px;
+  padding-right: 8px;
   border: 1px solid #ffffff;
   border-radius: 4px;
   font-size: 14px;
@@ -542,16 +563,26 @@ export default {
   color: #ffffff;
   cursor: pointer;
 }
+.login-bg-light .login-verify-box {
+  color: #333333;
+  border-color: #333333;
+}
 
 .login-form-header {
   font-size: 16px;
   color: #3d4a57;
 }
+.login-bg-light .login-form {
+  color: #333333;
+}
 
 .login-form-footer {
   font-size: 12px;
   color: #3d4a57;
 }
+.login-bg-light .login-form-footer {
+  color: #333333;
+}
 
 .login-form-download {
   text-decoration: none;
@@ -579,18 +610,15 @@ export default {
   right: 103px;
   top: calc(50% - 65px);
   transform: translateY(-50%);
-  width: 300px;
-  min-height: 340px;
-  padding: 30px !important;
-  background: #f7f6f6;
 }
 .login-wrap-1 .sys-title {
-  position: absolute;
+  display: none;
+  /* position: absolute;
   left: 116px;
   top: calc(50% - 248px);
   line-height: 22px;
   font-size: 16px;
-  color: #ffffff;
+  color: #ffffff; */
 }
 .login-wrap-1 .sys-carousel {
   position: absolute;
@@ -609,16 +637,26 @@ export default {
   width: 100%;
   height: 281px;
   border-radius: 8px;
-  background: linear-gradient(180deg, rgba(153, 165, 186, 0.53), rgba(96, 108, 133, 0.15));
+  background: linear-gradient(180deg, rgba(188, 188, 188, 0.6), rgba(124, 124, 124, 0.1));
   cursor: pointer;
 }
+.login-bg-light.login-wrap-1 .swiper-slide .sys-item {
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0));
+  box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.1);
+}
 .login-wrap-1 .swiper-slide-active,
 .login-wrap-1 .swiper-slide-duplicate-active {
   transform: scale(1);
 }
 .login-wrap-1 .swiper-slide-active .sys-item,
 .login-wrap-1 .swiper-slide-duplicate-active .sys-item {
-  background: linear-gradient(180deg, rgba(49, 82, 244, 0.53), rgba(96, 108, 133, 0.15));
+  background-image: url('./item1-active.png');
+  background-size: 100% 100%;
+}
+.login-bg-light.login-wrap-1 .swiper-slide-active .sys-item,
+.login-bg-light.login-wrap-1 .swiper-slide-duplicate-active .sys-item {
+  background-image: url('./item1-light-active.png');
+  background-size: 100% 100%;
 }
 .login-wrap-1 .swiper-button-prev,
 .login-wrap-1 .swiper-button-next {
@@ -632,6 +670,10 @@ export default {
   background-size: 100% 100%;
   cursor: pointer;
 }
+.login-bg-light.login-wrap-1 .swiper-button-prev,
+.login-bg-light.login-wrap-1 .swiper-button-next {
+  filter: brightness(0.7);
+}
 .login-wrap-1 .swiper-button-next {
   left: 964px;
   background-image: url('./button-next.png');
@@ -644,6 +686,9 @@ export default {
   line-height: 25px;
   user-select: none;
 }
+.login-bg-light.login-wrap-1 .sys-item-title {
+  color: #333333;
+}
 .login-wrap-1 .sys-item-icon {
   padding-top: 36px;
   text-align: center;
@@ -654,19 +699,20 @@ export default {
   user-select: none;
 }
 .login-wrap-1 .sys-item-shadow {
-  width: 349px;
+  display: none;
+  /* width: 349px;
   height: 15px;
   margin-top: 20px;
   background: url('./sysShadow.png');
   background-size: 100% 100%;
   margin-left: -45px;
   opacity: 0;
-  transition: 300ms;
+  transition: 300ms; */
 }
-.login-wrap-1 .swiper-slide-active .sys-item-shadow,
+/* .login-wrap-1 .swiper-slide-active .sys-item-shadow,
 .login-wrap-1 .swiper-slide-duplicate-active .sys-item-shadow {
   opacity: 0.5;
-}
+} */
 
 .login-wrap-2 .login-logo-box {
   left: 116px;
@@ -677,24 +723,21 @@ export default {
   right: 106px;
   top: 50%;
   transform: translateY(-50%);
-  width: 300px;
-  min-height: 340px;
-  padding: 30px !important;
-  background: #f7f6f6;
 }
 .login-wrap-2 .sys-title {
-  position: absolute;
+  display: none;
+  /* position: absolute;
   left: 116px;
   top: calc(50% - 310px);
   line-height: 22px;
   font-size: 16px;
-  color: #ffffff;
+  color: #ffffff; */
 }
 .login-wrap-2 .sys-carousel {
   width: 856px;
   position: absolute;
   left: 106px;
-  top: calc(50% + 12px);
+  top: calc(50% + 0px);
   transform: translateY(-50%);
   flex-wrap: wrap;
   justify-content: space-between;
@@ -706,11 +749,20 @@ export default {
   background: url('./item2.png');
   background-size: 100% 100%;
 }
+.login-bg-light.login-wrap-2 .sys-item {
+  background-image: url('./item2-light.png');
+  box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.1);
+}
 .login-wrap-2 .sys-item:hover,
 .login-wrap-2 .sys-item.active {
   background: url('./item2-active.png');
   background-size: 100% 100%;
 }
+.login-bg-light.login-wrap-2 .sys-item:hover,
+.login-bg-light.login-wrap-2 .sys-item.active {
+  background-image: url('./item2-light-active.png');
+  background-size: 100% 100%;
+}
 .login-wrap-2 .sys-item-title {
   height: 58px;
   font-size: 14px;
@@ -718,6 +770,9 @@ export default {
   line-height: 20px;
   user-select: none;
 }
+.login-bg-light.login-wrap-2 .sys-item-title {
+  color: #333333;
+}
 .login-wrap-2 .sys-item-icon {
   padding-top: 20px;
   text-align: center;

package/src/components/Statis/statisPopover.vue

@@ -16,6 +16,8 @@
     placement="bottom-start"
     :visible-arrow="false"
     popper-class="n20-statis-pop"
+    @show="show = true"
+    @hide="show = false"
   >
     <div slot="reference" class="flex-box p-t-s p-b-s">
       <statisItem
@@ -26,7 +28,7 @@
         :list="item.list"
         :count-label="countLabel"
       />
-      <i class="rotating-icon n20-icon-nianfenqiehuan-youce"></i>
+      <i class="n20-icon-nianfenqiehuan-youce" :class="show ? 'rotating-icon-show' : 'rotating-icon'"></i>
     </div>
 
     <div>
@@ -59,6 +61,20 @@ export default {
       type: Array,
       default: undefined
     }
+  },
+  data() {
+    return {
+      show: false
+    }
   }
 }
 </script>
+<style>
+.rotating-icon {
+  transform: rotate(90deg);
+}
+
+.rotating-icon-show {
+  transform: rotate(270deg);
+}
+</style>

package/src/components/Upload/uploadMsg.vue

@@ -7,78 +7,87 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
   >
-    <template v-if="!hidePercent">
-      <p v-if="!percentType">{{ '系统处理中，请稍等......' | $lc }}</p>
-      <div v-else>
-        <div v-if="validateResult" class="m-b"><span class="m-r-m">导入文件</span>{{ validateResult.name }}</div>
-        <div class="flex-box">
-          <div class="m-r-m">{{ '导入进度' | $lc }}</div>
-          <div class="flex-item">
-            <el-progress
-              class="m-b"
-              :percentage="percent"
-              :status="percentType !== 'loading' ? percentType : undefined"
-            />
+    <div style="min-height: 28px">
+      <template v-if="!hidePercent">
+        <p v-if="!percentType">{{ '系统处理中，请稍等......' | $lc }}</p>
+        <div v-else>
+          <div v-if="validateResult" class="m-b"><span class="m-r-m">导入文件</span>{{ validateResult.name }}</div>
+          <div class="flex-box">
+            <div class="m-r-m">{{ '导入进度' | $lc }}</div>
+            <div class="flex-item">
+              <el-progress
+                class="m-b"
+                :percentage="percent"
+                :status="percentType !== 'loading' ? percentType : undefined"
+              />
+            </div>
           </div>
         </div>
-      </div>
-    </template>
-    <!-- 错误数据行提示 -->
-    <template v-if="validateResult">
-      <div class="m-b">
-        <span class="m-r">{{ '导入统计' | $lc }}</span>
-        <span>{{ '共计导入' | $lc }}{{ validateResult.totalNum }}{{ '条,' | $lc }} </span>
-        <span class="m-r-s">
-          {{ '其中有效数据' | $lc }}
-          <span class="color-success">{{ validateResult.successNum }}</span
-          >{{ '条,' | $lc }}
-        </span>
-        <span>
-          {{ '无效数据' | $lc }}
-          <span class="color-danger">{{ validateResult.errorList.length }}</span
-          >{{ '条。' | $lc }}
-        </span>
-      </div>
-      <template v-if="validateResult.errorList.length">
-        <div class="bd-t bd-l bd-r">
-          <div class="m-t m-b p-l">{{ '无效数据详情' | $lc }}</div>
-          <el-table :data="errorList">
-            <el-table-column v-for="column in columnsList" :key="column.prop" :prop="column.prop" :label="column.label">
-              <template slot-scope="scope">
-                <!-- eslint-disable-next-line vue/no-v-html -->
-                <span v-html="scope.row[column.prop]"></span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div class="color-warning m-t-s">{{ '上述数据输入有误，请修改导入文件中相关信息！' | $lc }}</div>
       </template>
-      <span slot="footer">
-        <div v-if="footerBtn">
-          <el-button
-            type="primary"
-            @click="
-              () => {
-                footerBtn.confirm.click()
-                progressV = false
-              }
-            "
-            >{{ footerBtn.confirm.text | $lc }}</el-button
-          >
-          <el-button
-            plain
-            @click="
-              () => {
-                footerBtn.cancel.click()
-                progressV = false
-              }
-            "
-            >{{ footerBtn.cancel.text | $lc }}</el-button
-          >
+      <!-- 错误数据行提示 -->
+      <template v-if="validateResult">
+        <div class="m-b">
+          <span class="m-r">{{ '导入统计' | $lc }}</span>
+          <span>{{ '共计导入' | $lc }}{{ validateResult.totalNum }}{{ '条,' | $lc }} </span>
+          <span class="m-r-s">
+            {{ '其中有效数据' | $lc }}
+            <span class="color-success">{{ validateResult.successNum }}</span
+            >{{ '条,' | $lc }}
+          </span>
+          <span>
+            {{ '无效数据' | $lc }}
+            <span class="color-danger">{{ validateResult.errorList.length }}</span
+            >{{ '条。' | $lc }}
+          </span>
         </div>
-        <el-button v-else type="primary" @click="confirmFn">{{ '确认' | $lc }}</el-button>
-      </span>
-    </template>
+        <template v-if="validateResult.errorList.length">
+          <div class="bd-t bd-l bd-r">
+            <div class="m-t m-b p-l">{{ '无效数据详情' | $lc }}</div>
+            <el-table :data="errorList">
+              <el-table-column
+                v-for="column in columnsList"
+                :key="column.prop"
+                :prop="column.prop"
+                :label="column.label"
+              >
+                <template slot-scope="scope">
+                  <!-- eslint-disable-next-line vue/no-v-html -->
+                  <span v-html="scope.row[column.prop]"></span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="color-warning m-t-s">{{ '上述数据输入有误，请修改导入文件中相关信息！' | $lc }}</div>
+        </template>
+      </template>
+    </div>
+    <div slot="footer" style="height: 32px">
+      <template v-if="validateResult && footerBtn">
+        <el-button
+          type="primary"
+          @click="
+            () => {
+              footerBtn.confirm.click()
+              progressV = false
+            }
+          "
+          >{{ footerBtn.confirm.text | $lc }}</el-button
+        >
+        <el-button
+          plain
+          @click="
+            () => {
+              footerBtn.cancel.click()
+              progressV = false
+            }
+          "
+          >{{ footerBtn.cancel.text | $lc }}</el-button
+        >
+      </template>
+      <el-button v-else-if="validateResult || percentType === 'success'" type="primary" @click="confirmFn">{{
+        '确认' | $lc
+      }}</el-button>
+    </div>
   </el-dialog>
 </template>
 

package/src/index.js

@@ -104,6 +104,7 @@ import { hasG as isHasG } from './directives/VHas/index.js'
 import asyncGetRelaNos from './utils/asyncGetRelaNos.js'
 import importG from './utils/importGlobal.js' // 联合加载组件保存位置
 import N from './utils/numberPor.js' // 扩展Number
+import imgLoad from './utils/imgLoad.js'
 
 /** 国际化 */
 import i18n, { $l } from './utils/i18n'
@@ -230,6 +231,7 @@ export {
   downloadBlob,
   forEachs,
   list2tree,
+  imgLoad,
   repairEl,
   // 页签/路由
   setTabs,

package/src/utils/axios.js

@@ -63,7 +63,7 @@ axios.interceptors.request.use((opt) => {
   return opt
 })
 
-function errorFn(status, msg, noMsg, isErr) {
+function errorFn(status, msg, noMsg, isErr, res) {
   if (status === 401 || (isErr && msg.includes('401'))) {
     noMsg || showMsg($lc('超时未操作，请重新登录！'))
     setTimeout(() => {
@@ -90,7 +90,7 @@ function errorFn(status, msg, noMsg, isErr) {
   } else {
     // noMsg || showMsg(msg)
   }
-  throw { code: status, msg: msg }
+  throw { code: status, msg: msg, response: res }
 }
 
 axios.interceptors.response.use(
@@ -102,7 +102,7 @@ axios.interceptors.response.use(
       let msg = (res.data && (res.data.msg || res.data.message)) || ''
       let noMsg = res.config && res.config.noMsg
 
-      return errorFn(status, msg, noMsg)
+      return errorFn(status, msg, noMsg, false, res)
     }
   },
   (err) => {

package/src/utils/imgLoad.js

@@ -0,0 +1,47 @@
+import axios from './axios'
+
+export default function imgLoad(el) {
+  if (el) {
+    if (el.tagName === 'IMG') {
+      let url = el.getAttribute('src')
+      let dataurl = el.getAttribute('data-url')
+      if (url && url !== dataurl) {
+        el.setAttribute('data-url', url)
+
+        let tA = document.createElement('a')
+        tA.href = url
+        let _url = tA.pathname + tA.search
+        tA = undefined
+
+        axios.get(_url, null, { loading: false, noMsg: true, responseType: 'blob' }).then((blob) => {
+          el.setAttribute('src', URL.createObjectURL(blob))
+        })
+      }
+    } else if (typeof el === 'string') {
+      let url = el
+      return new Promise((resolve, reject) => {
+        let tImg = document.createElement('img')
+        tImg.setAttribute('src', url)
+        tImg.onload = () => {
+          resolve(url)
+          tImg = undefined
+        }
+        tImg.onerror = () => {
+          let tA = document.createElement('a')
+          tA.href = url
+          let _url = tA.pathname + tA.search
+          tA = undefined
+          axios
+            .get(_url, null, { loading: false, noMsg: true, responseType: 'blob' })
+            .then((blob) => {
+              resolve(URL.createObjectURL(blob))
+              tImg = undefined
+            })
+            .catch(() => {
+              tImg = undefined
+            })
+        }
+      })
+    }
+  }
+}

package/src/utils/tableheaderFilterpanel.vue

@@ -18,23 +18,22 @@
           filters | alltextF
         }}</el-checkbox>
       </div>
-      <el-checkbox-group v-model="filteredValue" class="flex-column" style="max-height: 226px; overflow: auto">
+      <el-checkbox-group v-model="filteredValue" class="input-w p-b-s" style="max-height: 226px; overflow: auto">
         <template v-for="filter in filters">
           <el-checkbox
             v-if="filter.text.includes(searchVal)"
             :key="filter.value"
             class="m-t-s m-r-0"
             :label="filter.value"
+            style="display: block"
           >
             <!-- v-title="filter.text" :show-overflow-tooltip="true" -->
-            <span class="text-ellipsis align-bottom" style="display: inline-block; max-width: 12em">{{
-              filter.text
-            }}</span>
+            <span class="align-bottom">{{ filter.text }}</span>
             <span>{{ filter | countF }}</span>
           </el-checkbox>
         </template>
       </el-checkbox-group>
-      <div class="flex-box flex-c m-t-m">
+      <div class="flex-box flex-c m-t-s">
         <el-button
           type="primary"
           size="mini"

package/src/utils/urlToGo.js

@@ -57,7 +57,7 @@ function buildURL(url, params) {
 
 export function linkPush(url = '', query = {}, $router) {
   query._fromNo = Date.now()
-  sessionStorage.setItem(query._fromNo, location.href)
+  sessionStorage.setItem(query._fromNo, location.pathname + location.search)
   // 如果提供vue-router
   if (process.env.NODE_ENV === 'development' && $router?.push) {
     let base = $router.options.base || ''