Merge branch 'dev' of github.com:lanyulei/ferry_web

src/settings.js

 module.exports = {
-  title: 'ferry',
+  title: 'ferry 管理平台',
+  logo: 'https://www.fdevops.com/wp-content/uploads/2020/08/1597815294-ferry_logo_white.png',
+  isLdap: false,
 
   /**
    * @type {boolean} true | false

src/store/getters.js

@@ -12,6 +12,9 @@ const getters = {
   roles: state => state.user.roles,
   permisaction: state => state.user.permisaction,
   permission_routes: state => state.permission.routes,
-  errorLogs: state => state.errorLog.logs
+  errorLogs: state => state.errorLog.logs,
+  title: state => state.settings.title,
+  logo: state => state.settings.logo,
+  isLdap: state => state.settings.isLdap
 }
 export default getters

src/store/modules/settings.js

 import variables from '@/styles/element-variables.scss'
 import defaultSettings from '@/settings'
+import { getSettings } from '@/api/system/settings'
 
-const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
+const { title, logo, isLdap, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
 
 const state = {
   theme: variables.theme,
   showSettings: showSettings,
   tagsView: tagsView,
   fixedHeader: fixedHeader,
-  sidebarLogo: sidebarLogo
+  sidebarLogo: sidebarLogo,
+  title: title,
+  logo: logo,
+  isLdap: isLdap
 }
 
 const mutations = {
@@ -16,12 +20,28 @@ const mutations = {
     if (state.hasOwnProperty(key)) {
       state[key] = value
     }
+  },
+  CHANGE_SYSTEM_SETTING: (state, content) => {
+    state.title = content.name
+    state.logo = content.logo
+    state.isLdap = content.is_ldap
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  // get user info
+  getSystemSettings({ commit }) {
+    return new Promise((resolve) => {
+      getSettings({
+        classify: 1
+      }).then(response => {
+        commit('CHANGE_SYSTEM_SETTING', response.data[0].content)
+        resolve(response)
+      })
+    })
   }
 }
 

src/views/login/index.vue

@@ -23,8 +23,8 @@
     <div class="login-weaper animated bounceInDown">
       <div class="login-left">
         <div class="login-time" v-text="currentTime" />
-        <img :src="sysInfo.logo!==''?sysInfo.logo:'https://www.fdevops.com/wp-content/uploads/2020/08/1597815294-ferry_logo_white.png'" alt="" class="img">
-        <p class="title" v-text="sysInfo.name!==''?sysInfo.name:'ferry 管理平台'" />
+        <img :src="logo" alt="" class="img">
+        <p class="title" v-text="title" />
       </div>
       <div class="login-border">
         <div class="login-main">
@@ -89,7 +89,7 @@
               <img style="height: 48px;width: 100%;border: 1px solid rgba(0,0,0, 0.1);border-radius:5px;" :src="codeUrl" @click="getCode">
             </div>
             <div prop="code" style="width: 100%;float: left;margin-bottom: 13px">
-              <el-checkbox v-model="sysInfo.is_ldap">LDAP登陆</el-checkbox>
+              <el-checkbox v-model="isLdap">LDAP登陆</el-checkbox>
             </div>
             <el-button :loading="loading" type="primary" style="width:100%;padding:12px 20px;margin-bottom:30px;" @click.native.prevent="handleLogin">
               <span v-if="!loading">登 录</span>
@@ -106,8 +106,8 @@
 <script>
 
 import { getCodeImg } from '@/api/login'
-import { getSettings } from '@/api/system/settings'
 import moment from 'moment'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'Login',
@@ -137,14 +137,12 @@ export default {
       loading: false,
       redirect: undefined,
       otherQuery: {},
-      currentTime: null,
-      sysInfo: {
-        logo: '',
-        name: '',
-        is_ldap: false
-      }
+      currentTime: null
     }
   },
+  computed: {
+    ...mapGetters(['title', 'logo', 'isLdap'])
+  },
   watch: {
     $route: {
       handler: function(route) {
@@ -161,7 +159,6 @@ export default {
     this.getCode()
     // window.addEventListener('storage', this.afterQRScan)
     this.getCurrentTime()
-    this.getSystemSetting()
   },
   mounted() {
     if (this.loginForm.username === '') {
@@ -169,18 +166,15 @@ export default {
     } else if (this.loginForm.password === '') {
       this.$refs.password.focus()
     }
+    this.getSystemSettings()
   },
   destroyed() {
     clearInterval(this.timer)
     // window.removeEventListener('storage', this.afterQRScan)
   },
   methods: {
-    getSystemSetting() {
-      getSettings({
-        classify: 1
-      }).then(response => {
-        this.sysInfo = response.data[0].content
-      })
+    getSystemSettings() {
+      this.$store.dispatch('settings/getSystemSettings')
     },
     getCurrentTime() {
       this.timer = setInterval(_ => {
@@ -220,7 +214,7 @@ export default {
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          if (this.sysInfo.is_ldap) {
+          if (this.isLdap) {
             this.loginForm.loginType = 1
           } else {
             this.loginForm.loginType = 0

src/views/process/list/all.vue

@@ -9,6 +9,7 @@
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="ID" prop="id" width="120" />
         <el-table-column label="标题" prop="title" :show-overflow-tooltip="true" />
+        <el-table-column label="流程" prop="process_name" :show-overflow-tooltip="true" />
         <el-table-column label="当前状态" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>

src/views/process/list/components/search/index.vue

@@ -14,6 +14,7 @@
       <el-select
         v-model="listQuery.processor"
         filterable
+        clearable
         remote
         size="small"
         reserve-keyword
@@ -47,6 +48,7 @@
     <el-form-item label="创建时间">
       <el-date-picker
         v-model="timeValue"
+        clearable
         size="small"
         type="datetimerange"
         :picker-options="pickerOptions"
@@ -54,6 +56,7 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         align="right"
+        @change="getList"
       />
     </el-form-item>
     <el-form-item>

src/views/process/list/my-create.vue

@@ -11,6 +11,7 @@
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="ID" prop="id" width="120" />
         <el-table-column label="标题" prop="title" :show-overflow-tooltip="true" />
+        <el-table-column label="流程" prop="process_name" :show-overflow-tooltip="true" />
         <el-table-column label="当前状态" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>

src/views/process/list/related.vue

@@ -11,6 +11,7 @@
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="ID" prop="id" width="120" />
         <el-table-column label="标题" prop="title" :show-overflow-tooltip="true" />
+        <el-table-column label="流程" prop="process_name" :show-overflow-tooltip="true" />
         <el-table-column label="当前状态" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>

src/views/process/list/upcoming.vue

@@ -11,6 +11,7 @@
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="ID" prop="id" width="120" />
         <el-table-column label="标题" prop="title" :show-overflow-tooltip="true" />
+        <el-table-column label="流程" prop="process_name" :show-overflow-tooltip="true" />
         <el-table-column label="当前状态" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>