gaoxiong 2 anni fa
parent
commit
863857f0bb

+ 6 - 5
src/views/system/logininfor/index.vue

@@ -100,7 +100,7 @@
 
     <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="访问编号" align="center" prop="infoId" />
+      <el-table-column label="访问编号" width="80" align="center" prop="infoId" />
       <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="登录状态" align="center" prop="status">
@@ -108,12 +108,13 @@
           <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="描述" align="center" prop="msg" :show-overflow-tooltip="true" />
-      <el-table-column label="访问时间" align="center" prop="accessTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+      <el-table-column prop="platformType" label="平台类型" :show-overflow-tooltip="true" width="160">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.accessTime) }}</span>
+          <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
         </template>
       </el-table-column>
+      <el-table-column label="访问时间" align="center" prop="accessTime" width="180"/>
+      <el-table-column label="描述" align="center" prop="msg" :show-overflow-tooltip="true" />
     </el-table>
 
     <pagination
@@ -131,7 +132,7 @@ import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/sy
 
 export default {
   name: "Logininfor",
-  dicts: ['sys_common_status'],
+  dicts: ['sys_common_status','sys_platform_type'],
   data() {
     return {
       // 遮罩层

+ 14 - 1
src/views/system/menu/index.vue

@@ -57,6 +57,11 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+      <el-table-column prop="platformType" label="平台类型" :show-overflow-tooltip="true" width="160">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
+        </template>
+      </el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
@@ -117,6 +122,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="14">
+            <el-form-item label="平台类型" prop="platformType">
+              <el-radio-group v-model="form.platformType">
+                <el-radio v-for="dict in dict.type.sys_platform_type" :key="`${dict.value}`"
+                          :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="菜单类型" prop="menuType">
               <el-radio-group v-model="form.menuType">
@@ -273,7 +286,7 @@ import IconSelect from "@/components/IconSelect";
 
 export default {
   name: "Menu",
-  dicts: ['sys_show_hide', 'sys_normal_disable'],
+  dicts: ['sys_show_hide', 'sys_normal_disable','sys_platform_type'],
   components: { Treeselect, IconSelect },
   data() {
     return {

+ 1 - 5
src/views/system/operlog/index.vue

@@ -119,11 +119,7 @@
           <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作日期" align="center" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.operTime) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="操作日期" align="center" prop="operTime" width="180" />
       <el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
         <template slot-scope="scope">
           <span>{{ scope.row.costTime }}毫秒</span>