up

.env.development

@@ -2,5 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = http://hdcontract.ali251.langye.net
-VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
+VUE_APP_BASE_API = ''
+#VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
+
+VUE_APP_OUT_URL = http://192.168.60.18:2021

.env.production

@@ -3,4 +3,4 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = ''
-VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
+VUE_APP_OUT_URL = http://192.168.60.18:2021

src/permission.js

@@ -29,9 +29,13 @@ router.beforeEach(async (to, from, next) => {
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
-      next({
-        path: '/'
-      })
+  console.log(to.fullPath)
+      await store.dispatch('user/resetToken')
+
+      next(to.fullPath)
+      // next({
+      //   path: '/'
+      // })
       NProgress.done()
     } else {
       // determine whether the user has obtained his permission roles through getInfo

src/store/modules/user.js

@@ -134,6 +134,7 @@ const actions = {
     state
   }) {
     return new Promise((resolve, reject) => {
+      console.log("logout",state.token)
       logout(state.token).then(() => {
         removeToken() // must remove  token  first
         resetRouter()

src/views/login/index.vue

@@ -89,6 +89,8 @@
       var query = this.$route.query;
       if (query.token && query.userid && query.tp) {
         this.loading = true
+        console.log(query.token)
+        //this.$store.dispatch('user/logout')
         this.$store.dispatch('user/loginskip', {
           token: query.token,
           tp: query.tp
@@ -117,7 +119,7 @@
       handleLogin() {
         this.$refs.loginForm.validate(valid => {
           if (valid) {
-            this.loading = true
+            this.loading = true;
             this.$store.dispatch('user/login', this.loginForm).then(() => {
               console.log(this.redirect)
               this.$router.push({

src/views/system/role.vue

@@ -21,7 +21,14 @@
           </el-table-column>
           <el-table-column prop="name" label="角色名称" width="180">
           </el-table-column>
-          <el-table-column prop="address" label="说明">
+          <el-table-column prop="allow_level" align="center" label="数据权限" width="180">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.allow_level==0">所有</el-tag>
+              <el-tag v-else-if="scope.row.allow_level==1">部门</el-tag>
+              <el-tag v-else-if="scope.row.allow_level==2">私有</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="comment" label="说明">
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="300">
             <template slot-scope="scope">
@@ -39,9 +46,19 @@
             <el-input v-model="form.name" autocomplete="off"></el-input>
           </el-form-item>
 
+          <el-form-item label="数据权限" prop="allow_level">
+             <el-radio-group v-model="form.allow_level">
+               <el-radio :label="0">所有</el-radio>
+               <el-radio :label="1">部门</el-radio>
+               <el-radio :label="2">私有</el-radio>
+             </el-radio-group>
+          </el-form-item>
+
+
           <el-form-item label="排序">
             <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
           </el-form-item>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="resetForm('form')">取 消</el-button>
@@ -103,7 +120,8 @@
         form: {
           name: "",
           id: "",
-          sortnumber: "0"
+          sortnumber: "0",
+          allow_level:0
         },
         userdata: [],
         filterMethod(query, item) {
@@ -149,9 +167,12 @@
         })
       },
       edit(obj) {
+        this.form = this.$options.data().form
         if (obj) {
           this.form.id = obj.id;
           this.form.name = obj.name;
+          this.form.sortnumber = obj.sortnumber;
+          this.form.allow_level = obj.allow_level;
         }
         this.dialogFormVisible = true;
       },

vue.config.js

@@ -46,15 +46,16 @@ module.exports = {
     //before: require('./mock/mock-server.js')
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://hdcontract.ali251.langye.net',
-        //target: 'http://192.168.60.99:9002/',
+        //target: 'http://hdcontract.ali251.langye.net',
+        target: 'http://192.168.60.99:9003/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
-      '/oa':{
-        target:'http://suzhouhedaooa.langye.net',
+      '/oa': {
+        //target: 'http://suzhouhedaooa.langye.net',
+        target: 'http://192.168.60.18:2021',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           '/oa': '/'