Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate-ui

.env

@@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=芋道管理系统
+VITE_APP_TITLE=测绘学院研究生管理系统
 
 # 项目本地运行端口号
 VITE_PORT=80

index.html

@@ -136,7 +136,7 @@
       <div class="app-loading">
         <div class="app-loading-wrap">
           <div class="app-loading-title">
-            <img src="/logo.gif" class="app-loading-logo" alt="Logo" />
+            <img src="/logo.png" class="app-loading-logo" alt="Logo" />
             <div class="app-loading-title">%VITE_APP_TITLE%</div>
           </div>
           <div class="app-loading-item">

src/components/DiyEditor/components/mobile/TabBar/config.ts

@@ -51,7 +51,7 @@ export const component = {
     },
     items: [
       {
-        text: '首页',
+        text: '工作台',
         url: '/pages/index/index',
         iconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-001.png',
         activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-002.png'

src/layout/components/Footer/src/Footer.vue

@@ -19,6 +19,6 @@ const title = computed(() => appStore.getTitle)
     :class="prefixCls"
     class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)] overflow-hidden"
   >
-    <span class="text-14px">Copyright ©2022-{{ title }}</span>
+    <span class="text-14px">Copyright ©2024-{{ title }} &nbsp; 技术支持：桂林壹斗米信息科技有限公司</span>
   </div>
 </template>

src/layout/components/Logo/src/Logo.vue

@@ -62,14 +62,14 @@ watch(
       :class="[
         prefixCls,
         layout !== 'classic' ? `${prefixCls}__Top` : '',
-        'flex !h-[var(--logo-height)] items-center cursor-pointer pl-8px relative decoration-none overflow-hidden'
+        'flex !h-[var(--logo-height)] items-center cursor-pointer pl-2px relative decoration-none overflow-hidden'
       ]"
       to="/"
     >
-      <img
-        class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
-        src="@/assets/imgs/logo.png"
-      />
+<!--      <img-->
+<!--        class="h-[calc(var(&#45;&#45;logo-height)-10px)] w-[calc(var(&#45;&#45;logo-height)-10px)]"-->
+<!--        src="@/assets/imgs/logo.png"-->
+<!--      />-->
       <div
         v-if="show"
         :class="[

src/locales/zh-CN.ts

@@ -153,7 +153,7 @@ export default {
   router: {
     login: '登录',
     socialLogin: '社交登录',
-    home: '首页',
+    home: '工作台',
     analysis: '分析页',
     workplace: '工作台'
   },

src/views/Home/Index.vue

@@ -98,7 +98,6 @@
           </el-row>
         </el-skeleton>
       </el-card>
-
       <el-card shadow="never" class="mt-8px">
         <el-skeleton :loading="loading" animated>
           <el-row :gutter="20" justify="space-between">

src/views/mall/promotion/diy/template/decorate.vue

@@ -41,7 +41,7 @@ defineOptions({ name: 'DiyTemplateDecorate' })
 const selectedTemplateItem = ref(0)
 const templateItems = reactive([
   { name: '基础设置', icon: 'ep:iphone' },
-  { name: '首页', icon: 'ep:home-filled' },
+  { name: '工作台', icon: 'ep:home-filled' },
   { name: '我的', icon: 'ep:user-filled' }
 ])
 

src/views/system/studentAttendanceManage/studentAttendance/index.vue

@@ -38,7 +38,7 @@
         >
           <el-option :label="'正常'" :value="0" />
           <el-option :label="'未打卡'" :value="1" />
-          
+
         </el-select>
       </el-form-item>
 
@@ -69,17 +69,17 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="Id" align="center" prop="id" />
+      <el-table-column type="index" width="50" />
       <!-- <el-table-column label="学生id" align="center" prop="studentId" /> -->
       <el-table-column label="学生名称" align="center" prop="studentName" />
       <!-- <el-table-column label="工作间id" align="center" prop="deptId" /> -->
       <!-- <el-table-column label="日期" align="center" prop="date" /> -->
-      <el-table-column label="学号" align="center" prop="userNumber" width="150" />
-      <el-table-column 
-        v-if="userInfo.userType === '4'" 
-        label="工作间名称" 
-        align="center" 
-        prop="deptName" 
+      <el-table-column label="学号" align="center" prop="userNumber"  />
+      <el-table-column
+        v-if="userInfo.userType === '4'"
+        label="工作间名称"
+        align="center"
+        prop="deptName"
         width="100"
       />
       <el-table-column
@@ -91,7 +91,7 @@
       />
       <el-table-column label="打卡类型" align="center" prop="clockInStatus">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_ATTENDANCE_TYPE" :value="scope.row.clockInStatus" />  
+          <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_ATTENDANCE_TYPE" :value="scope.row.clockInStatus" />
         </template>
       </el-table-column>
       <!-- <el-table-column label="打卡状态 " align="center" prop="clockInStatus" >
@@ -118,27 +118,43 @@
         :formatter="dateFormatter"
         width="180px"
       /> -->
-      <el-table-column label="备注原因" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:student-attendance:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:student-attendance:delete']"
-          >
-            删除
-          </el-button>
+      <el-table-column label="打卡图片" align="center" prop="url" >
+        <template #default="{ row }">
+          <div class="demo-image__preview" v-if="queryParams" >
+              <el-image
+                style="width: 40px; height:40px;margin-right: 5px"
+                class="h-80px w-80px"
+                lazy
+                :src="row.photo"
+                :preview-src-list="[row.photo]"
+                preview-teleported
+                fit="cover"
+              />
+          </div>
+
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="操作" align="center" min-width="120px">-->
+<!--        <template #default="scope">-->
+<!--          <el-button-->
+<!--            link-->
+<!--            type="primary"-->
+<!--            @click="openForm('update', scope.row.id)"-->
+<!--            v-hasPermi="['system:student-attendance:update']"-->
+<!--          >-->
+<!--            编辑-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            link-->
+<!--            type="danger"-->
+<!--            @click="handleDelete(scope.row.id)"-->
+<!--            v-hasPermi="['system:student-attendance:delete']"-->
+<!--          >-->
+<!--            删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -301,4 +317,4 @@ onMounted(async () => {
 .status-unknown {
   color: gray;
 }
-</style>
+</style>

src/views/system/studentAttendanceManage/studentAttendanceError/index.vue

@@ -38,10 +38,10 @@
         >
           <el-option :label="'正常'" :value="0" />
           <el-option :label="'未打卡'" :value="1" />
-          
+
         </el-select>
       </el-form-item>
-      
+
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -69,29 +69,26 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="Id" align="center" prop="id" />
+      <el-table-column type="index" width="50" />
+      <el-table-column label="日期" align="center" prop="date">
+        <template #default="scope">
+          {{scope.row.date[0]}} 年 {{scope.row.date[1]}} 月 {{scope.row.date[2]}} 日
+        </template>
+      </el-table-column>
       <el-table-column label="学生名称" align="center" prop="studentName" />
-      <!-- <el-table-column
-        label="打卡时间"
+      <el-table-column label="学号" align="center" prop="userNumber"  />
+      <el-table-column
+        v-if="userInfo.userType === '4'"
+        label="工作间名称"
         align="center"
-        prop="clockInTime"
-        :formatter="dateFormatter"
-        width="180px"
-      /> -->
-      <el-table-column label="学号" align="center" prop="userNumber" width="150" />
-      <el-table-column 
-        v-if="userInfo.userType === '4'" 
-        label="工作间名称" 
-        align="center" 
-        prop="deptName" 
+        prop="deptName"
         width="100"
       />
       <el-table-column label="打卡类型" align="center" prop="clockInStatus">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_ATTENDANCE_TYPE" :value="scope.row.clockInStatus" />  
+          <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_ATTENDANCE_TYPE" :value="scope.row.clockInStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="日期" align="center"  prop="date" width="150"/>
       <!-- <el-table-column label="打卡状态 " align="center" prop="clockInStatus" >
         <template #default="rowData">
           <span :class="getStatusClass(rowData.row.clockInStatus)">
@@ -111,27 +108,27 @@
           </span>
         </template>
       </el-table-column> -->
-      <el-table-column label="备注原因" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:student-attendance:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:student-attendance:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="操作" align="center" min-width="120px">-->
+<!--        <template #default="scope">-->
+<!--          <el-button-->
+<!--            link-->
+<!--            type="primary"-->
+<!--            @click="openForm('update', scope.row.id)"-->
+<!--            v-hasPermi="['system:student-attendance:update']"-->
+<!--          >-->
+<!--            编辑-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            link-->
+<!--            type="danger"-->
+<!--            @click="handleDelete(scope.row.id)"-->
+<!--            v-hasPermi="['system:student-attendance:delete']"-->
+<!--          >-->
+<!--            删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -294,4 +291,4 @@ onMounted(async () => {
 .status-unknown {
   color: gray;
 }
-</style>
+</style>