Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
7f74b4ff by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents c3b4f9d8 63990bac
Inline Side-by-side
Showing 2 changed files with 16 additions and 12 deletions
...@@ -9,17 +9,10 @@ ...@@ -9,17 +9,10 @@
9 </div> 9 </div>
10 <div class="right-menu"> 10 <div class="right-menu">
11 <svg-icon class="function" icon-class='function' /> 11 <svg-icon class="function" icon-class='function' />
12 <!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand">
13 <el-dropdown-menu slot="dropdown">
14 <el-dropdown-item command="a">个人中心</el-dropdown-item>
15 </el-dropdown-menu>
16 </el-dropdown> -->
17 <div class="avatar-wrapper"> 12 <div class="avatar-wrapper">
18 <span style="padding-right:10px">{{ name }}</span> 13 <span style="padding-right:10px">{{ name }}</span>
19 <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" /> 14 <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
20 <!-- <i class="el-icon-caret-bottom" /> -->
21 </div> 15 </div>
22
23 <svg-icon class="shutdown" @click.native="logout" icon-class='shutdown' /> 16 <svg-icon class="shutdown" @click.native="logout" icon-class='shutdown' />
24 </div> 17 </div>
25 </div> 18 </div>
...@@ -31,7 +24,7 @@ ...@@ -31,7 +24,7 @@
31 import Cookies from 'js-cookie' 24 import Cookies from 'js-cookie'
32 import { mapGetters } from 'vuex' 25 import { mapGetters } from 'vuex'
33 import NoticeBar from '@/components/NoticeBar/index' 26 import NoticeBar from '@/components/NoticeBar/index'
34 import {getHomeNoticeList} from "@/api/home" 27 import { getHomeNoticeList } from "@/api/home"
35 export default { 28 export default {
36 components: { 29 components: {
37 NoticeBar 30 NoticeBar
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:20 4 * @LastEditTime: 2023-06-13 13:12:25
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import addQlr from './dialog/addQlr.vue' 15 import axios from 'axios'
16 import { mapGetters } from 'vuex' 16 import { mapGetters } from 'vuex'
17 import addQlr from './dialog/addQlr.vue'
17 export default { 18 export default {
18 components: { 19 components: {
19 addQlr 20 addQlr
...@@ -66,7 +67,7 @@ ...@@ -66,7 +67,7 @@
66 label: '身份证读卡器', 67 label: '身份证读卡器',
67 align: 'center', 68 align: 'center',
68 render: (h, scope) => { 69 render: (h, scope) => {
69 return <el-button type="text" icon="el-icon-tickets" onClick={() => { this.readClick(scope) }}>读取</el-button> 70 return <el-button type="text" icon="el-icon-tickets" onClick={() => { this.readClick(scope.row) }}>读取</el-button>
70 } 71 }
71 }, 72 },
72 { 73 {
...@@ -193,8 +194,18 @@ ...@@ -193,8 +194,18 @@
193 }, 194 },
194 195
195 // 身份证读取 196 // 身份证读取
196 readClick () { }, 197 readClick (row) {
198 console.log(row, 'row');
199 var httpurl = "http://127.0.0.1:33088/";
200 var url = httpurl + "function=get_idcard&readnew=0"
197 201
202 axios.post(url).then(res => {
203 let data = res.data.IDCardInfo
204 row.sqrmc = data.name
205 row.zjzl = 1
206 row.zjh = data.cardID
207 })
208 },
198 // 修改 209 // 修改
199 editClick (index, row) { 210 editClick (index, row) {
200 // popupDialog("申请人信息", "workflow/components/addQlr", { 211 // popupDialog("申请人信息", "workflow/components/addQlr", {
......