47 1 month ago
parent
commit
8f8179debe

+ 1 - 1
src/views/system/graduateStudent/UserForm.vue

@@ -61,7 +61,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="硕" prop="masterType">
+          <el-form-item label="硕士类型" prop="masterType">
             <!-- <el-input v-model="formData.masterType" placeholder="请输入学位类型" /> -->
             <el-select v-model="formData.masterType" placeholder="请选择学位类型">
               <el-option

+ 2 - 2
src/views/system/graduateStudent/UserImportForm.vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/importGraduateStudent'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 2 - 2
src/views/system/graduateStudent/index.vue

@@ -70,7 +70,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="硕" prop="masterType"> 
+          <el-form-item label="硕士类型" prop="masterType"> 
             <el-select 
               v-model="queryParams.masterType" 
               placeholder="请选择学位类型"
@@ -227,7 +227,7 @@
           <el-table-column label="年级" align="center" prop="grade" width="120" />
           <el-table-column label="学号" align="center" prop="userNumber" width="150" />
           <el-table-column label="专业" align="center" prop="major" width="120" />
-          <el-table-column label="硕" align="center" prop="masterType" width="120" />
+          <el-table-column label="硕士类型" align="center" prop="masterType" width="120" />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
           <el-table-column label="邮箱" align="center" prop="email" width="120" />
 

+ 2 - 2
src/views/system/graduateStudentT/UserImportForm.vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 2 - 2
src/views/system/studentAttendanceManage/studentFaceManage/StudentFaceImport.vue

@@ -83,14 +83,14 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/md/acs/import-data'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 const zipList = ref([]) // 压缩文件列表
 
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
   zipList.value = [] // 压缩文件列表

+ 2 - 2
src/views/system/user/UserImportForm.vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 1 - 1
src/views/system/workroomCollege/user/UserForm.vue

@@ -52,7 +52,7 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="硕" prop="masterType">
+          <!-- <el-form-item label="硕士类型" prop="masterType">
             <el-input v-model="formData.masterType" placeholder="请输入学位类型" />
             <el-select v-model="formData.masterType" placeholder="请选择学位类型">
               <el-option

+ 2 - 2
src/views/system/workroomCollege/user/UserImportForm.vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 4 - 4
src/views/system/workroomCollege/user/UserImportFormzip.vue

@@ -52,10 +52,10 @@
       <template #tip>
         <div class="el-upload__tip text-center">
           <span>仅允许导入 zip、rar 格式压缩包。</span>
-          <!-- <div class="el-upload__tip">
+          <div class="el-upload__tip">
             <el-checkbox v-model="updateSupport" />
            是否更新已经存在的用户数据 
-          </div> -->
+          </div>
         </div>
       </template>
     </el-upload>
@@ -83,14 +83,14 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/md/acs/import-data'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 const zipList = ref([]) // 压缩文件列表
 
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
   zipList.value = [] // 压缩文件列表

+ 2 - 2
src/views/system/workroomCollege/user/student.vue

@@ -83,7 +83,7 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="硕" prop="masterType"> 
+          <!-- <el-form-item label="硕士类型" prop="masterType"> 
             <el-select 
               v-model="queryParams.masterType" 
               placeholder="请选择学位类型"
@@ -239,7 +239,7 @@
             width="200"
           />
           <el-table-column label="专业" align="center" prop="major" width="120" />
-          <!-- <el-table-column label="硕" align="center" prop="masterType" width="120" /> -->
+          <!-- <el-table-column label="硕士类型" align="center" prop="masterType" width="120" /> -->
           <el-table-column label="导师姓名" align="center" prop="supervisor" width="120" />
           <el-table-column
             label="工作间"

+ 2 - 2
src/views/system/workroomCollege/user/studentImportForm.vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/importSchoolStudent'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 2 - 2
src/views/system/workroomCollege/user/teacherImportForm .vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/importTeacher'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 1 - 1
src/views/system/workroomTeacher/user/UserForm.vue

@@ -52,7 +52,7 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="硕" prop="masterType">
+          <!-- <el-form-item label="硕士类型" prop="masterType">
             <el-input v-model="formData.masterType" placeholder="请输入学位类型" />
             <el-select v-model="formData.masterType" placeholder="请选择学位类型">
               <el-option

+ 2 - 2
src/views/system/workroomTeacher/user/UserImportForm.vue

@@ -56,12 +56,12 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
-const updateSupport = ref(0) // 是否更新已经存在的用户数据
+const updateSupport = ref(false) // 是否更新已经存在的用户数据
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
-  updateSupport.value = 0
+  updateSupport.value = false
   fileList.value = []
   resetForm()
 }

+ 2 - 2
src/views/system/workroomTeacher/user/student.vue

@@ -76,7 +76,7 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="硕" prop="masterType"> 
+          <!-- <el-form-item label="硕士类型" prop="masterType"> 
             <el-select 
               v-model="queryParams.masterType" 
               placeholder="请选择学位类型"
@@ -204,7 +204,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="专业" align="center" prop="major" width="120" />
-          <!-- <el-table-column label="硕" align="center" prop="masterType" width="120" /> -->
+          <!-- <el-table-column label="硕士类型" align="center" prop="masterType" width="120" /> -->
           <!-- <el-table-column
             label="工作间"
             align="center"