diff --git a/.drone.yml b/.drone.yml index c29d6b14..6158a964 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,8 +36,8 @@ steps: - ls -lh "/hzdyjs-releases/${DRONE_TAG}/backend-${DRONE_TAG}.jar" - name: package-web - # Node 20 + 无 lock 时 npm 易触发 edgesOut 空指针;18 + legacy-peer-deps 更稳 - image: node:18-bookworm + # 无 package-lock(被 gitignore);Node20 需 --legacy-peer-deps 规避 npm edgesOut + image: node:20-bookworm environment: NPM_CONFIG_REGISTRY: https://registry.npmmirror.com commands: @@ -45,7 +45,6 @@ steps: - echo "==> web tag=${DRONE_TAG} npm=$(npm -v) node=$(node -v)" - mkdir -p "/hzdyjs-releases/${DRONE_TAG}" - cd web - # package-lock.json 被 gitignore,仓库内无 lock - npm install --legacy-peer-deps --no-audit --no-fund - npm run build:prod - test -f dist/index.html diff --git a/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue b/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue index 41c16b36..98288720 100644 --- a/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue +++ b/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue @@ -535,9 +535,9 @@ import { updateClassStatus, updateClassStatusBatch, updateClassCampusBatch -} from '@/api/xg/xsjcxx/classmsg/classMsg'; -import { listColleges, collegeTree, listMajorsByCollegeId } from '@/api/xg/xsjcxx/classmsg/college'; -import { ClassMsgVO, ClassMsgQuery, ClassMsgForm, SysDeptVo } from '@/api/xg/xsjcxx/classmsg/types'; +} from '@/api/xg/xsjcxx/classMsg/classMsg'; +import { listColleges, collegeTree, listMajorsByCollegeId } from '@/api/xg/xsjcxx/classMsg/college'; +import { ClassMsgVO, ClassMsgQuery, ClassMsgForm, SysDeptVo } from '@/api/xg/xsjcxx/classMsg/types'; import { listDormCampus } from '@/api/xg/xgss/xqxx/dormCampus'; import type { DormCampusVO } from '@/api/xg/xgss/xqxx/dormCampus/types'; import { ComponentInternalInstance, ref, reactive, toRefs, onMounted, getCurrentInstance, watch } from 'vue'; diff --git a/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue b/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue index f76d3178..ff4e42c4 100644 --- a/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue +++ b/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue @@ -239,8 +239,8 @@