“yueshang” 1 year ago
parent
commit
95e165c7bb

+ 3 - 3
src/views/backend/meeting/index.vue

@@ -137,9 +137,9 @@
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CONFIG_TYPE)" :key="dict.value"
               :label="dict.label" :value="dict.value" />
           </el-select> -->
-          <el-select v-model="form.meetingType" placeholder="请选择会议类型" clearable size="small" @change="echange">
-            <el-option key="1" value="1" label="工作会议"></el-option>
-            <el-option key="2" value="2" label="培训会议"></el-option>
+          <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CONFIG_TYPE)" :key="dict.value"
+              :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="状态" prop="status">

+ 2 - 1
src/views/backend/taskInfo/index.vue

@@ -1251,6 +1251,7 @@ export default {
       this.taskStatus = type;
 
       this.queryParams.taskStatus = type;
+      console.log('type', type)
       switch (type) {
         case "1":
           this.selectedTab = "type1";
@@ -1268,7 +1269,7 @@ export default {
           this.selectedTab = "type0";
           this.getList();
           break;
-        case "4":
+        case "9":
           this.selectedTab = "type4";
           this.getList();
           break;

+ 8 - 7
src/views/system/operatelog/index.vue

@@ -3,22 +3,23 @@
     <!-- <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="系统模块" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable style="width: 240px;"
+      <el-form-item label="操作模块" prop="module">
+        <el-input v-model="queryParams.module" placeholder="请输入操作模块" clearable style="width: 240px;"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="操作人员" prop="operName">
-        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable style="width: 240px;"
+      <el-form-item label="操作人员" prop="userNickname">
+        <el-input v-model="queryParams.userNickname" placeholder="请输入操作人员" clearable style="width: 240px;"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="操作类型" clearable style="width: 240px">
+        <el-select v-model="queryParams.type" placeholder="类型" clearable style="width: 240px">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_OPERATE_TYPE)" :key="parseInt(dict.value)"
             :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.success" placeholder="操作状态" clearable style="width: 240px" @change="testChange">
+      <el-form-item label="操作结果" prop="status">
+        <!-- @change="testChange" -->
+        <el-select v-model="queryParams.success" placeholder="操作结果" clearable style="width: 240px">
           <el-option :key="true" label="成功" :value="true" />
           <el-option :key="false" label="失败" :value="false" />
         </el-select>