Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
7990d2b4 by tianhaohao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents a42ebf6f 4f1755d2
Inline Side-by-side
Showing 6 changed files with 54 additions and 10 deletions
This file is too large to display.
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 if (process.env.NODE_ENV === 'development') { 68 if (process.env.NODE_ENV === 'development') {
69 localStorage.removeItem('token') 69 localStorage.removeItem('token')
70 } else { 70 } else {
71 Cookies.remove('accessToken') 71 Cookies.remove('ACCESS_TOKEN')
72 } 72 }
73 if (window._config.casEnable) { 73 if (window._config.casEnable) {
74 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href); 74 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
......
1 /* 1 /*
2 * @Description: 项目权限 2 * @Description: 项目权限
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-13 10:49:43 4 * @LastEditTime: 2023-06-13 16:28:25
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import axios from 'axios' 7 import axios from 'axios'
...@@ -23,7 +23,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -23,7 +23,7 @@ router.beforeEach(async (to, from, next) => {
23 let hasAddDict = store.state.dict.addDict 23 let hasAddDict = store.state.dict.addDict
24 let hasAddRoute = store.state.permission.addRoutes 24 let hasAddRoute = store.state.permission.addRoutes
25 // cas操作 25 // cas操作
26 const token = localStorage.getItem("token") || Cookies.get('accessToken'); 26 const token = localStorage.getItem("token") || Cookies.get('ACCESS_TOKEN');
27 if (to.path === '/login') { 27 if (to.path === '/login') {
28 if (token) { 28 if (token) {
29 next('/') 29 next('/')
...@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
46 if (process.env.NODE_ENV === 'development') { 46 if (process.env.NODE_ENV === 'development') {
47 localStorage.setItem('token', res.data.content.accessToken) 47 localStorage.setItem('token', res.data.content.accessToken)
48 } else { 48 } else {
49 Cookies.set('accessToken', res.data.content.accessToken) 49 Cookies.set('ACCESS_TOKEN', res.data.content.accessToken)
50 } 50 }
51 window.location.href = localStorage.getItem('location') 51 window.location.href = localStorage.getItem('location')
52 52
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 /* 2 /*
3 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 3 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-06-13 10:47:45 5 * @LastEditTime: 2023-06-13 16:28:57
6 */ 6 */
7 import axios from 'axios' 7 import axios from 'axios'
8 import Router from '@/router' 8 import Router from '@/router'
...@@ -35,7 +35,7 @@ service.interceptors.request.use( ...@@ -35,7 +35,7 @@ service.interceptors.request.use(
35 config.headers.delete('Authorization') 35 config.headers.delete('Authorization')
36 } 36 }
37 } else { 37 } else {
38 const token = Cookies.get('accessToken') 38 const token = Cookies.get('ACCESS_TOKEN')
39 // 添加请求头 39 // 添加请求头
40 if (token) { 40 if (token) {
41 config.headers['Authorization'] = 'Bearer ' + token 41 config.headers['Authorization'] = 'Bearer ' + token
...@@ -78,7 +78,7 @@ service.interceptors.response.use( ...@@ -78,7 +78,7 @@ service.interceptors.response.use(
78 if (process.env.NODE_ENV === 'development') { 78 if (process.env.NODE_ENV === 'development') {
79 localStorage.removeItem('token') 79 localStorage.removeItem('token')
80 } else { 80 } else {
81 Cookies.remove('accessToken') 81 Cookies.remove('ACCESS_TOKEN')
82 } 82 }
83 if (window._config.casEnable) { 83 if (window._config.casEnable) {
84 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl); 84 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl);
......
1 <!--
2 * @Description: 页面提供插件下载
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-13 15:49:55
5 -->
6 <template>
7 <div class='downLoad'>
8 <p>{{formData}}是否下载文件？</p>
9 <div>
10 <el-button @click="$popupCacel">取消</el-button>
11 <el-button type="primary" @click="handleDown">确定</el-button>
12 </div>
13 </div>
14 </template>
15 <script>
16 export default {
17 props: {
18 formData: {
19 type: Object,
20 default: {}
21 }
22 },
23 methods: {
24 handleDown () {
25 let a = document.createElement('a')
26 a.style.display = 'none'
27 a.setAttribute('download', 'bg.jpg')
28 // a.href = require('../../../../public/')
29 document.body.appendChild(a)
30 console.log('href', a.href)
31 a.click()
32 document.body.removeChild(a)
33 }
34 }
35 }
36 </script>
37 <style scoped lang='scss'>
38 @import "~@/styles/public.scss";
39 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-13 13:12:25 4 * @LastEditTime: 2023-06-13 15:05:35
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -195,15 +195,20 @@ ...@@ -195,15 +195,20 @@
195 195
196 // 身份证读取 196 // 身份证读取
197 readClick (row) { 197 readClick (row) {
198 console.log(row, 'row');
199 var httpurl = "http://127.0.0.1:33088/"; 198 var httpurl = "http://127.0.0.1:33088/";
200 var url = httpurl + "function=get_idcard&readnew=0" 199 var url = httpurl + "function=get_idcard&readnew=0"
201
202 axios.post(url).then(res => { 200 axios.post(url).then(res => {
201 if (res.data.code == 1) {
202 this.$message({
203 message: res.data.message,
204 type: 'warning'
205 })
206 } else {
203 let data = res.data.IDCardInfo 207 let data = res.data.IDCardInfo
204 row.sqrmc = data.name 208 row.sqrmc = data.name
205 row.zjzl = 1 209 row.zjzl = 1
206 row.zjh = data.cardID 210 row.zjh = data.cardID
211 }
207 }) 212 })
208 }, 213 },
209 // 修改 214 // 修改
......