system-clients 3.2.56 → 3.2.57-furuike

package/src/filiale/zhoukou/system.js

@@ -1,6 +1,6 @@
-// 分公司特殊组件页面注册
-
-let specialComp = {
-  'home-page': (resolve) => require(['./Main'], resolve)
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+
+let specialComp = {
+  'home-page': (resolve) => require(['./Main'], resolve)
+}
+exports.specialComp = specialComp

package/src/plugins/GetLoginInfoService.js

@@ -6,9 +6,6 @@ let loginGen = async function (name, password, cue) {
   data = '$'+cryptJS.RSAEncrypt(JSON.stringify(data))
   let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
   if (getLogin.data.states === '登录成功') {
-    //获取jwt
-    Vue.$login.jwt = getLogin.data.jwt
-    Vue.$login.jwtNew = getLogin.data.jwtNew
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
     data = cryptJS.RSAEncrypt(JSON.stringify(data))
@@ -18,6 +15,8 @@ let loginGen = async function (name, password, cue) {
     })
     console.log('登陆获取Util', JSON.stringify(resource.data))
     Vue.$login.f = resource.data
+    //获取jwt
+    Vue.$login.jwt = getLogin.data.jwt
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
 

package/src/system.js

@@ -28,7 +28,7 @@ import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
 
 // BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null} = {}) {
+export default function (val,filiale, {showLogin = false, show_daiBan = false, BAinformation = null} = {}) {
   console.log(val,filiale,showLogin)
   //验证码开关赋值
   if(val!=null){
@@ -38,8 +38,6 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, s
   GetLoginInfoService.depPrompt=showLogin
   //展示待办赋值
   GetLoginInfoService.showDaiBan=show_daiBan
-  //展示异地登录
-  GetLoginInfoService.showYiDi=show_yiDi
   // 备案信息复制
   GetLoginInfoService.BAinformation = BAinformation
   Vue.use(GetLoginInfoService)
@@ -70,8 +68,6 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, s
   Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
   // 参数管理
   Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
-  //进度条插件
-  Vue.component('progress-base', (resolve) => { require(['./components/common/ProgressBase'], resolve) })
 
   // 参数管理(旧)
   Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Mar 06 15:27:14 CST 2023
-gradle.version=6.5.1

package/src/components/common/ProgressBase.vue

@@ -1,83 +0,0 @@
-<template>
-  <div class="m-progress" style="width:100%">
-    <div class="m-progress-outer">
-      <div class="m-progress-inner">
-        <div :class="['u-progress-bg', {'u-success-bg':getProgress(progress,width) >= 100}]" :style="{width: `${getProgress(progress,width) >= 100 ? 100:getProgress(progress,width)}%`,height: `${strokeWidth}px`}"></div>
-      </div>
-    </div>
-    <div v-if="showInfo">
-      <svg class="u-success" v-if="getProgress(progress,width)>=100" viewBox="64 64 896 896" data-icon="check-circle" aria-hidden="true" focusable="false"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 0 1-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"></path></svg>
-      <p class="u-progress-text" v-else>{{getProgress(progress,width)>=100 ? 100:getProgress(progress,width) }}%</p>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: 'Progress',
-  props: {
-    width: { // 进度条总宽度
-      type: Number,
-      default: 100
-    },
-    progress: { // 当前进度
-      type: Number,
-      default: 0
-    },
-    strokeWidth: { // 进度条线的宽度
-      type: Number,
-      default: 13
-    },
-    showInfo: { // 是否显示进度数值或状态图标
-      type: Boolean,
-      default: true
-    }
-  },
-
-  methods: {
-    // 进度的转换
-    getProgress(val1,val2){
-      if (val1 === 0 || val2 === 0) {
-        return 0
-      }
-      return (Math.round(val1/val2 * 10000) /100)
-    },
-  }
-}
-</script>
-<style lang="less" scoped>
-.m-progress {
-  height: 13px;
-  margin: 0 auto;
-  display: flex;
-  .m-progress-outer {
-    width: 61%;
-    .m-progress-inner {
-      display: inline-block;
-      width: 100%;
-      background: #f1f0f0;
-      border-radius: 13px;
-      .u-progress-bg {
-        // background: #1890FF;
-        background: linear-gradient(to right, rgb(16, 142, 233), rgb(135, 208, 104));
-        border-radius: 100px;
-        transition: all .3s cubic-bezier(.08,.82,.17,1);
-      }
-      .u-success-bg {
-        border-radius: 100px;
-        background: #52C41A;
-      }
-    }
-  }
-  .u-success {
-    width: 12px;
-    height: 12px;
-    fill: #52C41A;
-    margin-left: 2px;
-  }
-  .u-progress-text {
-    font-size: 12px;
-    margin-left: 2px;
-    color: rgba(0,0,0,.45);
-  }
-}
-</style>