浏览代码

no message

kllay 1 周之前
父节点
当前提交
590119f880

二进制
src/assets/classroom.png


二进制
src/assets/special.png


+ 4 - 1
src/main.ts

@@ -1,4 +1,4 @@
-import { createApp } from 'vue';
+import { createApp} from 'vue';
 import App from './App.vue';
 import router from './router';
 import { directive } from '/@/directive/index';
@@ -37,11 +37,14 @@ import BootstrapVue3 from 'bootstrap-vue-3'
 import 'bootstrap/dist/css/bootstrap.css'
 import 'bootstrap-vue-3/dist/bootstrap-vue-3.css'
 
+
 let forIconfont = analyzingIconForIconfont(iconfont); //解析class
 iconList.addIcon(forIconfont.list); // 添加iconfont dvadmin3的icon
 iconList.addIcon(elementPlus); // 添加element plus的图标
 iconList.addIcon(fontAwesome470); // 添加fontAwesome 470版本的图标
 
+
+
 let app = createApp(App);
 app.use(BootstrapVue3)
 scanAndInstallPlugins(app);

+ 3 - 0
src/settings.ts

@@ -13,6 +13,9 @@ import {FsExtendsEditor, FsExtendsUploader } from '@fast-crud/fast-extends';
 import '@fast-crud/fast-extends/dist/style.css';
 import {successNotification} from '/@/utils/message';
 import XEUtils from "xe-utils";
+
+
+
 export default {
     async install(app: any, options: any) {
         // 先安装ui

+ 1 - 0
src/theme/dark.scss

@@ -222,6 +222,7 @@
 		.el-dialog__header {
 			color: var(--el-text-color-primary) !important;
 		}
+		
 	}
 
 	// columns

+ 3 - 0
src/theme/loading.scss

@@ -2,6 +2,9 @@
 	width: 100%;
 	height: 100%;
 }
+.fs-form-header-action{
+	display: none !important;
+}
 .loading-next .loader-container {
 	position: absolute;
 	top: 50%;

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

@@ -8,6 +8,7 @@
 			</ol>
 			<div style="display: flex; justify-content: space-around; margin: 20px 0">
 				<div v-for="item in types" :key="item.value" @click="select(item.value)" style="cursor: pointer; text-align: center">
+					<img :src="getImage(item.value)" style="width: 80px; height: 80px;" />
 					<el-button type="primary" style="margin-top: 8px; font-weight: bold" v-if="item.label !== '特殊借用'">{{ item.label }}</el-button>
 					<el-button type="danger" plain style="margin-top: 8px; font-weight: bold" v-else>{{ item.label }}</el-button>
 				</div>
@@ -24,12 +25,26 @@ import { ref, watch, defineProps, defineEmits } from 'vue';
 const props = defineProps<{ visible: boolean }>();
 const emit = defineEmits(['update:visible', 'select']);
 const visible = ref(props.visible);
+import classroomImg from '/@/assets/classroom.png';
+import specialImg from '/@/assets/special.png';
 
 watch(
 	() => props.visible,
 	(v) => (visible.value = v)
 );
 
+function getImage(value: number): string {
+	switch (value) {
+		case 1:
+			return classroomImg;
+		case 2:
+			return specialImg;
+		default:
+			return specialImg;
+	}
+}
+
+
 const types = [
 	// { value: 0, label: '常规借用' },
 	{ value: 1, label: '课堂借用' },
@@ -37,7 +52,7 @@ const types = [
 ];
 
 function select(type: number) {
-	console.log(type);
+	// console.log(type);
 	emit('select', type);
 	emit('update:visible', false);
 }

+ 2 - 1
src/views/system/device/crud.tsx

@@ -238,6 +238,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				},
 				warehouse:{
 					title:'存放仓库',
+					search: { show: true },
 					type:"dict-select",
 					column: { minWidth: 150 },
 					dict: dict({
@@ -310,7 +311,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				supplier: {
 					title: '供应商',
 					type: 'dict-select',
-					search: { show: false },
+					search: { show: true  },
 					column: { 
 						minWidth: 120,				
 					},

+ 1 - 1
src/views/system/devicemanual/api.ts

@@ -27,7 +27,7 @@ export function AddObj(obj: AddReq) {
 export function UpdateObj(obj: EditReq) {
 	return request({
 		// url: apiPrefix+"device-manuals/"+ obj.article + '/',
-		url: "/api/system/device-manuals/"+ obj.article + '/',
+		url: "/api/system/device-manuals/"+ obj.id + '/',
 		method: 'put',
 		data: obj,
 	});