Merge branch 'master' of 49.232.152.146:xhxy/smart_school

ruoyi-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 智慧校园管理系统
 ENV = 'production'
 ENV = 'production'
 
 
 # 智慧校园/生产环境
 # 智慧校园/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/gld_api'

ruoyi-ui/package.json

@@ -56,6 +56,7 @@
     "moment": "^2.29.4",
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "nprogress": "0.2.0",
     "print-js": "^1.6.0",
     "print-js": "^1.6.0",
+    "qrcodejs2": "0.0.2",
     "quill": "1.3.7",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "screenfull": "5.0.2",
     "socket.io-client": "^4.6.1",
     "socket.io-client": "^4.6.1",

ruoyi-ui/src/api/smartSchool/schoolProperty/equipmenTledger.js

+import request from "@/utils/request";
+
+//查询设备台账列表
+export function getEquipmentLedger(params) {
+  return request({
+    url: "/equipmentLedger/list",
+    method: "GET",
+    params,
+  });
+}
+
+//根据ID查看设备台账详细信息
+export function getEquipmentLedgerDetailByID(id) {
+  return request({
+    url: `equipmentLedger/${id}`,
+    method: "GET",
+  });
+}
+
+//设备台账入库 新增
+export function addEquipmentLedger(data) {
+  return request({
+    url: "/equipmentLedger/add",
+    method: "POST",
+    data,
+  });
+}
+
+//设备台账编辑
+export function editEquipmentLedger(data) {
+  return request({
+    url: "/equipmentLedger/edit",
+    method: "PUT",
+    data,
+  });
+}
+
+//根据分类编码ID获取设备型号
+export function getModelByID(id) {
+  return request({
+    url: `/productCategory/getEquipmentByCode/${id}`,
+    method: "GET",
+  });
+}
+
+//设备台账出库 删除
+export function deleteEquipmentLedger(id) {
+  return request({
+    url: `/equipmentLedger/outStock/${id}`,
+    method: "POST",
+  });
+}
+
+/**
+ * 公共接口
+ * 获取用户列表
+ **/
+export function getUserList(params) {
+  return request({
+    url: '/equipmentLedger/getUser',
+    method: "GET",
+    params
+  });
+}

ruoyi-ui/src/api/smartSchool/schoolProperty/lendingReturn.js

+import request from "@/utils/request";
+
+//查询借出归还台账列表
+export function getLendingReturn(params) {
+  return request({
+    url: "/circulation/list",
+    method: "GET",
+    params,
+  });
+}
+
+//借出归还台账 根据ID获取详情
+export function getLRDetailByID(id) {
+  return request({
+    url: `/circulation/${id}`,
+    method: "GET",
+  });
+}
+
+//借出归还台账新增
+export function addLendingReturn(data) {
+  return request({
+    url: "/circulation/add",
+    method: "POST",
+    data,
+  });
+}
+
+//借出归还台账编辑
+export function editLendingReturn(data) {
+  return request({
+    url: "/circulation/edit",
+    method: "PUT",
+    data,
+  });
+}
+
+//借出归还台账删除
+export function deleteLendingReturn(id) {
+  return request({
+    url: `/circulation/delete/${id}`,
+    method: "POST",
+  });
+}
+
+
+

ruoyi-ui/src/views/login.vue

@@ -22,9 +22,10 @@
       <div class="login-card-left">
       <div class="login-card-left">
         <el-image
         <el-image
           style="width: 600px;"
           style="width: 600px;"
-          :src="require('@/assets/images/logo-login.gif')"
+          :src="require('@/assets/images/login.png')"
           lazy
           lazy
         ></el-image>
         ></el-image>
+        <!--          :src="require('@/assets/images/logo-login.gif')"-->
       </div>
       </div>
       <div class="login-card-right">
       <div class="login-card-right">
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
@@ -200,6 +201,9 @@ export default {
 </script>
 </script>
 
 
 <style rel="stylesheet/scss" lang="scss">
 <style rel="stylesheet/scss" lang="scss">
+.login {
+  background-color: rgba(0,191,255,0.15);
+}
 .login-container {
 .login-container {
   //transition: transform .5s ease-in;
   //transition: transform .5s ease-in;
 
 

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/secondaryDivision/index.vue

@@ -36,7 +36,6 @@
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
                     <div>{{ selectDictLabel(dict.type.section_type, row.selectedCourse) }}</div>
                     <div>{{ selectDictLabel(dict.type.section_type, row.selectedCourse) }}</div>
                 </template>
                 </template>
-
             </el-table-column>
             </el-table-column>
             <el-table-column label="所分班级" prop="divisionClassesName" align="center" />
             <el-table-column label="所分班级" prop="divisionClassesName" align="center" />
         </el-table>
         </el-table>

ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue

@@ -247,12 +247,6 @@ export default {
             })
             })
         },
         },
 
 
-        // 查询管理员列表
-        handleQueryVehicle() {
-            this.throttle(() => {
-                this.getVehicleList();
-            })
-        },
         rowClick(row) {
         rowClick(row) {
             this.$refs.vehicleSelectTable.clearSelection();
             this.$refs.vehicleSelectTable.clearSelection();
             this.$refs.vehicleSelectTable.toggleRowSelection(row, true);
             this.$refs.vehicleSelectTable.toggleRowSelection(row, true);