0603

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '车联通后台管理系统',
+      title: '车联通管理系统',
       logo: undefined,
     }
   }

src/views/drivingSchool/DriveSchoolPay/api/index.js

@@ -82,3 +82,12 @@ export function getStudentDetail(userId) {
     method: 'get'
   })
 }
+
+export function getSourceUserById(userId) {
+  return request({
+    url: '/base/dl-drive-school-coach/getCoachByUserId?userId=' + userId,
+    method: 'get'
+  })
+}
+
+

src/views/drivingSchool/DriveSchoolPay/index.vue

@@ -70,6 +70,8 @@
           <dict-tag :type="DICT_TYPE.DRIVE_SCHOOL_PAY_TYPE" :value="scope.row.payType"/>
         </template>
       </el-table-column>
+      <el-table-column label="报名时间" align="center" prop="createTime" :formatter="formatDate"/>
+<!--      <el-table-column label="学费到账审核" align="center" prop="receiptReview" :formatter="formatReceiptReview"/>-->
       <el-table-column label="信息" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="viewStudentInfo(scope.row)">学员信息</el-button>
@@ -136,7 +138,7 @@
     </el-dialog>
 
         <el-dialog :title="studentDialog.title" :visible.sync="studentDialog.visible" width="45%" v-dialogDrag append-to-body>
-          <el-form ref="formRef" :model="studentDialog.studentInfo"  v-loading="studentDialog.loading" label-width="100px">
+          <el-form ref="studentFormRef" :model="studentDialog.studentInfo"  v-loading="studentDialog.loading" label-width="100px">
             <el-form-item label="头像" prop="avatar">
               <el-image
                 v-if="studentDialog.studentInfo.avatar"
@@ -149,12 +151,12 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model="studentDialog.studentInfo.name" placeholder="请输入姓名" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.name || '-' }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="年龄" prop="age">
-                  <el-input v-model="studentDialog.studentInfo.age" placeholder="请输入年龄" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.age || '-' }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -162,16 +164,14 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="性别" prop="sex">
-                  <el-radio-group v-model="studentDialog.studentInfo.sex" disabled>
+          <span class="display-text">
-                    <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+            {{ getDictLabel(DICT_TYPE.SYSTEM_USER_SEX, studentDialog.studentInfo.sex) || '-' }}
-                              :key="dict.value" :label="dict.value">{{ dict.label }}
+          </span>
-                    </el-radio>
-                  </el-radio-group>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="联系电话" prop="phone">
-                  <el-input v-model="studentDialog.studentInfo.phone" placeholder="请输入联系电话" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.phone || '-' }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -179,12 +179,12 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="身份证号" prop="idCard">
-                  <el-input v-model="studentDialog.studentInfo.idCard" placeholder="请输入身份证号" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.idCard || '-' }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="工作单位" prop="workName">
-                  <el-input v-model="studentDialog.studentInfo.workName" placeholder="请输入工作单位" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.workName || '-' }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -192,12 +192,30 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="户籍地址" prop="registAddress">
-                  <el-input v-model="studentDialog.studentInfo.registAddress" placeholder="请输入户籍地址" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.registAddress || '-' }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="家庭住址" prop="address">
-                  <el-input v-model="studentDialog.studentInfo.address" placeholder="请输入家庭住址" :disabled="true"/>
+                  <span class="display-text">{{ studentDialog.studentInfo.address || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="渠道" prop="source">
+                    <span class="display-text">{{ getSourceLabel(studentDialog.studentInfo.source) }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="招生人" prop="sourceUserId">
+                  <span class="display-text">{{ sourceUser || studentDialog.studentInfo.sourceUserId || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="来源" prop="channel">
+                  <span class="display-text">{{ studentDialog.studentInfo.channel || '-' }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -205,59 +223,11 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
-                  <el-input type="textarea" v-model="studentDialog.studentInfo.remark" placeholder="请输入备注" :disabled="true"/>
+                  <pre class="display-text remark-text">{{ studentDialog.studentInfo.remark || '-' }}</pre>
                 </el-form-item>
               </el-col>
             </el-row>
 
-<!--            <el-form-item label="证件照" prop="idPhoto">
-              <div style="display: flex; flex-wrap: wrap; gap: 10px;">
-                <el-image
-                  v-for="(photo, index) in getPhotoList(studentDialog.studentInfo.idPhoto)"
-                  :key="index"
-                  :src="baseImageUrl + photo"
-                  style="width: 200px; height: 150px;"
-                  :preview-src-list="getPhotoPreviewList(studentDialog.studentInfo.idPhoto)"
-                  fit="contain"
-                />
-              </div>
-            </el-form-item>
-            <el-form-item label="生活照" prop="lifePhoto">
-              <div style="display: flex; flex-wrap: wrap; gap: 10px;">
-                <el-image
-                  v-for="(photo, index) in getPhotoList(studentDialog.studentInfo.lifePhoto)"
-                  :key="'life-'+index"
-                  :src="baseImageUrl + photo"
-                  style="width: 200px; height: 150px;"
-                  :preview-src-list="getPhotoPreviewList(studentDialog.studentInfo.lifePhoto)"
-                  fit="contain"
-                />
-              </div>
-            </el-form-item>
-            <el-form-item label="其他照片" prop="otherPhoto">
-              <div style="display: flex; flex-wrap: wrap; gap: 10px;">
-                <el-image
-                  v-for="(photo, index) in getPhotoList(studentDialog.studentInfo.otherPhoto)"
-                  :key="'other-'+index"
-                  :src="baseImageUrl + photo"
-                  style="width: 200px; height: 150px;"
-                  :preview-src-list="getPhotoPreviewList(studentDialog.studentInfo.otherPhoto)"
-                  fit="contain"
-                />
-              </div>
-            </el-form-item>-->
-<!--            <el-form-item label="体检报告" prop="examinationReport">
-              <div style="display: flex; flex-wrap: wrap; gap: 10px;">
-                <el-image
-                  v-for="(photo, index) in getPhotoList(studentDialog.studentInfo.examinationReport)"
-                  :key="'exam-'+index"
-                  :src="baseImageUrl + photo"
-                  style="width: 200px; height: 150px;"
-                  :preview-src-list="getPhotoPreviewList(studentDialog.studentInfo.examinationReport)"
-                  fit="contain"
-                />
-              </div>
-            </el-form-item>-->
             <el-form-item label="证件照" prop="idPhoto">
               <div style="display: flex; flex-wrap: wrap; gap: 10px;">
                 <template v-if="getPhotoList(studentDialog.studentInfo.idPhoto).length > 0">
@@ -348,6 +318,7 @@ import SchoolCourseOrderForm from '@/views/drivingSchool/DriveSchoolPay/form/Sch
 import AssignmentCoach from "@/views/drivingSchool/DriveSchoolPay/form/assignmentCoach.vue";
 import EndOrder from "@/views/drivingSchool/DriveSchoolPay/form/endOrder.vue";
 import SchoolCourseOrderFastAddForm from "@/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue";
+import { getSourceUserById } from '@/views/drivingSchool/DriveSchoolPay/api'
 export default {
   name: "SchoolCourseOrder",
   components: {
@@ -398,7 +369,9 @@ export default {
         loading: false,
         // 学员信息
         studentInfo: {}
-      }
+      },
+      sourceList: this.getDictDatas("drive_school_channel"),
+      sourceUser:null
     };
   },
   created() {
@@ -452,6 +425,14 @@ export default {
       if (!photoStr) return [];
       return photoStr.split(',').map(item => this.baseImageUrl + item.trim());
     },
+    getSourceLabel(value) {
+      const item = this.sourceList.find(item => item.value === value);
+      return item ? item.label : value; // 如果找不到匹配项，显示原始值
+    },
+    getDictLabel(dictType, value) {
+      const dict = this.getDictDatas(dictType).find(item => item.value === value);
+      return dict ? dict.label : value;
+    },
     /* async viewContract(row) {
       try {
         this.loading = true;
@@ -464,6 +445,19 @@ export default {
         this.loading = false;
       }
     }, */
+    getSourceUserId(userId){
+      getSourceUserById(userId).then(res => {
+        console.log(res)
+        this.sourceUser = res.data.name
+      })
+    },
+    formatReceiptReview(row, column, value) {
+      const map = {
+        1: '待审核',
+        0: '已审核'
+      };
+      return map[value] ?? '未知类型';
+    },
     async viewContract(row) {
       try {
         this.loading = true;
@@ -488,6 +482,9 @@ export default {
         // 这里调用API获取学员详细信息
         const res = await SchoolCourseOrderApi.getStudentDetail(row.userId)
         this.studentDialog.studentInfo = res.data
+        if(this.studentDialog.studentInfo.sourceUserId != null){
+          this.getSourceUserId(this.studentDialog.studentInfo.sourceUserId)
+        }
         console.log('res',res.data)
       } finally {
         this.studentDialog.loading = false
@@ -515,6 +512,40 @@ export default {
         this.exportLoading = false;
       }
     },
+    formatDate(row, column, cellValue) {
+      return this.formatTimestampToDate(cellValue);
+    },
+    formatTimestampToDate(timestamp) {
+      if (!timestamp) return '';
+      const date = new Date(timestamp);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+
+      return `${year}-${month}-${day}`;
+    },
+
+
   }
 };
 </script>
+
+<style scoped>
+.display-text {
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 40px;
+  height: 40px;
+  border-radius: 4px;
+  background-color: #f5f7fa;
+  color: #606266;
+  width: 100%;
+}
+
+.remark-text {
+  white-space: pre-wrap;
+  min-height: 60px;
+  line-height: 1.5;
+  padding: 10px 15px;
+}
+</style>

src/views/index.vue

@@ -80,6 +80,11 @@
 
 
   </div>
+<!--  <div class="container_">
+  <div class="fullscreen-image-container">
+    <img class="fullscreen-image" src="@/assets/images/homeImg.png" alt="Fullscreen Image">
+  </div>
+  </div>-->
 </template>
 
 <script>
@@ -232,4 +237,21 @@ export default {
     padding: 8px;
   }
 }
+
+/*.fullscreen-image-container {
+  //position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 50%;
+  overflow: hidden;
+  margin: 0;
+  padding: 0;
+
+  .fullscreen-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+}*/
 </style>

src/views/index1.vue

@@ -0,0 +1,235 @@
+<template>
+  <div class="container_">
+
+
+    <!--    <div class="top-list">-->
+    <!--      <div class="list-box" v-for="(item, index) in serviceList" :key="item.id" :span="4">-->
+    <!--        <div @click="goRoute(item.id)">-->
+    <!--          <img :src="imgUrl + item.coverImg"-->
+    <!--               style="width: 300px; height: 300px;">-->
+    <!--          <div style="font-weight: bold;text-align: center;font-size: 28px">{{ item.name }}</div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--    </div>-->
+
+
+
+    <div  class="container-box">
+      <div class="flex-box">
+        <div style=" font-size: 30px;margin-bottom: 30px">临期提醒</div>
+        <el-table
+          :data="warnList"
+          stripe
+          style="width: 100%">
+          <el-table-column
+            prop="title"
+            label="标题"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="content"
+            label="内容"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="warnTime"
+            label="提醒时间">
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页组件 -->
+        <pagination v-show="warnTotal > 0" :total="warnTotal" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                    @pagination="getWarnList"
+        />
+      </div>
+      <div class="flex-box">
+        <div style="font-size: 30px;margin-bottom: 30px">消息通知</div>
+        <el-table
+          :data="messageList"
+          stripe
+          style="width: 100%">
+          <el-table-column
+            prop="templateNickname"
+            label="发送人"
+            width="120">
+          </el-table-column>
+          <el-table-column label="发送时间" align="center" prop="createTime" width="180">
+            <template v-slot="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="类型" align="center" prop="templateType" width="80">
+            <template v-slot="scope">
+              <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="templateContent"
+            label="内容">
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页组件 -->
+        <pagination v-show="messageTotal > 0" :total="messageTotal" :page.sync="messageQueryParams.pageNo"
+                    :limit.sync="messageQueryParams.pageSize"
+                    @pagination="getNotifyMessage"
+        />
+      </div>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+import {getServicePackageList} from "@/api/system/servicePackage";
+import {warnList,getMyNotifyMessagePage} from "@/api/system/notify/message";
+
+const lineChartData = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
+
+export default {
+  name: 'Index',
+  components: {
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart
+  },
+  data() {
+    return {
+      imgUrl:'',
+      lineChartData: lineChartData.newVisitis,
+      serviceList: [],
+      warnList: [],
+      messageList: [],
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10
+      },
+      messageQueryParams: {
+        pageNo: 1,
+        pageSize: 10
+      },
+      messageTotal: 0,
+      warnTotal: 0
+    }
+  },
+  created() {
+    this.getServiceList()
+    this.getNotifyMessage()
+    this.getWarnList()
+    this.imgUrl = process.env.VUE_APP_IMAGE_URL
+    console.log( this.imgUrl + '1111111'  )
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
+    },
+    goRoute(code){
+      console.log(window.location.host,150)
+      window.open(window.location.origin+"/index?routeCode="+code)
+    },
+    getNotifyMessage() {
+      // 执行查询
+      getMyNotifyMessagePage(this.messageQueryParams).then(response => {
+
+        this.messageList = response.data.list;
+        this.messageTotal = response.data.total;
+      });
+    },
+    getWarnList() {
+      // 执行查询
+      warnList(this.queryParams).then(response => {
+        console.log(response,149)
+        this.warnList = response.data.records;
+        this.warnTotal = response.data.total;
+      });
+    },
+    getServiceList() {
+      getServicePackageList(this.queryParams).then(response => {
+        this.serviceList = response.data;
+
+      });
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container_{
+  background-color: rgb(240, 242, 245);
+  box-sizing: border-box;
+  padding: 15px;
+}
+.top-list{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 25px;
+  flex-wrap: wrap;
+}
+.list-box{
+  background: #fff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 15px;
+  border-radius: 8px;
+}
+.container-box{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.flex-box{
+  width: 49%;
+  background: #fff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 15px;
+  border-radius: 8px;
+}
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+
+@media (max-width: 1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
+</style>

src/views/login.vue

@@ -9,7 +9,7 @@
       <div class="field">
         <!-- [移动端]标题 -->
         <h2 class="mobile-title">
-          <h3 class="title">后台管理系统</h3>
+          <h3 class="title">管理系统</h3>
         </h2>
 
         <!-- 表单 -->

src/views/sso.vue

@@ -9,7 +9,7 @@
       <div class="field">
         <!-- [移动端]标题 -->
         <h2 class="mobile-title">
-          <h3 class="title">"车联通"后台管理系统</h3>
+          <h3 class="title">"车联通"管理系统</h3>
         </h2>
 
         <!-- 表单 -->