zpy 10.12

fce198a5 · zhaopanyu · d94f5736 · fce198a5 · fce198a5 · fce198a5
Commit fce198a5 authored Oct 12, 2023 by zhaopanyu
7 changed files
--- a/.DS_Store
+++ b/.DS_Store
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -8,7 +8,14 @@ import { isRelogin } from "@/utils/request";
 NProgress.configure({ showSpinner: false });
-const whiteList = ["/login", "/auth-redirect", "/bind", "/register", "/index"];
+const whiteList = [
+  "/login",
+  "/auth-redirect",
+  "/bind",
+  "/register",
+  "/index",
+  "/dd",
+];
 router.beforeEach((to, from, next) => {
  NProgress.start();

--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -501,10 +501,7 @@ export default {
    }
  },
  created() {
-    // 钉钉code码，正式时打开
+    this.init()
-    // this.getCode()
-    //  token,测试用
-    this.csToken()
  },
  mounted() {
@@ -529,59 +526,7 @@ export default {
  },
  methods: {
-    // 获取code
-    getCode() {
-      dd.getAuthCode({
-        corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
-        success: (res) => {
-          console.log('获取新的免登码成功', res);
-          const code = res.code
-          // this.code = code;
-          // this.authCodeTimestamp = currentTime;
-          // console.log('this.authCodeTimestamp', this.authCodeTimestamp);
-          console.log('code', code);
-          this.getToken(code)
-          // console.log('loginResponse', loginResponse);
-        },
-        fail: (res) => {
-          console.log('获取免登码失败', res);
-        },
-        complete: () => { },
-      });
-    },
-    // 获取token
-    getToken(code) {
-      getCode(code).then(res => {
-        console.log('res', res.token);
-        if (res.token) {
-          setToken(res.token)
-          this.$store.commit('SET_TOKEN', res.token)
-          // this.$router.push({ path: '/index' });
-          // 判断当前用户是否已拉取完user_info信息
-          this.$store.dispatch('GetInfo').then((res) => {
-            this.$store.dispatch('GenerateRoutes').then(accessRoutes => {
-              // 根据roles权限生成可访问的路由表
-              router.addRoutes(accessRoutes) // 动态添加可访问路由表
-              this.init()
-            })
-          })
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-    },
-    // 测试token
-    csToken() {
-      if (getToken()) {
-        console.log('getToken', getToken());
-        this.init()
-      } else {
-        this.$router.push({ path: '/login' });
-      }
-    },
    //从后端获取任务数量
    taskNum() {

--- a/ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentManagement/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentManagement/index.vue
@@ -300,7 +300,7 @@ export default {
                id: '',
                instrumentName: "",
                instrumentTypeId: "",
-                instrumentTypeName: "",
+                instrumentTypeName: null,
                instrumentModel: "",
                instrumentNum: "",
                remark: "",

--- a/ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
@@ -170,7 +170,7 @@
                <el-row :gutter="30">
                    <el-col :span="10">
                        <el-form-item label="申请老师">
-                            <el-input v-model="postForm.applyName" placeholder="请输入" clearable :disabled="isEdit"/>
+                            <el-input v-model="postForm.applyName" placeholder="请输入" clearable :disabled="isEdit" />
                        </el-form-item>
                    </el-col>
                    <el-col :span="10">
@@ -187,12 +187,13 @@
                <el-row :gutter="20">
                    <el-col :span="10">
                        <el-form-item label="实验名称">
-                            <el-input v-model="postForm.experimentName" placeholder="请输入" clearable  :disabled="isEdit"/>
+                            <el-input v-model="postForm.experimentName" placeholder="请输入" clearable :disabled="isEdit" />
                        </el-form-item>
                    </el-col>
                    <el-col :span="10">
                        <el-form-item label="学科">
-                            <el-select v-model="postForm.sub" placeholder="请选择" clearable style="width: 100%;" :disabled="isEdit">
+                            <el-select v-model="postForm.sub" placeholder="请选择" clearable style="width: 100%;"
+                                :disabled="isEdit">
                                <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
                                    :value="dict.value" />
                            </el-select>
@@ -204,7 +205,8 @@
                <el-row :gutter="20">
                    <el-col :span="20">
                        <el-form-item label="章节内容">
-                            <el-input v-model="postForm.chapterContent" placeholder="请输入" clearable :disabled="isEdit"></el-input>
+                            <el-input v-model="postForm.chapterContent" placeholder="请输入" clearable
+                                :disabled="isEdit"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
@@ -213,12 +215,12 @@
                <el-row :gutter="20">
                    <el-col :span="10">
                        <el-form-item label="级部">
-                            <el-input v-model="postForm.grade" placeholder="请输入" clearable  :disabled="isEdit"/>
+                            <el-input v-model="postForm.grade" placeholder="请输入" clearable :disabled="isEdit" />
                        </el-form-item>
                    </el-col>
                    <el-col :span="10">
                        <el-form-item label="学年">
-                            <el-input v-model="postForm.schoolYear" placeholder="请输入" clearable  :disabled="isEdit"/>
+                            <el-input v-model="postForm.schoolYear" placeholder="请输入" clearable :disabled="isEdit" />
                        </el-form-item>
                    </el-col>
                </el-row>

--- a/ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
@@ -19,7 +19,6 @@
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
      </el-col>
    </el-row>
    <el-table border v-loading="loading" :data="competitionData" stripe>
      <el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
@@ -42,7 +41,6 @@
          <el-image style="width: 100px; height: 100px" :src="scope.row.pictureUrl"
            :preview-src-list="scope.row.previewUrls"></el-image>
        </template>
      </el-table-column>
      <el-table-column label="备注1" align="center" prop="remark1" />
      <el-table-column label="备注2" align="center" prop="remark2" />
@@ -57,7 +55,6 @@
    </el-table>
    <pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize" @pagination="getList" />
    <!-- 新增、编辑、查看弹窗 -->
    <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
      <el-form :model="form" ref="form" size="small" label-width="108px" :disabled="isEdit" :rules="rules">
@@ -151,14 +148,12 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    <el-dialog ref="previewDialog" title="预览图片" :visible.sync="previewDialogVisible">
      <el-image style="width: 100%; max-height: 80vh; object-fit: contain" :src="previewImageUrl"
        fit="contain"></el-image>
    </el-dialog>
  </div>
 </template>
 <script>
 import {
  addCompetition,
@@ -220,22 +215,22 @@ export default {
      },
      rules: {
        schoolYear: [
-          { required: true, message: "学年不能为空", trigger: "blur" }
+          { required: true, message: "学年不能为空", trigger: "change" }
        ],
        teacherName: [
-          { required: true, message: "教师名称不能为空", trigger: "blur" }
+          { required: true, message: "教师名称不能为空", trigger: "change" }
        ],
        entrySubject: [
-          { required: true, message: "参赛课题不能为空", trigger: "blur" }
+          { required: true, message: "参赛课题不能为空", trigger: "change" }
        ],
        competitionType: [
-          { required: true, message: "比赛类型不能为空", trigger: "blur" }
+          { required: true, message: "比赛类型不能为空", trigger: "change" }
        ],
        competitionLevel: [
-          { required: true, message: "比赛级别不能为空", trigger: "blur" }
+          { required: true, message: "比赛级别不能为空", trigger: "change" }
        ],
        schoolAccessoryList: [
-          { required: true, message: "证书照片不能为空", trigger: "blur" }
+          { required: true, message: "证书照片不能为空", trigger: "change" }
        ],
      },
@@ -268,7 +263,6 @@ export default {
      getCompetition(this.queryParams).then(response => {
        this.competitionData = response.rows.map(item => {
          item.previewUrls = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
          item.pictureUrl = item.schoolAccessoryList[0]?.accessoryUrl || ''; // 取第一个照片的URL或者为空字符串
          return item;
        });
@@ -360,6 +354,7 @@ export default {
    //编辑 0新增 1编辑 2查看
    handleOption(type, row) {
      this.imageUrl = '';
+      this.form.schoolAccessoryList = [];
      this.form = {
        id: '',
        schoolYear: '',

--- a/ruoyi-ui/src/views/whitePage.vue
+++ b/ruoyi-ui/src/views/whitePage.vue
@@ -21,9 +21,9 @@ export default {
    },
    created() {
        // 钉钉code码，正式时打开
-        // this.getCode()
+        this.getCode()
        //  token,测试用
-        this.csToken()
+        // this.csToken()
    },
    methods: {
        // 获取code
@@ -53,7 +53,7 @@ export default {
                if (res.token) {
                    setToken(res.token)
                    this.$store.commit('SET_TOKEN', res.token)
-                    // this.$router.push({ path: '/index' });
+                    this.$router.push({ path: '/index' });
                    // 判断当前用户是否已拉取完user_info信息
                    this.$store.dispatch('GetInfo').then((res) => {
                        this.$store.dispatch('GenerateRoutes').then(accessRoutes => {