课程 搜搜正常了

.env.development

@@ -5,14 +5,12 @@ NODE_ENV = development
 VITE_TITLE = 飞行学院
 
 # 接口地址
-VITE_API_BASEURL = http://192.168.31.14:9003
+#VITE_API_BASEURL = http://192.168.31.56:19003
 #VITE_API_BASEURL = http://192.168.31.80:19003
 #VITE_API_BASEURL = http://192.168.1.235:9003
-#VITE_API_BASEURL = http://192.168.1.245:9003
-#VITE_FILEURL = http://192.168.1.245:10005/education/
-VITE_FILEURL = http://192.168.31.14:10005/education/
-# VITE_API_BASEURL = http://192.168.31.14:9003
-# VITE_API_BASEURL = http://192.168.31.6:9003
+VITE_API_BASEURL = http://192.168.1.245:9003
+VITE_FILEURL = http://192.168.1.245:10005/education/
+#VITE_FILEURL = http://192.168.31.14:10005/education/
 
 # 本地端口
 VITE_PORT = 9000

.env.production

@@ -5,10 +5,11 @@ NODE_ENV = production
 VITE_TITLE = 飞行学院
 
 # 接口地址
-VITE_API_BASEURL = http://192.168.1.245:19003
+#VITE_API_BASEURL = http://192.168.1.245:19003
+VITE_API_BASEURL = http://192.168.31.14:19004
 #VITE_API_BASEURL = http://192.168.31.56:19003
-#VITE_API_BASEURL = http://192.168.31.56:19003
-VITE_FILEURL = http://192.168.1.245:10005/education/
+VITE_FILEURL = http://192.168.31.14:10005/education/
+#VITE_FILEURL = http://192.168.31.56:10005/education/
 # 本地端口
 VITE_PORT = 9000
 

src/api/myResource/onlyoffice.js

@@ -9,3 +9,4 @@ export const createOfficeFile = (p) => request('/file/createFile', p, 'post')
 export const editOfficeFile = (p) => request('/office/editofficefile', p, 'post')
 // 查看文档
 export const previewOfficeFile = (p) => request('/office/previewofficefile', p, 'post')
+export const getUserStorage = (p) => request('storagere/getUserStorage', p, 'get')

src/api/myResource/user.js

@@ -12,3 +12,11 @@ export const checkUserLoginInfo = (p) => {
 export const getWeChatAuthState = (p) => {
 	return request('user/checkWxAuth', p, 'get')
 }
+export const getUserStorage = (p) => {
+
+	return request('storagere/getUserStorage', p, 'get')
+}
+export const getstorage = (p) => {
+
+	return request('resourceFile/getstorage', p, 'get')
+}

src/views/courseOpen/components/DialogView.vue

@@ -8,7 +8,7 @@
 				:label-col="{ span: 7 }"
 				:wrapper-col="{ span: 12 }"
 			>
-				<a-form-item label="班级名称" name="room">
+				<a-form-item label="教室名称" name="room">
 					<a-input v-model:value="formState.room" placeholder="输入教室名称" />
 				</a-form-item>
 
@@ -320,7 +320,7 @@ const getPullDara = () => {
 		.catch((err) => {
 			console.log(err)
 		})
-	userAllList()
+	userAllList({eduIdentity : 1})
 		.then((res) => {
 
 			userAllListOptions.value = res.data

src/views/courseOpen/components/ListView.vue

@@ -65,10 +65,15 @@ const columns = [
 		dataIndex: 'room',
 		width: '12%'
 	},
+	{
+		title: '课程',
+		dataIndex: 'courseName',
+		width: '8%'
+	},
 	{
 		title: '班级名称',
 		dataIndex: 'gradesIdName',
-		width: '12%'
+		width: '8%'
 	},
 	{
 		title: '学期',
@@ -78,22 +83,22 @@ const columns = [
 	{
 		title: '开始节次',
 		dataIndex: 'startPeriod',
-		width: '10%'
+		width: '8%'
 	},
 	{
 		title: '结束节次',
 		dataIndex: 'endPeriod',
-		width: '10%'
+		width: '8%'
 	},
 	{
 		title: '上课周期',
 		dataIndex: 'scheduleTimeName',
-		width: '10%'
+		width: '8%'
 	},
 	{
 		title: '单双周',
 		dataIndex: 'weekTypeName',
-		width: '10%'
+		width: '8%'
 	},
 	{
 		title: '老师',

src/views/courseOpen/components/QueryView.vue

@@ -3,7 +3,7 @@
 		<div>
 			<a-form layout="inline" :model="formState">
 				<a-form-item label="" style="width: 300px">
-					<a-input v-model:value="formState.gradesName" placeholder="请输入班级名称" allowClear />
+					<a-input v-model:value="formState.courseName" placeholder="请输入课程名字" allowClear />
 				</a-form-item>
 <!--				<a-form-item label="" style="width: 300px">-->
 <!--&lt;!&ndash;					<a-cascader&ndash;&gt;-->

src/views/myResources/myResources.vue

@@ -252,7 +252,10 @@
 		></resourceUpload>
 		<!-- 发布模态框 -->
 		<releaseModal v-if="releaseVisible" @close="releaseVisible = false" @confirm="releaseConfirm"></releaseModal>
+		<div style="height: 20px"></div>
+		<span>容量</span><span style="color: #6abe39"> {{bToMb(storageMin)}}MB</span><span>/</span><span style="color: red">{{bToMb(storageMax)}}MB</span>
 	</a-card>
+
 </template>
 
 <script setup>
@@ -263,21 +266,11 @@
 	import resourceAuditApi from '@/api/resourceAudit.js'
 	import permissionTree from './permissionTree.vue'
 	import auditModal from './auditModal.vue'
+	import { getstorage } from '@/api/myResource/user'
 	import CustomPagination from '@/components/customPagination.vue'
 	import tool from '@/utils/tool'
 	import { useRoute, useRouter } from 'vue-router'
 	const router = useRouter()
-	import {
-		FileOutlined,
-		FileImageOutlined,
-		FilePdfOutlined,
-		FileWordOutlined,
-		FileExcelOutlined,
-		FilePptOutlined,
-		FileTextOutlined,
-		FileZipOutlined,
-		PlaySquareOutlined
-	} from '@ant-design/icons-vue'
 	// eslint-disable-next-line vue/no-setup-props-destructure
 	const { pageType } = defineProps({
 		pageType: {
@@ -324,6 +317,10 @@
 	const isState = ref(0) //是否是编辑  0:新增 1:编辑
 	const isVerifyStatus = ref(null) //未发布状态 0未发布 3已驳回
 	const editResourcesId = ref(null) //资源id
+
+	const storageMin = ref(0) //资源id
+	const storageMax = ref(0) //资源id
+
 	// 搜索值
 	const searchValue = ref('')
 	//课程类型
@@ -556,6 +553,15 @@
 				loading.value = false
 			})
 	}
+
+	const bToMb = (kb) =>{
+		if (typeof kb !== 'number' || kb < 0) {
+			throw new Error('请输入有效的非负数字');
+		}
+		return (kb / (1024*1024)).toFixed(2); // 保留两位小数
+	}
+
+
 	const changeCollegeMajor = (value, selectedOptions) => {
 		console.log('Selected:', value, selectedOptions)
 		if (!value) {
@@ -896,6 +902,12 @@
 		getFileformat()
 		getResourceTypeTree()
 		getListData()
+		getstorage().then(res => {
+			console.log('容量', res)
+
+			storageMin.value = res.data.storageSize
+			storageMax.value = res.data.totalStorageSize
+		})
 	})
 </script>
 

vite.config.js

@@ -41,7 +41,7 @@ export default defineConfig(({command, mode}) => {
 			port: envConfig.VITE_PORT,
 			proxy: {
 				'/api': {
-					target: 'http://192.168.31.14:9003',
+					target: 'http://192.168.31.56:19003',
 					// target: 'http://192.168.1.235:9003',
 					// target: 'http://192.168.31.15:9003',
 					// target: 'http://192.168.31.15:9003',