diff --git a/package.json b/package.json index d93e7d8..68cd194 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "codemirror": "^6.0.1", "cropperjs": "^1.5.13", "dayjs": "^1.11.9", + "file-saver": "^2.0.5", "i": "^0.3.7", "js-cookie": "^3.0.5", "npm": "^9.6.6", @@ -26,7 +27,8 @@ "spinkit": "^2.0.1", "vue": "^3.2.47", "vue-codemirror": "^6.1.1", - "vue-router": "^4.1.6" + "vue-router": "^4.1.6", + "xlsx": "^0.18.5" }, "devDependencies": { "@arco-design/web-vue": "^2.45.3", diff --git a/src/api/doctor/multipoint.js b/src/api/doctor/multipoint.js new file mode 100644 index 0000000..f9927d2 --- /dev/null +++ b/src/api/doctor/multipoint.js @@ -0,0 +1,24 @@ +import request from '../../utils/request' + +const url = '/admin/doctor/multi'; + +export function getDoctorList(params){ + return request({ + url:'/admin/doctor/multi', + method: 'get', + params + }) +} +export function getDoctorDetail(id){ + return request({ + url:'/admin/doctor/multi/'+id, + method: 'get' + }) + } + export function checkDoctor(data,id){ + return request({ + url:'/admin/doctor/multi/'+id, + method: 'put', + data + }) + } \ No newline at end of file diff --git a/src/layout/components/Avatar/index.vue b/src/layout/components/Avatar/index.vue index 0c7d455..755c445 100644 --- a/src/layout/components/Avatar/index.vue +++ b/src/layout/components/Avatar/index.vue @@ -47,9 +47,9 @@ const handleLogout = () => { title: '提示', content: '确定注销并退出登陆系统吗？', hideCancel: false, - onOk: () => { + onOk:async() => { const store = useUserStore(); - store.userLogut(); + await store.userLogut(); window.sessionStorage.removeItem('token'); clearLocalStorage(); proxy.$router.push('/login'); diff --git a/src/router/index.js b/src/router/index.js index 08339ef..19b153d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -75,7 +75,7 @@ router.beforeEach(async (to, from, next) => { // 判断用户Token是否获取 if (to.name !== 'login' && !store.token) { next({ name: 'login' }); - } else { + }else { // 判断判断权限有无获取 if (store.token && permissionStore.addRouters.length==0) { //store.getUserInfo(); @@ -88,7 +88,10 @@ router.beforeEach(async (to, from, next) => { // next(to.fullPath); // 如果 addRoute 并未完成，路由守卫会一层一层的执行执行，直到 addRoute 完成，找到对应的路由 next({ ...to, replace: true }); - } else { + }else if(to.name == 'login' && store.token && permissionStore.addRouters.length>0){ + const menuList= permissionStore.menuList; + next({ path: menuList[0].children[0].path }); + } else { next(); } diff --git a/src/store/userInfo.js b/src/store/userInfo.js index 718c625..c9bf2d3 100644 --- a/src/store/userInfo.js +++ b/src/store/userInfo.js @@ -43,7 +43,7 @@ export const useUserStore = defineStore('user', { // const res = await getAppConfig(); // setLocalStorage('sysConfig', res.data); //res.data; - let data={sys_app_logo: "https://doc-image.zhangwj.com/img/go-admin.png", sys_app_name: "go-admin管理系统"}; + let data={sys_app_logo: "https://doc-image.zhangwj.com/img/go-admin.png", sys_app_name: "互联网医院后台管理"}; setLocalStorage('sysConfig', data); this.sysConfig =data } catch (err) { diff --git a/src/utils/exportExcel.js b/src/utils/exportExcel.js new file mode 100644 index 0000000..8aa32f1 --- /dev/null +++ b/src/utils/exportExcel.js @@ -0,0 +1,235 @@ + +import { saveAs } from 'file-saver'; + +//因为版本问题，高版本使用第一种 + import * as XLSX from 'xlsx'; // vue3可用 + + +function generateArray(table) { + var out = []; + var rows = table.querySelectorAll('tr'); + var ranges = []; + for (var R = 0; R < rows.length; ++R) { + var outRow = []; + var row = rows[R]; + var columns = row.querySelectorAll('td'); + for (var C = 0; C < columns.length; ++C) { + var cell = columns[C]; + var colspan = cell.getAttribute('colspan'); + var rowspan = cell.getAttribute('rowspan'); + var cellValue = cell.innerText; + if (cellValue !== '' && cellValue == +cellValue) cellValue = +cellValue; + + //Skip ranges + ranges.forEach(function (range) { + if ( + R >= range.s.r && + R <= range.e.r && + outRow.length >= range.s.c && + outRow.length <= range.e.c + ) { + for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); + } + }); + + //Handle Row Span + if (rowspan || colspan) { + rowspan = rowspan || 1; + colspan = colspan || 1; + ranges.push({ + s: { + r: R, + c: outRow.length, + }, + e: { + r: R + rowspan - 1, + c: outRow.length + colspan - 1, + }, + }); + } + + //Handle Value + outRow.push(cellValue !== '' ? cellValue : null); + + //Handle Colspan + if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null); + } + out.push(outRow); + } + return [out, ranges]; +} + +function datenum(v, date1904) { + if (date1904) v += 1462; + var epoch = Date.parse(v); + return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); +} + +function sheet_from_array_of_arrays(data, opts) { + var ws = {}; + var range = { + s: { + c: 10000000, + r: 10000000, + }, + e: { + c: 0, + r: 0, + }, + }; + for (var R = 0; R != data.length; ++R) { + for (var C = 0; C != data[R].length; ++C) { + if (range.s.r > R) range.s.r = R; + if (range.s.c > C) range.s.c = C; + if (range.e.r < R) range.e.r = R; + if (range.e.c < C) range.e.c = C; + var cell = { + v: data[R][C], + }; + if (cell.v == null) continue; + var cell_ref = XLSX.utils.encode_cell({ + c: C, + r: R, + }); + + if (typeof cell.v === 'number') cell.t = 'n'; + else if (typeof cell.v === 'boolean') cell.t = 'b'; + else if (cell.v instanceof Date) { + cell.t = 'n'; + cell.z = XLSX.SSF._table[14]; + cell.v = datenum(cell.v); + } else cell.t = 's'; + + ws[cell_ref] = cell; + } + } + if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); + return ws; +} + +function Workbook() { + if (!(this instanceof Workbook)) return new Workbook(); + this.SheetNames = []; + this.Sheets = {}; +} + +function s2ab(s) { + var buf = new ArrayBuffer(s.length); + var view = new Uint8Array(buf); + for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xff; + return buf; +} + +export function export_table_to_excel(id) { + var theTable = document.getElementById(id); + var oo = generateArray(theTable); + var ranges = oo[1]; + + /* original data */ + var data = oo[0]; + var ws_name = 'SheetJS'; + + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + /* add ranges to worksheet */ + // ws['!cols'] = ['apple', 'banan']; + ws['!merges'] = ranges; + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: 'xlsx', + bookSST: false, + type: 'binary', + }); + + saveAs( + new Blob([s2ab(wbout)], { + type: 'application/octet-stream', + }), + 'test.xlsx' + ); +} + +export function export_json_to_excel({ + multiHeader = [], + header, + data, + filename, + merges = [], + autoWidth = true, + bookType = 'xlsx', +} = {}) { + /* original data */ + filename = filename || 'excel-list'; + data = [...data]; + data.unshift(header); + + for (let i = multiHeader.length - 1; i > -1; i--) { + data.unshift(multiHeader[i]); + } + + var ws_name = 'SheetJS'; + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + if (merges.length > 0) { + if (!ws['!merges']) ws['!merges'] = []; + merges.forEach((item) => { + ws['!merges'].push(XLSX.utils.decode_range(item)); + }); + } + + if (autoWidth) { + /*设置worksheet每列的最大宽度*/ + const colWidth = data.map((row) => + row.map((val) => { + /*先判断是否为null/undefined*/ + if (val == null) { + return { + wch: 10, + }; + } else if (val.toString().charCodeAt(0) > 255) { + /*再判断是否为中文*/ + return { + wch: val.toString().length * 2, + }; + } else { + return { + wch: val.toString().length, + }; + } + }) + ); + /*以第一行为初始值*/ + let result = colWidth[0]; + for (let i = 1; i < colWidth.length; i++) { + for (let j = 0; j < colWidth[i].length; j++) { + if (result[j]['wch'] < colWidth[i][j]['wch']) { + result[j]['wch'] = colWidth[i][j]['wch']; + } + } + } + ws['!cols'] = result; + } + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: bookType, + bookSST: false, + type: 'binary', + }); + saveAs( + new Blob([s2ab(wbout)], { + type: 'application/octet-stream', + }), + `${filename}.${bookType}` + ); +} + diff --git a/src/views/admin/sys-role/index.vue b/src/views/admin/sys-role/index.vue index c50955a..25312de 100644 --- a/src/views/admin/sys-role/index.vue +++ b/src/views/admin/sys-role/index.vue @@ -95,7 +95,7 @@ 停用 --> - + 否 是 @@ -204,7 +204,7 @@ const modalForm = reactive({ sort: 0, role_status: '', - is_admin: '', + is_admin: null, menu_ids:[] }); const scopeForm = reactive({}); @@ -215,9 +215,9 @@ required: true, message: '请输入角色名称' }], - roleKey: [{ + is_admin: [{ required: true, - message: '请输入权限字符' + message: '请选择是否是管理员' }], }; diff --git a/src/views/doctor/doctor-examine/index.vue b/src/views/doctor/doctor-examine/index.vue index e67643a..7476c03 100644 --- a/src/views/doctor/doctor-examine/index.vue +++ b/src/views/doctor/doctor-examine/index.vue @@ -11,8 +11,8 @@ - 未认证 - 认证通过 + 审核中 认证失败 @@ -31,6 +31,7 @@
{{modalForm.user_doctor_info.card_num_mask}}
- +
{{id_card_num}}
@@ -376,8 +377,8 @@ - 审核通过 - 审核拒绝 + 审核通过 + 审核拒绝