Merge branch 'zhaoj'

src/pages/dsj/ktjl/index.vue

@@ -2,6 +2,7 @@
   <div
     v-loading="loading"
     element-loading-background="rgba(122, 122, 122, 0.8)"
+    element-loading-text="加载时间较长, 请耐心等待~"
     class="bg_full min-w-1200px pb-10"
   >
     <div class="bg_top w-full h-5.5vw flex px-4 pt-2">

src/pages/dsj/xxjbsj/index.vue

@@ -17,7 +17,7 @@
               @change="initData"
             />
           </el-form-item>
-          <el-form-item class="w-1/4" v-if="user.user_role_id * 1 < 71">
+          <el-form-item class="w-1/4" v-if="user.user_role_id * 1 < 68">
             <el-select
               @change="selectArea"
               clearable
@@ -55,7 +55,7 @@
       </div>
 
       <h1 class="text-white text-2vw text-center self-center flex-1">
-        学校基本数据
+        学校基础数据
       </h1>
       <div class="text_green text-base text-center leading-12 w-2/5">
         {{ year }}年{{ month }}月{{ day }}日 {{ hour }}:{{ minutes }}:{{
@@ -419,9 +419,11 @@ let loading = $ref(false);
 let baseURL = window.GLOBAL_CONFIG.myxjyszptx;
 let areaList = $ref([]);
 let schoolList = $ref([]);
-if (user.value.user_role_id * 1 < 71) {
+if (user.value.user_role_id * 1 < 69) {
   initArea();
-}else if(user.value.user_role_id * 1 === 71){
+}else if (user.value.user_role_id * 1 === 69) {
+  selectArea(user.value.area_info.area_id3);
+} else if (user.value.user_role_id * 1 === 71) {
   selectArea(user.value.area_info.area_id4);
 }else if(user.value.user_role_id * 1 === 72){
   query.school_id = user.value.sm_info.sm_id;