Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/hir_web into main

src/views/login/index.vue

@@ -284,7 +284,9 @@ export default {
                 this.$router.replace({ path: res[0].path });
                 return;
               }
-              if (this.hasPermi(["role:pm",'role:oa','role:admin'])) {
+              if (
+                this.hasPermi(["role:pm", "role:oa", "role:admin", "role:dev"])
+              ) {
                 this.$router.replace({ path: "/trials/trials-inspection" });
               } else if (this.hasPermi(["role:oa"])) {
                 this.$router.replace({ path: "/system" });

src/views/system/login-log/index.vue

@@ -69,6 +69,7 @@
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'CreateTime', order: 'descending' }"
       >
         <el-table-column
           type="index"
@@ -166,8 +167,8 @@ const searchDataDefault = () => {
     LoginFaildName: '',
     BeginDate: '',
     EndDate: '',
-    Asc: true,
+    Asc: false,
-    SortField: '',
+    SortField: 'CreateTime',
     PageIndex: 1,
     PageSize: 20
   }

src/views/system/role/index.vue

@@ -42,7 +42,7 @@
           </template>
         </el-table-column>
         <el-table-column label="Description" prop="Description" min-width="220" show-overflow-tooltip />
-        <el-table-column label="Action" width="280">
+        <el-table-column label="Action" width="280" v-if="hasPermi(['system:role:edit','system:role:delete'])">
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['system:role:edit']"

src/views/trials/trials-layout/components/trialsNavbar.vue

@@ -32,7 +32,7 @@
         <!-- 工作台 -->
         <!-- <span slot="title">{{ $t('trials:menuTitle:workbench') }}</span>
         </el-menu-item> -->
-        <el-menu-item v-if="hasPermi(['role:pm','role:oa','role:admin'])" index="1">
+        <el-menu-item v-if="hasPermi(['role:pm','role:oa','role:admin','role:dev'])" index="1">
           <i class="el-icon-odometer" />
           <!-- 检查 -->
           <span slot="title">{{ $t("trials:menuTitle:inspection") }}</span>

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -64,7 +64,7 @@
         <!-- 操作人 -->
         <el-form-item :label="$t('trials:auditRecord:table:operator')">
           <el-input
-            v-model="searchData.OpByUserName"
+            v-model="searchData.CreateUserRealName"
             style="width: 120px"
             clearable
           />