From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/views/monitor/operlog/index.vue |  503 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 270 insertions(+), 233 deletions(-)

diff --git a/zhitan-vue/src/views/monitor/operlog/index.vue b/zhitan-vue/src/views/monitor/operlog/index.vue
index c580dac..f4d6b40 100644
--- a/zhitan-vue/src/views/monitor/operlog/index.vue
+++ b/zhitan-vue/src/views/monitor/operlog/index.vue
@@ -1,219 +1,240 @@
 <template>
-   <div class="app-container">
+  <div class="app-container page">
+    <div class="form-card">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-         <el-form-item label="鎿嶄綔鍦板潃" prop="operIp">
-            <el-input
-               v-model="queryParams.operIp"
-               placeholder="璇疯緭鍏ユ搷浣滃湴鍧�"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="绯荤粺妯″潡" prop="title">
-            <el-input
-               v-model="queryParams.title"
-               placeholder="璇疯緭鍏ョ郴缁熸ā鍧�"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鎿嶄綔浜哄憳" prop="operName">
-            <el-input
-               v-model="queryParams.operName"
-               placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="绫诲瀷" prop="businessType">
-            <el-select
-               v-model="queryParams.businessType"
-               placeholder="鎿嶄綔绫诲瀷"
-               clearable
-               style="width: 240px"
-            >
-               <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">
-            <el-select
-               v-model="queryParams.status"
-               placeholder="鎿嶄綔鐘舵��"
-               clearable
-               style="width: 240px"
-            >
-               <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 label="鎿嶄綔鏃堕棿" style="width: 308px">
-            <el-date-picker
-               v-model="dateRange"
-               value-format="YYYY-MM-DD HH:mm:ss"
-               type="daterange"
-               range-separator="-"
-               start-placeholder="寮�濮嬫棩鏈�"
-               end-placeholder="缁撴潫鏃ユ湡"
-               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-         </el-form-item>
+        <el-form-item label="鎿嶄綔鍦板潃" prop="operIp">
+          <el-input
+            v-model="queryParams.operIp"
+            placeholder="璇疯緭鍏ユ搷浣滃湴鍧�"
+            clearable
+            style="width: 100%"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="绯荤粺妯″潡" prop="title">
+          <el-input
+            v-model="queryParams.title"
+            placeholder="璇疯緭鍏ョ郴缁熸ā鍧�"
+            clearable
+            style="width: 100%"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="鎿嶄綔浜哄憳" prop="operName">
+          <el-input
+            v-model="queryParams.operName"
+            placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
+            clearable
+            style="width: 100%"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="绫诲瀷" prop="businessType">
+          <el-select v-model="queryParams.businessType" placeholder="鎿嶄綔绫诲瀷" clearable style="width: 100%">
+            <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">
+          <el-select v-model="queryParams.status" placeholder="鎿嶄綔鐘舵��" clearable style="width: 100%">
+            <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 label="鎿嶄綔鏃堕棿" style="width: 320px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+            :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+          <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+        </el-form-item>
       </el-form>
+    </div>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
+    <div class="table-bg-style">
+      <div class="table-box" style="margin-top: 0">
+        <el-row :gutter="10" class="mb8" style="margin-top: 8px">
+          <el-col :span="1.5">
             <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:operlog:remove']"
-            >鍒犻櫎</el-button>
-         </el-col>
-         <el-col :span="1.5">
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['monitor:operlog:remove']"
+              >鍒犻櫎</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" @click="handleClean" v-hasPermi="['monitor:operlog:remove']"
+              >娓呯┖</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
             <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               @click="handleClean"
-               v-hasPermi="['monitor:operlog:remove']"
-            >娓呯┖</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:operlog:export']"
-            >瀵煎嚭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+              type="warning"
+              plain
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['monitor:operlog:export']"
+              >瀵煎嚭</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-      <el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-         <el-table-column type="selection" width="50" align="center" />
-         <el-table-column label="鏃ュ織缂栧彿" align="center" prop="operId" />
-         <el-table-column label="绯荤粺妯″潡" align="center" prop="title" :show-overflow-tooltip="true" />
-         <el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="businessType">
+        <el-table
+          ref="operlogRef"
+          v-loading="loading"
+          :data="operlogList"
+          @selection-change="handleSelectionChange"
+          :default-sort="defaultSort"
+          @sort-change="handleSortChange"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="鏃ュ織缂栧彿" align="center" prop="operId" />
+          <el-table-column label="绯荤粺妯″潡" align="center" prop="title" :show-overflow-tooltip="true" />
+          <el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="businessType">
             <template #default="scope">
-               <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
+              <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
             </template>
-         </el-table-column>
-         <el-table-column label="鎿嶄綔浜哄憳" align="center" width="110" prop="operName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <el-table-column label="鎿嶄綔鍦板潃" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
-         <el-table-column label="鎿嶄綔鐘舵��" align="center" prop="status">
+          </el-table-column>
+          <el-table-column
+            label="鎿嶄綔浜哄憳"
+            align="center"
+            width="110"
+            prop="operName"
+            :show-overflow-tooltip="true"
+            sortable="custom"
+            :sort-orders="['descending', 'ascending']"
+          />
+          <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" />
+              <dict-tag :options="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']">
+          </el-table-column>
+          <el-table-column
+            label="鎿嶄綔鏃ユ湡"
+            align="center"
+            prop="operTime"
+            width="180"
+            sortable="custom"
+            :sort-orders="['descending', 'ascending']"
+          >
             <template #default="scope">
-               <span>{{ parseTime(scope.row.operTime) }}</span>
+              <span>{{ parseTime(scope.row.operTime) }}</span>
             </template>
-         </el-table-column>
-         <el-table-column label="娑堣�楁椂闂�" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
+          </el-table-column>
+          <el-table-column
+            label="娑堣�楁椂闂�"
+            align="center"
+            prop="costTime"
+            width="110"
+            :show-overflow-tooltip="true"
+            sortable="custom"
+            :sort-orders="['descending', 'ascending']"
+          >
             <template #default="scope">
-               <span>{{ scope.row.costTime }}姣</span>
+              <span>{{ scope.row.costTime }}姣</span>
             </template>
-         </el-table-column>
-         <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+          </el-table-column>
+          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="View" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">璇︾粏</el-button>
+              <el-button
+                link
+                type="primary"
+                icon="View"
+                @click="handleView(scope.row, scope.index)"
+                v-hasPermi="['monitor:operlog:query']"
+                >璇︾粏</el-button
+              >
             </template>
-         </el-table-column>
-      </el-table>
+          </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"
+        />
+      </div>
+    </div>
 
-      <!-- 鎿嶄綔鏃ュ織璇︾粏 -->
-      <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" v-model="open" width="800px" append-to-body>
-         <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-col>
-               <el-col :span="12">
-                  <el-form-item label="璇锋眰鍦板潃锛�">{{ form.operUrl }}</el-form-item>
-                  <el-form-item label="璇锋眰鏂瑰紡锛�">{{ form.requestMethod }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="鎿嶄綔鏂规硶锛�">{{ form.method }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="璇锋眰鍙傛暟锛�">{{ form.operParam }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item>
-               </el-col>
-               <el-col :span="8">
-                  <el-form-item label="鎿嶄綔鐘舵�侊細">
-                     <div v-if="form.status === 0">姝e父</div>
-                     <div v-else-if="form.status === 1">澶辫触</div>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="8">
-                  <el-form-item label="娑堣�楁椂闂达細">{{ form.costTime }}姣</el-form-item>
-               </el-col>
-               <el-col :span="8">
-                  <el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="寮傚父淇℃伅锛�" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button @click="open = false">鍏� 闂�</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+    <!-- 鎿嶄綔鏃ュ織璇︾粏 -->
+    <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" v-model="open" width="800px" append-to-body>
+      <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-col>
+          <el-col :span="12">
+            <el-form-item label="璇锋眰鍦板潃锛�">{{ form.operUrl }}</el-form-item>
+            <el-form-item label="璇锋眰鏂瑰紡锛�">{{ form.requestMethod }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="鎿嶄綔鏂规硶锛�">{{ form.method }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="璇锋眰鍙傛暟锛�">{{ form.operParam }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="鎿嶄綔鐘舵�侊細">
+              <div v-if="form.status === 0">姝e父</div>
+              <div v-else-if="form.status === 1">澶辫触</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="娑堣�楁椂闂达細">{{ form.costTime }}姣</el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="寮傚父淇℃伅锛�" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="open = false">鍏� 闂�</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="Operlog">
-import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
+import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog"
 
-const { proxy } = getCurrentInstance();
-const { sys_oper_type, sys_common_status } = proxy.useDict("sys_oper_type","sys_common_status");
+const { proxy } = getCurrentInstance()
+const { sys_oper_type, sys_common_status } = proxy.useDict("sys_oper_type", "sys_common_status")
 
-const operlogList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-const dateRange = ref([]);
-const defaultSort = ref({ prop: "operTime", order: "descending" });
+const operlogList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const dateRange = ref([])
+const defaultSort = ref({ prop: "operTime", order: "descending" })
 
 const data = reactive({
   form: {},
@@ -224,78 +245,94 @@
     title: undefined,
     operName: undefined,
     businessType: undefined,
-    status: undefined
-  }
-});
+    status: undefined,
+  },
+})
 
-const { queryParams, form } = toRefs(data);
+const { queryParams, form } = toRefs(data)
 
 /** 鏌ヨ鐧诲綍鏃ュ織 */
 function getList() {
-  loading.value = true;
-  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    operlogList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  loading.value = true
+  list(proxy.addDateRange(queryParams.value, dateRange.value)).then((response) => {
+    operlogList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
 }
 /** 鎿嶄綔鏃ュ織绫诲瀷瀛楀吀缈昏瘧 */
 function typeFormat(row, column) {
-  return proxy.selectDictLabel(sys_oper_type.value, row.businessType);
+  return proxy.selectDictLabel(sys_oper_type.value, row.businessType)
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+  queryParams.value.pageNum = 1
+  getList()
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
-  dateRange.value = [];
-  proxy.resetForm("queryRef");
-  queryParams.value.pageNum = 1;
-  proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order);
+  dateRange.value = []
+  proxy.resetForm("queryRef")
+  queryParams.value.pageNum = 1
+  proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order)
 }
 /** 澶氶�夋閫変腑鏁版嵁 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.operId);
-  multiple.value = !selection.length;
+  ids.value = selection.map((item) => item.operId)
+  multiple.value = !selection.length
 }
 /** 鎺掑簭瑙﹀彂浜嬩欢 */
 function handleSortChange(column, prop, order) {
-  queryParams.value.orderByColumn = column.prop;
-  queryParams.value.isAsc = column.order;
-  getList();
+  queryParams.value.orderByColumn = column.prop
+  queryParams.value.isAsc = column.order
+  getList()
 }
 /** 璇︾粏鎸夐挳鎿嶄綔 */
 function handleView(row) {
-  open.value = true;
-  form.value = row;
+  open.value = true
+  form.value = row
 }
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
-  const operIds = row.operId || ids.value;
-  proxy.$modal.confirm('鏄惁纭鍒犻櫎鏃ュ織缂栧彿涓�"' + operIds + '"鐨勬暟鎹」?').then(function () {
-    return delOperlog(operIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+  const operIds = row.operId || ids.value
+  proxy.$modal
+    .confirm('鏄惁纭鍒犻櫎鏃ュ織缂栧彿涓�"' + operIds + '"鐨勬暟鎹」?')
+    .then(function () {
+      return delOperlog(operIds)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+    })
+    .catch(() => {})
 }
 /** 娓呯┖鎸夐挳鎿嶄綔 */
 function handleClean() {
-  proxy.$modal.confirm("鏄惁纭娓呯┖鎵�鏈夋搷浣滄棩蹇楁暟鎹」?").then(function () {
-    return cleanOperlog();
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("娓呯┖鎴愬姛");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm("鏄惁纭娓呯┖鎵�鏈夋搷浣滄棩蹇楁暟鎹」?")
+    .then(function () {
+      return cleanOperlog()
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("娓呯┖鎴愬姛")
+    })
+    .catch(() => {})
 }
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 function handleExport() {
-  proxy.download("monitor/operlog/export",{
-    ...queryParams.value,
-  }, `config_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    "monitor/operlog/export",
+    {
+      ...queryParams.value,
+    },
+    `config_${new Date().getTime()}.xlsx`
+  )
 }
 
-getList();
+getList()
 </script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/page.scss";
+</style>

--
Gitblit v1.9.3