fan пре 2 година
родитељ
комит
a3d080bc96

+ 6 - 1
src/components/XTForm/src/XTForm.vue

@@ -15,7 +15,11 @@
               :defaultValue="item.defaultValue"
               @change="handleChange"
               :size="item.size || 'large'"
-            />
+            >
+              <template #prefix v-if="item.prefix">
+                <i :class="['iconfont', item.prefix]" />
+              </template>
+            </Input>
           </div>
           <div v-if="item.componentType == ComponentEnum.Select">
             <Select
@@ -138,6 +142,7 @@
       selected?: string;
       // iconBtn 数
       count?: number;
+      prefix?: string;
     }>;
   }
   withDefaults(defineProps<Props>(), {

+ 5 - 5
src/views/monitor/loginLog/data.ts

@@ -23,10 +23,10 @@ export const columns: BasicColumn[] = [
   //   title: '方法名称',
   //   dataIndex: 'javaMethod',
   // },
-  // {
-  //   title: '操作日志类型',
-  //   dataIndex: 'type',
-  // },
+  {
+    title: '日志类型',
+    dataIndex: 'type',
+  },
   {
     title: '操作时间',
     dataIndex: 'opTime',
@@ -228,7 +228,7 @@ export const viewSchema: DescItem[] = [
     field: 'javaMethod',
   },
   {
-    label: '操作日志类型',
+    label: '日志类型',
     field: 'type',
   },
   {

+ 1 - 1
src/views/monitor/loginLog/index.vue

@@ -94,7 +94,7 @@
   const useApp = useAppStore();
   console.log(useApp.getMenuSetting);
   onBeforeMount(async () => {
-    typeOptions.value = await listDictModel({ dictCode: 'sys_log_type' });
+    typeOptions.value = await listDictModel({ dictCode: 'sys_login_log_type' });
     responseTypeOptions.value = await listDictModel({ dictCode: 'sys_response_type' });
     resultJsonOptions.value = await listDictModel({ dictCode: 'sys_response_type' });
   });

+ 1 - 7
src/views/monitor/loginLog/viewDrawer.vue

@@ -24,12 +24,8 @@
   const width = '45%';
 
   const typeOptions = ref();
-  const responseTypeOptions = ref();
-  const resultJsonOptions = ref();
   onBeforeMount(async () => {
-    typeOptions.value = await listDictModel({ dictCode: 'sys_log_type' });
-    responseTypeOptions.value = await listDictModel({ dictCode: 'sys_response_type' });
-    resultJsonOptions.value = await listDictModel({ dictCode: 'sys_response_type' });
+    typeOptions.value = await listDictModel({ dictCode: 'sys_login_log_type' });
   });
   const [registerDrawer] = useDrawerInner(async data => {
     console.log('::::::::::', data.record);
@@ -37,8 +33,6 @@
     descData.value = {
       ...resData,
       type: formatDictValue(typeOptions.value, resData.type),
-      responseType: formatDictValue(responseTypeOptions.value, resData.responseType),
-      resultJson: formatDictValue(resultJsonOptions.value, resData.resultJson),
     };
   });
   const [registerDesc] = useDescription({

+ 1 - 1
src/views/monitor/operLog/data.ts

@@ -228,7 +228,7 @@ export const viewSchema: DescItem[] = [
     field: 'javaMethod',
   },
   {
-    label: '操作日志类型',
+    label: '日志类型',
     field: 'type',
   },
   {

+ 1 - 0
src/views/monitor/operLog/index.vue

@@ -102,6 +102,7 @@
       componentType: 'Input',
       placeholder: '请输入操作名称',
       width: 200,
+      prefix: 'icon-xt-search',
     },
   ];
   // tab 切换选中

+ 0 - 6
src/views/monitor/operLog/viewDrawer.vue

@@ -24,12 +24,8 @@
   const width = '45%';
 
   const typeOptions = ref();
-  const responseTypeOptions = ref();
-  const resultJsonOptions = ref();
   onBeforeMount(async () => {
     typeOptions.value = await listDictModel({ dictCode: 'sys_log_type' });
-    responseTypeOptions.value = await listDictModel({ dictCode: 'sys_response_type' });
-    resultJsonOptions.value = await listDictModel({ dictCode: 'sys_response_type' });
   });
   const [registerDrawer] = useDrawerInner(async data => {
     console.log('::::::::::', data.record);
@@ -37,8 +33,6 @@
     descData.value = {
       ...resData,
       type: formatDictValue(typeOptions.value, resData.type),
-      responseType: formatDictValue(responseTypeOptions.value, resData.responseType),
-      resultJson: formatDictValue(resultJsonOptions.value, resData.resultJson),
     };
   });
   const [registerDesc] = useDescription({