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

xiaomiao
Showing 4 changed files with 30 additions and 18 deletions
src/layout/components/Navbar.vue
src/permission.js
src/utils/request.js
src/views/workflow/components/qlrCommonTable.vue
--- a/src/layout/components/Navbar.vue
View file @3a93277
+++ b/src/layout/components/Navbar.vue
View file @3a93277
@@ -9,17 +9,10 @@
      </div>
      <div class="right-menu">
        <svg-icon class="function" icon-class='function' />
-        <!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand">
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="a">个人中心</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown> -->
        <div class="avatar-wrapper">
          <span style="padding-right:10px">{{ name }}</span>
          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
-          <!-- <i class="el-icon-caret-bottom" /> -->
        </div>
        <svg-icon class="shutdown" @click.native="logout" icon-class='shutdown' />
      </div>
    </div>
@@ -31,7 +24,7 @@
  import Cookies from 'js-cookie'
  import { mapGetters } from 'vuex'
  import NoticeBar from '@/components/NoticeBar/index'
-  import {getHomeNoticeList} from "@/api/home"
+  import { getHomeNoticeList } from "@/api/home"
  export default {
    components: {
      NoticeBar
@@ -75,7 +68,7 @@
          if (process.env.NODE_ENV === 'development') {
            localStorage.removeItem('token')
          } else {
-            Cookies.remove('ACCESS_TOKEN')
+            Cookies.remove('accessToken')
          }
          if (window._config.casEnable) {
            window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
--- a/src/permission.js
View file @3a93277
+++ b/src/permission.js
View file @3a93277
 /*
 * @Description: 项目权限
 * @Autor: renchao
- * @LastEditTime: 2023-06-12 17:22:02
+ * @LastEditTime: 2023-06-13 10:49:43
 */
 import Vue from 'vue'
 import axios from 'axios'
@@ -23,7 +23,7 @@ router.beforeEach(async (to, from, next) => {
  let hasAddDict = store.state.dict.addDict
  let hasAddRoute = store.state.permission.addRoutes
  // cas操作
-  const token = localStorage.getItem("token") || Cookies.get('token');
+  const token = localStorage.getItem("token") || Cookies.get('accessToken');
  if (to.path === '/login') {
    if (token) {
      next('/')
@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
          if (process.env.NODE_ENV === 'development') {
            localStorage.setItem('token', res.data.content.accessToken)
          } else {
-            Cookies.set('token', res.data.content.accessToken)
+            Cookies.set('accessToken', res.data.content.accessToken)
          }
          window.location.href = localStorage.getItem('location')
--- a/src/utils/request.js
View file @3a93277
+++ b/src/utils/request.js
View file @3a93277
@@ -2,7 +2,7 @@
 /*
 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
 * @Autor: renchao
- * @LastEditTime: 2023-06-12 17:22:35
+ * @LastEditTime: 2023-06-13 10:47:45
 */
 import axios from 'axios'
 import Router from '@/router'
@@ -34,6 +34,14 @@ service.interceptors.request.use(
            } else {
                config.headers.delete('Authorization')
            }
+        } else {
+            const token = Cookies.get('accessToken')
+            // 添加请求头
+            if (token) {
+                config.headers['Authorization'] = 'Bearer ' + token
+            } else {
+                config.headers.delete('Authorization')
+            }
        }
        return config
    },
@@ -70,7 +78,7 @@ service.interceptors.response.use(
                if (process.env.NODE_ENV === 'development') {
                    localStorage.removeItem('token')
                } else {
-                    Cookies.remove('token')
+                    Cookies.remove('accessToken')
                }
                if (window._config.casEnable) {
                    window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl);
--- a/src/views/workflow/components/qlrCommonTable.vue
View file @3a93277
+++ b/src/views/workflow/components/qlrCommonTable.vue
View file @3a93277
 <!--
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:41:20
+ * @LastEditTime: 2023-06-13 13:12:25
 -->
 <template>
  <div>
@@ -12,8 +12,9 @@
  </div>
 </template>
 <script>
-  import addQlr from './dialog/addQlr.vue'
+  import axios from 'axios'
  import { mapGetters } from 'vuex'
+  import addQlr from './dialog/addQlr.vue'
  export default {
    components: {
      addQlr
@@ -66,7 +67,7 @@
            label: '身份证读卡器',
            align: 'center',
            render: (h, scope) => {
-              return <el-button type="text" icon="el-icon-tickets" onClick={() => { this.readClick(scope) }}>读取</el-button>
+              return <el-button type="text" icon="el-icon-tickets" onClick={() => { this.readClick(scope.row) }}>读取</el-button>
            }
          },
          {
@@ -193,8 +194,18 @@
      },
      // 身份证读取
-      readClick () { },
+      readClick (row) {
+        console.log(row, 'row');
+        var httpurl = "http://127.0.0.1:33088/";
+        var url = httpurl + "function=get_idcard&readnew=0"
+        axios.post(url).then(res => {
+          let data = res.data.IDCardInfo
+          row.sqrmc = data.name
+          row.zjzl = 1
+          row.zjh = data.cardID
+        })
+      },
      // 修改
      editClick (index, row) {
        //   popupDialog("申请人信息", "workflow/components/addQlr", {