kllay il y a 1 jour
Parent
commit
85f684224a

+ 1 - 1
src/views/system/borrow/component/CommonBorrow/index.vue

@@ -6,7 +6,7 @@
 				<li>1、申请借用设备时必须本人来办理,借用期间设备由借用人负责保管。禁止转借他人</li>
 				<li>2、如因人为操作不当造成的设备损坏或设备损失,应由借用人按规定赔偿。</li>
 				<li>3、设备需按时归还,如逾期归还,将限制借用资格。</li>
-				<li>4、设备借用一周以内由实验室管理办公室审核,设备借用一周以上或非我院师生借用时还需实验中心领导审核。</li>
+				<li>4、设备借用一周以内由实验室管理办公室审批,设备借用一周以上或非我院师生借用时还需实验中心领导审批。</li>
 			</ol>
 		</div>
 		<el-form :model="form" label-width="110px" label-position="top" :rules="rules" ref="formRef">

+ 4 - 4
src/views/system/borrow/workflow/WorkflowDialog/index.vue

@@ -133,12 +133,12 @@
 									:rules="[{ required: true, message: '请选择通过条件', trigger: 'change' }]"
 								>
 									<el-radio-group v-model="role.passType">
-										<!-- <el-radio label="单人审"  value="0"></el-radio> -->
+										<!-- <el-radio label="单人审"  value="0"></el-radio> -->
 										<el-radio label="1名通过即可"  value="1"></el-radio>
 										<el-radio label="所有人员通过"  value="2"></el-radio>
-										<el-radio label="部门负责人审"  value="3"></el-radio>
-										<el-radio label="角色审"  value="4"></el-radio>
-										<el-radio label="自动审"  value="5"></el-radio>
+										<el-radio label="部门负责人审"  value="3"></el-radio>
+										<el-radio label="角色审"  value="4"></el-radio>
+										<el-radio label="自动审"  value="5"></el-radio>
 									</el-radio-group>
 								</el-form-item>
 								<el-button

+ 23 - 5
src/views/system/device/index.vue

@@ -2,7 +2,7 @@
 	<fs-page>
 		<fs-crud ref="crudRef" v-bind="crudBinding"> 
 			<template #actionbar-right>
-				<el-button type="primary" @click="handleBatchImport">批量导入</el-button>
+				<el-button type="primary" @click="handleBatchImport" class="batch-imports">批量导入</el-button>
 				<el-button type="primary" @click="handleExports" >批量导出</el-button>
 				<el-button type="primary"  @click="handleDownloadTemplate">下载模板</el-button>
 				<el-button type="danger" @click="handleBatchDelete" >批量删除</el-button>
@@ -43,8 +43,8 @@ import * as api from './api';
 import { ElMessage } from 'element-plus';
 import axios from 'axios'
 import Cookies from 'js-cookie';
-import { downloadFile,downloadFilePost } from '/@/utils/service';
-import { request } from '/@/utils/service';
+import {request, downloadFile,downloadFilePost } from '/@/utils/service';
+
 
 const { crudBinding, crudRef, crudExpose, crudOptions, resetCrudOptions } = useFs({ createCrudOptions });
 
@@ -130,7 +130,23 @@ const handleDownloadTemplate =async () =>{
 }
 
 
-function handleBatchDelete(){
+const handleBatchDelete= async () => {
+	const selectedRows = (crudExpose as any).selectedIds?.value || [];	
+	console.log("selectedRows::",selectedRows)
+	if (selectedRows.length === 0) {
+		ElMessage.warning('请先选择要删除的设备')
+		return
+	}
+	await request({
+		url: '/api/system/device/multiple_delete/',
+		method: 'delete',
+		data: {
+			keys: selectedRows
+		},
+	}).then((res: any) => {
+		ElMessage.success('删除成功');
+		crudExpose.doRefresh(); 
+	})
 
 }
 
@@ -145,6 +161,8 @@ onMounted(async () => {
 });
 </script>
 <style  scoped>
-
+.batch-imports{
+	margin-left: 10px;
+}
 
 </style>

+ 6 - 6
src/views/system/home/index.vue

@@ -61,41 +61,41 @@
 												<div class="card-content">
 													<div class="card-title">设备总数</div>
 													<div class="card-value">{{ devicedata?.total_devices ?? 0 }}<span
-															class="card-unit"></span></div>
+															class="card-unit"></span></div>
 												</div>
 											</div>
 											<div class="data-card borrowed">
 												<div class="card-content">
 													<div class="card-title">已借出</div>
 													<div class="card-value">{{ devicedata?.borrowed_devices ?? 0 }}<span
-															class="card-unit"></span></div>
+															class="card-unit"></span></div>
 												</div>
 											</div>
 											<div class="data-card available">
 												<div class="card-content">
 													<div class="card-title">可用设备</div>
 													<div class="card-value">{{ devicedata?.available_devices ?? 0 }}<span
-															class="card-unit"></span></div>
+															class="card-unit"></span></div>
 												</div>
 											</div>
 											<div class="data-card today-borrowed">
 												<div class="card-content">
 													<div class="card-title">今日归还</div>
 													<div class="card-value">{{ devicedata?.today_returned ?? 0 }}<span
-															class="card-unit"></span></div>
+															class="card-unit"></span></div>
 												</div>
 											</div>
 											<div class="data-card today-returned">
 												<div class="card-content">
 													<div class="card-title">今日借出</div>
-													<div class="card-value">{{ devicedata?.today_borrowed ?? 0 }}</div>
+													<div class="card-value">{{ devicedata?.today_borrowed ?? 0 }}</div>
 												</div>
 											</div>
 											<div class="data-card total-borrows">
 												<div class="card-content">
 													<div class="card-title">累计借用次数</div>
 													<div class="card-value">{{ devicedata?.total_borrows ?? 0 }}<span
-															class="card-unit"></span></div>
+															class="card-unit"></span></div>
 													<!-- <div class="card-subtitle">bobel (借出总数)</div> -->
 												</div>
 											</div>

+ 3 - 2
src/views/system/screenconsole/component/InfoCards.vue

@@ -38,13 +38,14 @@ const props = defineProps({
 })
 
 const infoList = computed(()=>[
-  { label: '设备总数', value: props.summaryData.total_devices, icon: Goods, color: '#409EFF' },
+  { label: '设备总库存数', value: props.summaryData.total_devices, icon: Goods, color: '#409EFF' },
   { label: '在借数', value: props.summaryData.borrowed_devices, icon: Box, color: '#F56C6C' },
   { label: '在库数', value: props.summaryData.available_devices, icon: Collection, color: '#67C23A' },
   { label: '今日借出', value: props.summaryData.today_borrowed, icon: Timer, color: '#E6A23C' },
   { label: '今日归还', value: props.summaryData.today_returned, icon: RefreshRight, color: '#909399' },
+  { label: '累计借用人次', value: props.summaryData.total_borrowers, icon: User, color: '#3498DB' },
   { label: '累计借用次数', value: props.summaryData.total_borrows, icon: DataLine, color: '#9B59B6' },
-  { label: '累计借用人数', value: props.summaryData.total_borrowers, icon: User, color: '#3498DB' },
+
 ]);
 function handleClick(item: any) {
   console.log('点击信息卡片:', item.label);

+ 3 - 3
src/views/system/screenconsole/component/StatusCards.vue

@@ -46,8 +46,8 @@ const props = defineProps({
 
 
 const statusList = computed(()=>[
-  { label: '待审', value: props.statusData.pending_approval, icon: DocumentChecked, color: '#409EFF' },
-  { label: '待归还', value: props.statusData.pending_return, icon: Timer, color: '#E6A23C' },
+  { label: '待审', value: props.statusData.pending_approval, icon: DocumentChecked, color: '#409EFF' },
+  { label: '已借出', value: props.statusData.pending_return, icon: Timer, color: '#E6A23C' },
   { label: '待维修', value: props.statusData.pending_maintenance, icon: Tools, color: '#67C23A' },
   { label: '已逾期', value: props.statusData.pending_overdue, icon: Warning, color: '#F56C6C' },
 ])
@@ -56,7 +56,7 @@ const router = useRouter()
   function handleClick(item: any) {
       console.log('点击状态卡片:', item.label);
       switch (item.label) {
-      case '待审':
+      case '待审':
         router.push('/borrow/approval')
         break
       case '待归还':

+ 4 - 4
src/views/system/testings/WorkflowDialog/index.vue

@@ -133,12 +133,12 @@
 									:rules="[{ required: true, message: '请选择通过条件', trigger: 'change' }]"
 								>
 									<el-radio-group v-model="role.passType">
-										<!-- <el-radio label="单人审"  value="0"></el-radio> -->
+										<!-- <el-radio label="单人审"  value="0"></el-radio> -->
 										<el-radio label="1名通过即可"  value="1"></el-radio>
 										<el-radio label="所有人员通过"  value="2"></el-radio>
-										<el-radio label="部门负责人审"  value="3"></el-radio>
-										<el-radio label="角色审"  value="4"></el-radio>
-										<el-radio label="自动审"  value="5"></el-radio>
+										<el-radio label="部门负责人审"  value="3"></el-radio>
+										<el-radio label="角色审"  value="4"></el-radio>
+										<el-radio label="自动审"  value="5"></el-radio>
 									</el-radio-group>
 								</el-form-item>
 								<el-button