Merge branch 'dev'

@@ -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

 <!--
  * @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", {