Merge branch 'dev_v3.4.0' of http://git.qmth.com.cn/teachcloud/teachcloud-print-web into dev_v3.4.0

src/modules/base/views/UserManage.vue

@@ -3,10 +3,10 @@
     <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <el-form-item label="所在机构：">
+          <el-form-item label="所属机构：">
             <org-select
               v-model="filter.orgId"
-              placeholder="所在机构"
+              placeholder="所属机构"
             ></org-select>
           </el-form-item>
           <el-form-item label="关键词：" label-width="75px">
@@ -119,7 +119,7 @@
           width="120"
         ></el-table-column>
         <el-table-column prop="mobileNumber" label="手机号"></el-table-column>
-        <el-table-column prop="orgName" label="所在机构"></el-table-column>
+        <el-table-column prop="orgName" label="所属机构"></el-table-column>
         <el-table-column prop="roles" label="角色">
           <template slot-scope="scope">
             {{ scope.row.roles | rolesFilter }}

src/modules/exam/views/ActionLogManage.vue

@@ -5,7 +5,7 @@
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="操作类型：">
             <el-select
-              v-model="filter.customizedOperationType"
+              v-model="filter.operationType"
               placeholder="操作类型"
               clearable
             >
@@ -58,24 +58,20 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column prop="operatorName" label="操作人" width="140">
+        <el-table-column prop="operatorName" label="操作人" width="180">
           <span slot-scope="scope">
             {{ scope.row.loginName }}（{{ scope.row.realName }}）
           </span>
         </el-table-column>
-        <el-table-column prop="ip" label="IP" width="140"> </el-table-column>
-        <el-table-column
-          prop="customizedOperationTypeName"
-          label="操作类型"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column prop="detail" label="日志内容"> </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="170">
           <span slot-scope="scope">
             {{ scope.row.createTime | timestampFilter }}
           </span>
         </el-table-column>
+        <el-table-column prop="ip" label="IP" width="140"> </el-table-column>
+        <el-table-column prop="operationTypeName" label="操作类型" width="120">
+        </el-table-column>
+        <el-table-column prop="detail" label="日志内容"> </el-table-column>
       </el-table>
       <div class="part-page">
         <el-pagination
@@ -105,7 +101,7 @@ export default {
   data() {
     return {
       filter: {
-        customizedOperationType: "",
+        operationType: "",
         operatorName: "",
         startTime: "",
         endTime: "",