system-clients 1.6.65 → 1.6.66-foric

package/build.gradle

@@ -1,6 +1,6 @@
-version = '1.6.65'
-
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}
+version = '1.6.62'
+
+task release(type:Exec) {
+	workingDir '.'
+	commandLine 'cmd', '/c', 'release.bat ' + version
+}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "system-clients",
-  "version": "1.6.65",
+  "version": "1.6.66-foric",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
+    "doc": "doc",
     "example": "examples",
     "test": "test"
   },

package/src/components/server/Login.vue

@@ -2,37 +2,37 @@
   <div class="loginbg">
     <span class="logotitle"></span>
     <!-- <img src="../../../static/huangtengbiaozhi.png" alt="图片加载未完成" class="img-responsive logotitle" /> -->
-    <div class="notice-board" style="height:40%;">
-      <h1 text-align="center">变更公告：</h1>
-      <div style="overflow:hidden;width:500px;margin:10px ">
-        <div style="overflow-y:auto;width:520px;">
-          <!--<change-declare ></change-declare>-->
-        </div>
-      </div>
-      <p>版本号：v1.0.0</p>
+    <div class="notice-board" style="height:auto;text-align: center;width: auto;">
+      <h1 text-align="center">登录中...</h1>
+<!--      <div style="overflow:hidden;width:500px;margin:10px ">-->
+<!--        <div style="overflow-y:auto;width:520px;">-->
+<!--          &lt;!&ndash;<change-declare ></change-declare>&ndash;&gt;-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <p>版本号：v1.0.0</p>-->
     </div>
     <!--输入框-->
-    <div class="htmleaf-container">
-      <!-- <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> -->
-      <div class="wrapper" :class="{'form-success': login}">
-        <div class="container">
-          <h3 style="color:white;">欢迎使用</h3>
-          <!-- <h4 style="color:white;">Welcome to OA System</h4> -->
-          <form class="form">
-            <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">
-            <input type="password" placeholder="密码" v-model="model.password" class="psicon"
-                   @keyup.enter="confirm('key')">
-            <input v-if="$login.Verification" style="width: 40%; display: inline" type="text" placeholder="请输入验证码"
-                   v-model="picLyanzhengma" @keyup.enter="confirm('key')">
-            <input v-if="$login.Verification" style="width: 30%; display: inline;background-color: darkgray;"
-                   type="button" @click="createCode" v-model="checkCode"/><br>
-            <button type="button" id="login-button" @click.prevent="confirm('click')"><strong>登录</strong></button>
-            <!-- <button type="button" id="login-button" @click.prevent="confirm()"><strong>注册</strong></button> -->
-            <!-- <span @click="register()">还没有注册，现在注册>>></span> -->
-          </form>
-        </div>
-      </div>
-    </div>
+<!--    <div class="htmleaf-container">-->
+<!--      &lt;!&ndash; <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> &ndash;&gt;-->
+<!--      <div class="wrapper" :class="{'form-success': login}">-->
+<!--        <div class="container">-->
+<!--          <h3 style="color:white;">欢迎使用</h3>-->
+<!--          &lt;!&ndash; <h4 style="color:white;">Welcome to OA System</h4> &ndash;&gt;-->
+<!--&lt;!&ndash;          <form class="form">&ndash;&gt;-->
+<!--&lt;!&ndash;            <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">&ndash;&gt;-->
+<!--&lt;!&ndash;            <input type="password" placeholder="密码" v-model="model.password" class="psicon"&ndash;&gt;-->
+<!--&lt;!&ndash;                   @keyup.enter="confirm('key')">&ndash;&gt;-->
+<!--&lt;!&ndash;            <input v-if="$login.Verification" style="width: 40%; display: inline" type="text" placeholder="请输入验证码"&ndash;&gt;-->
+<!--&lt;!&ndash;                   v-model="picLyanzhengma" @keyup.enter="confirm('key')">&ndash;&gt;-->
+<!--&lt;!&ndash;            <input v-if="$login.Verification" style="width: 30%; display: inline;background-color: darkgray;"&ndash;&gt;-->
+<!--&lt;!&ndash;                   type="button" @click="createCode" v-model="checkCode"/><br>&ndash;&gt;-->
+<!--&lt;!&ndash;            <button type="button" id="login-button" @click.prevent="confirm('click')"><strong>登录</strong></button>&ndash;&gt;-->
+<!--&lt;!&ndash;            &lt;!&ndash; <button type="button" id="login-button" @click.prevent="confirm()"><strong>注册</strong></button> &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;            &lt;!&ndash; <span @click="register()">还没有注册，现在注册>>></span> &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;          </form>&ndash;&gt;-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
     <!--输入框结束-->
     <!-- 注册模态框开始 -->
     <!-- <modal v-ref:modal :show.sync="registerShow" :backdrop="false" class="auto">
@@ -148,16 +148,55 @@
   export default {
     title: '登录',
     ready () {
-      if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
-        this.model.ename = this.$login.getUrlCompileParames('name')
-        this.model.password = this.$login.getUrlCompileParames('password')
-        this.confirm()
+      if (window.location.href.includes('ticket')) {
+        let url = window.location.href.split("?")[1]
+        let obj = {}
+        for (let params of url.split("&")) {
+          let kv = params.split("=")
+          obj[kv[0]] = kv[1]
+        }
+        let params = {
+          st: obj.ticket,
+          serviceKey: '931c5577c71047b9b58e1a7638b4e999'
+        }
+        this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
+          // this.$showMessage("re----" + JSON.stringify(re))
+          if (re.data.code === 200) {
+            let condition = `ename = '${re.data.data.userName}'`
+            this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+              if (res.data && res.data.length > 0) {
+                this.model.ename = res.data[0].ename
+                this.model.password = res.data[0].password
+                // this.$showMessage("re----" + JSON.stringify(this.model))
+                let gen = saveGen(this)
+                return co(gen)
+              }
+            })
+          } else {
+            if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
+              this.model.ename = this.$login.getUrlCompileParames('name')
+              this.model.password = this.$login.getUrlCompileParames('password')
+              this.confirm()
+            }
+            $('#login-button').click(function (event) {
+              event.preventDefault()
+              $('form').fadeOut(500)
+            }),
+              this.createCode()
+          }
+        })
+      } else {
+        if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
+          this.model.ename = this.$login.getUrlCompileParames('name')
+          this.model.password = this.$login.getUrlCompileParames('password')
+          this.confirm()
+        }
+        $('#login-button').click(function (event) {
+          event.preventDefault()
+          $('form').fadeOut(500)
+        }),
+          this.createCode()
       }
-      $('#login-button').click(function (event) {
-        event.preventDefault()
-        $('form').fadeOut(500)
-      }),
-        this.createCode()
     },
     data () {
       return {

package/src/components/server/ResSelectGroup.vue

@@ -1,92 +1,86 @@
-<template>
-  <div :class="style">
-    <label class="control-label">公司 </label>
-    <right-tree @re-res="getorg"></right-tree>
-  </div>
-  <div :class="style">
-    <label class="control-label">部门 </label>
-    <res-select restype='department'
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initresid'
-                :is-mul="mul">
-    </res-select>
-
-  </div>
-  <div :class="style">
-    <label class="control-label">人员 </label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initresid'
-                :is-mul="mul">
-    </res-select>
-  </div>
-</template>
-<script>
-  import plugin from '../../plugins/GetLoginInfoService'
-  export default {
-    title: '资源选择测试',
-    props: {
-      style: {
-        type: String,
-        default: 'col-sm-2 form-group form-input-group form-fix-width'
-      },
-      mul: {
-        type: Boolean,
-        default: true
-      },
-    },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
-    },
-    ready () {
-      console.log('开始获取组织结构。。。')
-    },
-    methods:{
-      returnOrg(ids){
-        let condition;
-        if(this.depresid.length > 0)
-          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-        else
-          condition = " and f_orgid = " + this.$login.f.orgid;
-        if(this.userresid.length > 0){
-          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-        }
-        if(ids && ids.length > 0){
-          condition += " and f_operatorid in " + plugin.convertToIn(ids);
-        }
-        this.$dispatch('re-res',condition,this.obj)
-      },
-      getorg (obj) {
-        console.log("选中公司的数据11",obj.resids)
-        this.depresid=obj.resids
-        this.obj.orgnames = obj.res
-        this.returnOrg();
-      },
-      getdep(obj,val) {
-        console.log("选中部门的数据22",obj)
-        this.obj.depnames = val
-        this.userresid=obj
-        this.returnOrg();
-      },
-      getuser(obj) {
-        this.obj.operatornames = obj
-        console.log("选中用户的数据33",obj)
-        this.returnOrg(obj);
-      },
-    },
-    watch: {
-
-    },
-  }
-</script>
+<template>
+  <div :class="style">
+    <label class="control-label">公司 </label>
+    <right-tree @re-res="getorg"></right-tree>
+  </div>
+  <div :class="style">
+    <label class="control-label">部门 </label>
+    <res-select restype='department'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initresid'>
+    </res-select>
+
+  </div>
+  <div :class="style">
+    <label class="control-label">人员 </label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initresid'>
+    </res-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  export default {
+    title: '资源选择测试',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group form-input-group form-fix-width'
+      }
+    },
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
+        }
+      }
+    },
+    ready () {
+      console.log('开始获取组织结构。。。')
+    },
+    methods:{
+      returnOrg(ids){
+        let condition;
+        if(this.depresid.length > 0)
+          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+        else
+          condition = " and f_orgid = " + this.$login.f.orgid;
+        if(this.userresid.length > 0){
+          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+        }
+        if(ids && ids.length > 0){
+          condition += " and f_operatorid in " + plugin.convertToIn(ids);
+        }
+        this.$dispatch('re-res',condition,this.obj)
+      },
+      getorg (obj) {
+        console.log("选中公司的数据11",obj.resids)
+        this.depresid=obj.resids
+        this.obj.orgnames = obj.res
+        this.returnOrg();
+      },
+      getdep(obj,val) {
+        console.log("选中部门的数据22",obj)
+        this.obj.depnames = val
+        this.userresid=obj
+        this.returnOrg();
+      },
+      getuser(obj) {
+        this.obj.operatornames = obj
+        console.log("选中用户的数据33",obj)
+        this.returnOrg(obj);
+      },
+    },
+    watch: {
+
+    },
+  }
+</script>

package/.npmignore

@@ -1,9 +0,0 @@
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-/dev-server.js

package/src/.npmignore

@@ -1 +0,0 @@
-/main.js