vue 20241220 页面 修改

ruoyi-ui/src/views/people/exam/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row>
-      <!--用户数据1-->
+      <!--用户数据-->
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="考试名称" prop="userName">
             <el-input
@@ -23,14 +23,21 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="模拟器类型" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入模拟器类型"
+          <el-form-item label="模拟器型号" prop="simType">
+            <el-select
+              v-model="queryParams.simType"
+              placeholder="模拟器型号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
-            />
+            >
+              <el-option
+                v-for="dict in dict.type.sim_sim_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="考试状态" prop="status">
             <el-select
@@ -93,7 +100,12 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="考试名称" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="考试时间" align="center" key="kaoshiTime" prop="kaoshiTime" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="模拟器类型" align="center" key="liexing" prop="liexing" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="模拟器型号" align="center" key="simType" prop="simType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <dict-tag class="text-navy" :options="dict.type.sim_sim_type" :value="scope.row.simType"/>
+            </template>
+          </el-table-column>
+
           <el-table-column label="创建老师" align="center" key="creater" prop="creater" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="考试状态" align="center" key="status" v-if="columns[4].visible">
             <template slot-scope="scope">
@@ -214,7 +226,7 @@ import { getToken } from "@/utils/auth";
 
 export default {
   name: "Exam",
-  dicts: ['sim_equip_type'],
+  dicts: ['sim_sim_type'],
   data() {
     return {
       user: {},

ruoyi-ui/src/views/people/practice/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="模拟器类型" prop="field101">
         <el-select v-model="formData.field101" placeholder="请选择模拟器类型" clearable :style="{width: '95%'}">
           <el-option
-              v-for="dict in dict.type.sim_equip_type"
+              v-for="dict in dict.type.sim_sim_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -21,7 +21,7 @@
 export default {
   components: {},
   props: [],
-  dicts: ['sim_equip_type'],
+  dicts: ['sim_sim_type'],
   data() {
     return {
       formData: {
@@ -57,7 +57,4 @@ export default {
   /* margin-top: 15%; */
   text-align: center;
 }
-.el-form-item__label{
-  width: 95px !important;
-}
 </style>

ruoyi-ui/src/views/people/score/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row>
-      <!--考试成绩数据1-->
+      <!--考试成绩数据-->
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="学员学号" prop="userName">
             <el-input
@@ -21,14 +21,21 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="模拟器类型" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入模拟器类型"
+          <el-form-item label="模拟器型号" prop="simType">
+            <el-select
+              v-model="queryParams.simType"
+              placeholder="模拟器型号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
-            />
+            >
+              <el-option
+                v-for="dict in dict.type.sim_sim_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="区队/班级" prop="userName">
             <el-input
@@ -71,7 +78,11 @@
           <!-- <el-table-column type="selection" width="50" align="center" /> -->
           <el-table-column label="学员学号" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="学员姓名" align="center" key="kaoshiTime" prop="kaoshiTime" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="模拟器类型" align="center" key="liexing" prop="liexing" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="模拟器型号" align="center" key="simType" prop="simType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <dict-tag class="text-navy" :options="dict.type.sim_sim_type" :value="scope.row.simType"/>
+            </template>
+          </el-table-column>
           <el-table-column label="区队/班级" align="center" key="banji" prop="banji" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="专业名称" align="center" key="zhuanye" prop="zhuanye" v-if="columns[4].visible" :show-overflow-tooltip="true" />
           <el-table-column label="考试名称" align="center" key="kaoshi" prop="kaoshi" v-if="columns[5].visible" :show-overflow-tooltip="true" />
@@ -101,7 +112,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 
 export default {
-  dicts: ['sim_equip_type'],
+  dicts: ['sim_sim_type'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/people/train/index.vue

@@ -23,14 +23,21 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="模拟器类型" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入模拟器类型"
+          <el-form-item label="模拟器型号" prop="simType">
+            <el-select
+              v-model="queryParams.simType"
+              placeholder="模拟器型号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
-            />
+            >
+              <el-option
+                v-for="dict in dict.type.sim_sim_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="练习状态" prop="status">
             <el-select
@@ -58,7 +65,11 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="练习名称" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="练习时间" align="center" key="kaoshiTime" prop="kaoshiTime" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="模拟器类型" align="center" key="liexing" prop="liexing" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="模拟器型号" align="center" key="simType" prop="simType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <dict-tag class="text-navy" :options="dict.type.sim_sim_type" :value="scope.row.simType"/>
+            </template>
+          </el-table-column>
           <el-table-column label="创建老师" align="center" key="creater" prop="creater" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="练习状态" align="center" key="status" v-if="columns[4].visible">
             <template slot-scope="scope">
@@ -106,7 +117,7 @@
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
 export default {
-  dicts: ['sim_equip_type'],
+  dicts: ['sim_sim_type'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/peoples/score/index.vue

@@ -35,14 +35,21 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="模拟器类型" prop="majorName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入模拟器类型"
+          <el-form-item label="模拟器型号" prop="simType">
+            <el-select
+              v-model="queryParams.simType"
+              placeholder="模拟器型号"
               clearable
-              style="width: 200px"
+              style="width: 240px"
               @keyup.enter.native="handleQuery"
-            />
+            >
+              <el-option
+                v-for="dict in dict.type.sim_sim_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         
           <el-form-item label="考试时间">
@@ -109,7 +116,13 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="学员学号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="学员姓名" align="center" key="xuehao" prop="xuehao" v-if="columns[1].visible" />
-          <el-table-column label="模拟器类型" align="center" key="xingming" prop="xingming" v-if="columns[2].visible" />
+
+          <el-table-column label="模拟器型号" align="center" key="simType" prop="simType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <dict-tag class="text-navy" :options="dict.type.sim_sim_type" :value="scope.row.simType"/>
+            </template>
+          </el-table-column>
+
           <el-table-column label="区队/班级" align="center" key="className" prop="className" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="考试名称" align="center" key="majorName" prop="majorName" v-if="columns[4].visible" :show-overflow-tooltip="true" />
           <el-table-column label="成绩" align="center" key="remark" prop="remark" v-if="columns[5].visible" :show-overflow-tooltip="true" />
@@ -346,7 +359,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ['sys_normal_disable', 'sys_user_sex','sim_sim_type'],
   components: { Treeselect },
   data() {
     return {

ruoyi-ui/src/views/peoples/student/index.vue

@@ -103,7 +103,7 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" width="80"/>
           <el-table-column label="学号" align="center" key="userName" prop="userName" v-if="columns[1].visible" />
           <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" />
           <el-table-column label="区队/班级" align="center" key="dept.deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
@@ -120,7 +120,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -128,7 +128,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="160"
+            width="180"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">

ruoyi-ui/src/views/peoples/task/index.vue

@@ -111,7 +111,7 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="编号" align="center" key="taskId" prop="taskId" v-if="columns[0].visible" />
+          <el-table-column label="编号" align="center" key="taskId" prop="taskId" v-if="columns[0].visible" width="80"/>
           <el-table-column label="任务名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="模拟器型号" align="center" key="simType" prop="simType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
             <template slot-scope="scope">

ruoyi-ui/src/views/peoples/trains/index.vue

@@ -38,14 +38,21 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="模拟器类型" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入模拟器类型"
+          <el-form-item label="模拟器型号" prop="simType">
+            <el-select
+              v-model="queryParams.simType"
+              placeholder="模拟器型号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
-            />
+            >
+              <el-option
+                v-for="dict in dict.type.sim_sim_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker
@@ -112,7 +119,13 @@
           <!-- <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
           <el-table-column label="练习名称" align="center" key="userName1" prop="userName1" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="练习时间" align="center" key="kaoshiTime" prop="kaoshiTime" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="模拟器类型" align="center" key="liexing" prop="liexing" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+
+          <el-table-column label="模拟器型号" align="center" key="simType" prop="simType" v-if="columns[3].visible" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <dict-tag class="text-navy" :options="dict.type.sim_sim_type" :value="scope.row.simType"/>
+            </template>
+          </el-table-column>
+
           <el-table-column label="创建老师" align="center" key="creater" prop="creater" v-if="columns[4].visible" :show-overflow-tooltip="true" />
           <el-table-column label="练习状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
@@ -393,7 +406,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Task",
-  dicts: ['sim_equip_type','sys_topic_way','sys_normal_disable'],
+  dicts: ['sim_sim_type','sys_topic_way','sys_normal_disable'],
   components: { Treeselect },
   data() {
     return {

ruoyi-ui/src/views/system/dept/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="班级" prop="deptName">
+      <el-form-item label="名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
-          placeholder="请输入班级"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -68,7 +68,7 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="deptName" label="班级名称" width="260"></el-table-column>
+      <el-table-column prop="deptName" label="名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
@@ -120,8 +120,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="班级名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入班级名称" />
+            <el-form-item label="名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -211,7 +211,7 @@ export default {
           { required: true, message: "上级不能为空", trigger: "blur" }
         ],
         deptName: [
-          { required: true, message: "班级名称不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" }
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }

ruoyi-ui/src/views/teacher/index.vue

@@ -101,11 +101,11 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" />
-          <el-table-column label="教师名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[4].visible">
+          <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"  width="80"/>
+          <el-table-column label="账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"/>
+          <el-table-column label="教师名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true"/>
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible"/>
+          <el-table-column label="状态" align="center" key="status" v-if="columns[4].visible" width="120">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -115,7 +115,7 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -123,7 +123,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="160"
+            width="180"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">