ezhizao_zx 1 tahun lalu
induk
melakukan
df1755025c

+ 8 - 3
src/views/business/crm/workorder/index.vue

@@ -107,7 +107,7 @@
         align="center"
         prop="taskTypeName"
         :resizable="false"
-        min-width="100"
+        min-width="110"
       >
         <template #default="scope">
           {{ scope.row.taskTypeName }}
@@ -330,6 +330,7 @@ const loading = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const cont = ref(1);
+const setContinue = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const prev = ref([]);
@@ -380,11 +381,14 @@ function getList() {
 
 /** 搜索按钮操作 */
 function handleSetContinue() {
-  console.log(ids.value.length);
   if (ids.value.length < 1) {
     proxy.$modal.msgError("至少选择一条数据");
   } else {
-    continueOpen.value = true;
+    if (setContinue) {
+      proxy.$modal.msgError("只能修改循环工单");
+    } else {
+      continueOpen.value = true;
+    }
   }
 }
 
@@ -422,6 +426,7 @@ function close() {
 // 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.id);
+  setContinue.value = selection.map((item) => item.type === 2);
 }
 
 /** 新增按钮操作 */

+ 14 - 2
src/views/business/production/salary/form.vue

@@ -72,14 +72,25 @@
                   @selection-change="handleCheckChange"
                   @current-change="handleCurrentChange"
                 >
-                  <el-table-column type="selection" width="50" align="center" />
+                  <el-table-column
+                    type="selection"
+                    fixed="left"
+                    width="50"
+                    align="center"
+                  />
                   <el-table-column
                     type="index"
                     label="序号"
                     width="50"
+                    fixed="left"
                     align="center"
                   />
-                  <el-table-column label="员工姓名" width="80" align="center">
+                  <el-table-column
+                    label="员工姓名"
+                    fixed="left"
+                    width="80"
+                    align="center"
+                  >
                     <template #default="scope">
                       <div>
                         <el-input
@@ -546,6 +557,7 @@ function rowChangeSum(row) {
   actuallySalary -=
     row.currentIndividualIncomeTax == null ? 0 : row.currentIndividualIncomeTax;
   actuallySalary -= row.otherCut == null ? 0 : row.otherCut;
+  rowNum(actuallySalary);
   row.actuallySalary = actuallySalary;
   computeTotal();
 }

+ 14 - 2
src/views/business/production/salaryZero/form.vue

@@ -70,14 +70,25 @@
                   @selection-change="handleCheckChange"
                   @current-change="handleCurrentChange"
                 >
-                  <el-table-column type="selection" width="50" align="center" />
+                  <el-table-column
+                    type="selection"
+                    fixed="left"
+                    width="50"
+                    align="center"
+                  />
                   <el-table-column
                     type="index"
+                    fixed="left"
                     label="序号"
                     width="50"
                     align="center"
                   />
-                  <el-table-column label="员工姓名" width="80" align="center">
+                  <el-table-column
+                    label="员工姓名"
+                    fixed="left"
+                    width="80"
+                    align="center"
+                  >
                     <template #default="scope">
                       <div>
                         <el-input
@@ -545,6 +556,7 @@ function rowChangeSum(row) {
   actuallySalary -=
     row.currentIndividualIncomeTax == null ? 0 : row.currentIndividualIncomeTax;
   actuallySalary -= row.otherCut == null ? 0 : row.otherCut;
+  rowNum(actuallySalary);
   row.actuallySalary = actuallySalary;
   computeTotal();
 }

+ 236 - 59
src/views/monitor/job/index.vue

@@ -1,93 +1,244 @@
 <template>
   <div class="page-container list-container">
     <div :gutter="10" class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['monitor:job:add']">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['monitor:job:add']"
+        >新增</el-button
+      >
 
-      <el-button type="warning" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
-        v-hasPermi="['monitor:job:edit']">修改</el-button>
+      <el-button
+        type="warning"
+        size="small"
+        icon="Edit"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['monitor:job:edit']"
+        >修改</el-button
+      >
 
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['monitor:job:remove']">删除</el-button>
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['monitor:job:remove']"
+        >删除</el-button
+      >
 
-      <el-button type="info" size="small" icon="Download" @click="handleExport"
-        v-hasPermi="['monitor:job:export']">导出</el-button>
+      <el-button
+        type="info"
+        size="small"
+        icon="Download"
+        @click="handleExport"
+        v-hasPermi="['monitor:job:export']"
+        >导出</el-button
+      >
 
-      <el-button size="small" icon="Operation" @click="handleJobLog" v-hasPermi="['monitor:job:query']">日志</el-button>
+      <el-button
+        size="small"
+        icon="Operation"
+        @click="handleJobLog"
+        v-hasPermi="['monitor:job:query']"
+        >日志</el-button
+      >
 
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item label="任务名称:" prop="jobName">
-        <el-input size="small" v-model="queryParams.jobName" placeholder="请输入任务名称" clearable style="width: 200px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.jobName"
+          placeholder="请输入任务名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="任务组名:" prop="jobGroup">
-        <el-select size="small" v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 200px">
-          <el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          size="small"
+          v-model="queryParams.jobGroup"
+          placeholder="请选择任务组名"
+          clearable
+          style="width: 200px"
+        >
+          <el-option
+            v-for="dict in sys_job_group"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="任务状态:" prop="status">
-        <el-select size="small" v-model="queryParams.status" placeholder="请选择任务状态" clearable style="width: 200px">
-          <el-option v-for="dict in sys_job_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          size="small"
+          v-model="queryParams.status"
+          placeholder="请选择任务状态"
+          clearable
+          style="width: 200px"
+        >
+          <el-option
+            v-for="dict in sys_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
-    <el-table size="small" v-loading="loading" border height="100%" :data="jobList"
-      @selection-change="handleSelectionChange">
+    <el-table
+      size="small"
+      v-loading="loading"
+      border
+      height="100%"
+      :data="jobList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="任务编号"
+        width="100"
+        align="center"
+        prop="jobId"
+      />
+      <el-table-column
+        label="任务名称"
+        align="center"
+        prop="jobName"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="任务组名" align="center" prop="jobGroup">
         <template #default="scope">
           <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
         </template>
       </el-table-column>
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="调用目标字符串"
+        align="center"
+        prop="invokeTarget"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="cron执行表达式"
+        align="center"
+        prop="cronExpression"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="状态" align="center">
         <template #default="scope">
-          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-            @change="handleStatusChange(scope.row)"></el-switch>
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="200"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-tooltip content="修改" placement="top">
-            <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['monitor:job:edit']"></el-button>
-          </el-tooltip>
-          <el-tooltip content="删除" placement="top">
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['monitor:job:remove']"></el-button>
-          </el-tooltip>
-          <el-tooltip content="执行一次" placement="top">
-            <el-button link type="success" icon="CaretRight" @click="handleRun(scope.row)"
-              v-hasPermi="['monitor:job:changeStatus']"></el-button>
-          </el-tooltip>
-          <el-tooltip content="任务详细" placement="top">
-            <el-button link type="primary" icon="View" @click="handleView(scope.row)"
-              v-hasPermi="['monitor:job:query']"></el-button>
-          </el-tooltip>
-          <el-tooltip content="调度日志" placement="top">
-            <el-button link type="info" icon="Operation" @click="handleJobLog(scope.row)"
-              v-hasPermi="['monitor:job:query']"></el-button>
-          </el-tooltip>
+          <!-- content="修改" -->
+          <!-- <el-tooltip placement="top"> -->
+          <el-button
+            link
+            type="warning"
+            size="small"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['monitor:job:edit']"
+            >修改</el-button
+          >
+          <!-- </el-tooltip> -->
+          <!-- <el-tooltip placement="top"> -->
+          <el-button
+            link
+            type="danger"
+            size="small"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['monitor:job:remove']"
+            >删除</el-button
+          >
+          <!-- </el-tooltip> -->
+          <!-- <el-tooltip placement="top"> -->
+          <el-button
+            link
+            size="small"
+            type="success"
+            @click="handleRun(scope.row)"
+            v-hasPermi="['monitor:job:changeStatus']"
+            >执行</el-button
+          >
+          <!-- </el-tooltip> -->
+          <!-- <el-tooltip placement="top"> -->
+          <el-button
+            link
+            size="small"
+            type="primary"
+            @click="handleView(scope.row)"
+            v-hasPermi="['monitor:job:query']"
+            >详细</el-button
+          >
+          <!-- </el-tooltip> -->
+          <!-- <el-tooltip placement="top"> -->
+          <el-button
+            link
+            size="small"
+            type="info"
+            @click="handleJobLog(scope.row)"
+            v-hasPermi="['monitor:job:query']"
+            >日志</el-button
+          >
+          <!-- </el-tooltip> -->
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改定时任务对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="800px"
+      append-to-body
+      draggable
+    >
       <el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -98,8 +249,12 @@
           <el-col :span="12">
             <el-form-item label="任务分组" prop="jobGroup">
               <el-select v-model="form.jobGroup" placeholder="请选择">
-                <el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+                <el-option
+                  v-for="dict in sys_job_group"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -120,12 +275,18 @@
                   </el-tooltip>
                 </span>
               </template>
-              <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
+              <el-input
+                v-model="form.invokeTarget"
+                placeholder="请输入调用目标字符串"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
-              <el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
+              <el-input
+                v-model="form.cronExpression"
+                placeholder="请输入cron执行表达式"
+              >
                 <template #append>
                   <el-button type="primary" @click="handleShowCron">
                     生成表达式
@@ -155,7 +316,12 @@
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_job_status" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio
+                  v-for="dict in sys_job_status"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -169,8 +335,19 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close draggable>
-      <crontab ref="crontabRef" @hide="openCron = false" @fill="crontabFill" :expression="expression"></crontab>
+    <el-dialog
+      title="Cron表达式生成器"
+      v-model="openCron"
+      append-to-body
+      destroy-on-close
+      draggable
+    >
+      <crontab
+        ref="crontabRef"
+        @hide="openCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></crontab>
     </el-dialog>
 
     <!-- 任务日志详细 -->
@@ -377,7 +554,7 @@ function handleRun(row) {
     .then(() => {
       proxy.$modal.msgSuccess("执行成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 任务详细信息 */
 function handleView(row) {
@@ -448,7 +625,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 131 - 45
src/views/monitor/online/index.vue

@@ -1,98 +1,184 @@
 <template>
-  <div class="app-container" style="height: 100%; overflow: auto;">
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
+  <div class="page-btns-container list-container">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+    >
       <el-form-item label="登录地址:" prop="ipaddr">
-        <el-input size="small" v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable style="width: 200px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.ipaddr"
+          placeholder="请输入登录地址"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="用户名称:" prop="userName">
-        <el-input size="small" v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 200px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
-    <el-table size="small" height="100%" v-loading="loading"
-      :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)" style="width: 100%;">
+    <el-table
+      size="small"
+      height="100%"
+      border
+      v-loading="loading"
+      :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+      style="width: 100%"
+    >
       <el-table-column label="序号" width="50" type="index" align="center">
         <template #default="scope">
           <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="所属部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
-      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
+      <el-table-column
+        label="会话编号"
+        align="center"
+        prop="tokenId"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="登录名称"
+        align="center"
+        prop="userName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="所属部门"
+        align="center"
+        prop="deptName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="主机"
+        align="center"
+        prop="ipaddr"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="登录地点"
+        align="center"
+        prop="loginLocation"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作系统"
+        align="center"
+        prop="os"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="浏览器"
+        align="center"
+        prop="browser"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="登录时间"
+        align="center"
+        prop="loginTime"
+        width="180"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-button link type="danger" size="small" icon="Delete" @click="handleForceLogout(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']">强退</el-button>
+          <el-button
+            link
+            type="danger"
+            size="small"
+            @click="handleForceLogout(scope.row)"
+            v-hasPermi="['monitor:online:forceLogout']"
+            >强退</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="pageNum"
+      v-model:limit="pageSize"
+    />
   </div>
 </template>
 
 <script setup name="Online">
-import { forceLogout, list as initData } from '@/api/monitor/online'
-const { proxy } = getCurrentInstance()
+import { forceLogout, list as initData } from "@/api/monitor/online";
+const { proxy } = getCurrentInstance();
 
-const onlineList = ref([])
-const loading = ref(true)
-const total = ref(0)
-const pageNum = ref(1)
-const pageSize = ref(10)
+const onlineList = ref([]);
+const loading = ref(true);
+const total = ref(0);
+const pageNum = ref(1);
+const pageSize = ref(10);
 
 const queryParams = ref({
   ipaddr: undefined,
-  userName: undefined
-})
+  userName: undefined,
+});
 
 /** 查询登录日志列表 */
 function getList() {
-  loading.value = true
+  loading.value = true;
   initData(queryParams.value).then((response) => {
-    onlineList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+    onlineList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  pageNum.value = 1
-  getList()
+  pageNum.value = 1;
+  getList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm('queryRef')
-  handleQuery()
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
 /** 强退按钮操作 */
 function handleForceLogout(row) {
   proxy.$modal
     .confirm('是否确认强退名称为"' + row.userName + '"的用户?')
     .then(function () {
-      return forceLogout(row.tokenId)
+      return forceLogout(row.tokenId);
     })
     .then(() => {
-      getList()
-      proxy.$modal.msgSuccess('删除成功')
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { })
+    .catch(() => {});
 }
 
-getList()
+getList();
 </script>

+ 163 - 37
src/views/monitor/operlog/index.vue

@@ -1,50 +1,132 @@
 <template>
   <div class="page-container list-container">
     <div :gutter="10" class="list-btns-container">
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['monitor:operlog:remove']">删除</el-button>
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['monitor:operlog:remove']"
+        >删除</el-button
+      >
 
-      <el-button type="danger" size="small" icon="Delete" @click="handleClean"
-        v-hasPermi="['monitor:operlog:remove']">清空</el-button>
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        @click="handleClean"
+        v-hasPermi="['monitor:operlog:remove']"
+        >清空</el-button
+      >
 
-      <el-button type="info" size="small" icon="Download" @click="handleExport"
-        v-hasPermi="['monitor:operlog:export']">导出</el-button>
+      <el-button
+        type="info"
+        size="small"
+        icon="Download"
+        @click="handleExport"
+        v-hasPermi="['monitor:operlog:export']"
+        >导出</el-button
+      >
 
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
-      label-width="68px">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="系统模块:" prop="title" style="width: 300px">
-        <el-input size="small" v-model="queryParams.title" placeholder="请输入系统模块" clearable @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.title"
+          placeholder="请输入系统模块"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="操作人员:" prop="operName" style="width: 300px">
-        <el-input size="small" v-model="queryParams.operName" placeholder="请输入操作人员" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.operName"
+          placeholder="请输入操作人员"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="操作时间:" style="width: 300px">
-        <el-date-picker size="small" v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          size="small"
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="操作类型:" prop="businessType" style="width: 300px">
-        <el-select size="small" v-model="queryParams.businessType" placeholder="操作类型" clearable style="width: 300px">
-          <el-option v-for="dict in sys_oper_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          size="small"
+          v-model="queryParams.businessType"
+          placeholder="操作类型"
+          clearable
+          style="width: 300px"
+        >
+          <el-option
+            v-for="dict in sys_oper_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="操作状态:" prop="status" style="width: 300px">
-        <el-select size="small" v-model="queryParams.status" placeholder="操作状态" clearable style="width: 300px">
-          <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          size="small"
+          v-model="queryParams.status"
+          placeholder="操作状态"
+          clearable
+          style="width: 300px"
+        >
+          <el-option
+            v-for="dict in sys_common_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
 
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
-    <el-table size="small" ref="operlogRef" border v-loading="loading" height="100%" :data="operlogList"
-      @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table
+      size="small"
+      ref="operlogRef"
+      border
+      v-loading="loading"
+      height="100%"
+      :data="operlogList"
+      @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="operId" />
       <el-table-column label="系统模块" align="center" prop="title" />
@@ -54,39 +136,83 @@
         </template>
       </el-table-column>
       <el-table-column label="请求方式" align="center" prop="requestMethod" />
-      <el-table-column label="操作人员" align="center" prop="operName" :show-overflow-tooltip="true" sortable="custom"
-        :sort-orders="['descending', 'ascending']" width="100" />
-      <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="操作人员"
+        align="center"
+        prop="operName"
+        :show-overflow-tooltip="true"
+        sortable="custom"
+        :sort-orders="['descending', 'ascending']"
+        width="100"
+      />
+      <el-table-column
+        label="主机"
+        align="center"
+        prop="operIp"
+        width="130"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="操作状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="sys_common_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作日期" align="center" prop="operTime" sortable="custom"
-        :sort-orders="['descending', 'ascending']" width="180">
+      <el-table-column
+        label="操作日期"
+        align="center"
+        prop="operTime"
+        sortable="custom"
+        :sort-orders="['descending', 'ascending']"
+        width="180"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row, scope.index)"
-            v-hasPermi="['monitor:operlog:query']">详情</el-button>
+          <el-button
+            link
+            type="primary"
+            size="small"
+            @click="handleView(scope.row, scope.index)"
+            v-hasPermi="['monitor:operlog:query']"
+            >详情</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body draggable>
+    <el-dialog
+      title="操作日志详细"
+      v-model="open"
+      width="700px"
+      append-to-body
+      draggable
+    >
       <el-form :model="form" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="操作模块:">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
-            <el-form-item label="登录信息:">{{ form.operName }} / {{ form.operIp }} /
-              {{ form.operLocation }}</el-form-item>
+            <el-form-item label="操作模块:"
+              >{{ form.title }} / {{ typeFormat(form) }}</el-form-item
+            >
+            <el-form-item label="登录信息:"
+              >{{ form.operName }} / {{ form.operIp }} /
+              {{ form.operLocation }}</el-form-item
+            >
           </el-col>
           <el-col :span="12">
             <el-form-item label="请求地址:">{{ form.operUrl }}</el-form-item>
@@ -225,7 +351,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 清空按钮操作 */
 function handleClean() {
@@ -238,7 +364,7 @@ function handleClean() {
       getList();
       proxy.$modal.msgSuccess("清空成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {

+ 1 - 1
src/views/system/version/index.vue

@@ -399,7 +399,7 @@ function handleAdd(row) {
     form.value.parentId = 0;
   }
   open.value = true;
-  title.value = "添加菜单";
+  title.value = "添加模块";
 }
 /** 展开/折叠操作 */
 function toggleExpandAll() {