操作日志

src/components/product/SelectMaterial.vue

@@ -97,19 +97,19 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item prop="length" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.length" placeholder="请输入长（cm）" style="width: 100%" :precision="2" :controls="false"
+                      <el-input-number v-model="formData.data.length" placeholder="长（cm）" style="width: 100%" :precision="2" :controls="false"
                                        :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="width" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.width" placeholder="请输入宽（cm）" style="width: 100%" :precision="2" :controls="false"
-                                       :min="0" onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.width" placeholder="宽（cm）" style="width: 100%" :precision="2" :controls="false" :min="0"
+                                       onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="height" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.height" placeholder="请输入高（cm）" style="width: 100%" :precision="2" :controls="false"
+                      <el-input-number v-model="formData.data.height" placeholder="高（cm）" style="width: 100%" :precision="2" :controls="false"
                                        :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
@@ -247,7 +247,7 @@ const rules = ref({
   length: [{ required: true, message: "请输入长 （cm）", trigger: "blur" }],
   width: [{ required: true, message: "请输入宽 （cm）", trigger: "blur" }],
   height: [{ required: true, message: "请输入高 （cm）", trigger: "blur" }],
-  price: [{ required: true, message: "请输入销售价", trigger: "blur" }],
+  // price: [{ required: true, message: "请输入销售价", trigger: "blur" }],
 });
 
 const selectConfig = computed(() => []);
@@ -911,6 +911,18 @@ const associationConfig = computed(() => {
     },
   ];
 });
+
+const rawMaterialData = ref([]);
+const getRawMaterialData = () => {
+  proxy.post("/productInfo/page", { productClassifyId: 110 }).then((res) => {
+    rawMaterialData.value = res.rows.map((x) => ({
+      label: x.name + "，" + x.customCode,
+      value: x.id,
+    }));
+  });
+};
+getRawMaterialData();
+
 const associationData = ref({
   data: [],
   pagination: {

src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -1287,22 +1287,22 @@ const submitForm = () => {
     //   return proxy.msgTip("请上传生产plt文件", 2);
     // }
 
-    if (
-      !(
-        formData.data.productBomDetailList &&
-        formData.data.productBomDetailList.length > 0
-      )
-    ) {
-      return proxy.msgTip("请添加BOM", 2);
-    } else {
-      let type1 = null;
-      let type3 = null;
-      type1 = formData.data.productBomDetailList.find((x) => x.type == 1);
-      type3 = formData.data.productBomDetailList.find((x) => x.type == 3);
-      if (!(type1 && type3)) {
-        return proxy.msgTip("未选择主材和工艺", 2);
-      }
-    }
+    // if (
+    //   !(
+    //     formData.data.productBomDetailList &&
+    //     formData.data.productBomDetailList.length > 0
+    //   )
+    // ) {
+    //   return proxy.msgTip("请添加BOM", 2);
+    // } else {
+    //   let type1 = null;
+    //   let type3 = null;
+    //   type1 = formData.data.productBomDetailList.find((x) => x.type == 1);
+    //   type3 = formData.data.productBomDetailList.find((x) => x.type == 3);
+    //   if (!(type1 && type3)) {
+    //     return proxy.msgTip("未选择主材和工艺", 2);
+    //   }
+    // }
 
     let checkNum = 0;
     for (let i = 0; i < formData.data.productCustomInfoList.length; i++) {

src/views/monitor/logininfor/index.vue

@@ -1,131 +1,81 @@
 <template>
-   <div class="app-container">
+  <div class="app-container pageIndexClass">
+    <div style="background:#fff;padding:15px">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="登录地址" prop="ipaddr">
-            <el-input
-               v-model="queryParams.ipaddr"
-               placeholder="请输入登录地址"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="用户名称" prop="userName">
-            <el-input
-               v-model="queryParams.userName"
-               placeholder="请输入用户名称"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </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="ipaddr">
+          <el-input v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable style="width: 240px;" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="用户名称" prop="userName">
+          <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px;" @keyup.enter="handleQuery" />
+        </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>
 
       <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:logininfor:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               @click="handleClean"
-               v-hasPermi="['monitor:logininfor:remove']"
-            >清空</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Unlock"
-               :disabled="single"
-               @click="handleUnlock"
-               v-hasPermi="['monitor:logininfor:unlock']"
-            >解锁</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:logininfor:export']"
-            >导出</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                     v-hasPermi="['monitor:logininfor:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" @click="handleClean" v-hasPermi="['monitor:logininfor:remove']">清空</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Unlock" :disabled="single" @click="handleUnlock"
+                     v-hasPermi="['monitor:logininfor:unlock']">解锁</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-
-      <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @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="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <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="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="msg" :show-overflow-tooltip="true" />
-         <el-table-column label="访问时间" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.loginTime) }}</span>
-            </template>
-         </el-table-column>
+      <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @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="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom"
+                         :sort-orders="['descending', 'ascending']" />
+        <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="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="msg" :show-overflow-tooltip="true" />
+        <el-table-column label="访问时间" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.loginTime) }}</span>
+          </template>
+        </el-table-column>
       </el-table>
+      <pagination v-show="total > 0" style="margin-bottom:30px;" :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>
+  </div>
 </template>
 
 <script setup name="Logininfor">
-import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/monitor/logininfor";
+import {
+  list,
+  delLogininfor,
+  cleanLogininfor,
+  unlockLogininfor,
+} from "@/api/monitor/logininfor";
 
 const { proxy } = getCurrentInstance();
 const { sys_common_status } = proxy.useDict("sys_common_status");
@@ -149,17 +99,19 @@ const queryParams = ref({
   userName: undefined,
   status: undefined,
   orderByColumn: undefined,
-  isAsc: undefined
+  isAsc: undefined,
 });
 
 /** 查询登录日志列表 */
 function getList() {
   loading.value = true;
-  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    logininforList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(
+    (response) => {
+      logininforList.value = response.rows;
+      total.value = response.total;
+      loading.value = false;
+    }
+  );
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -171,14 +123,17 @@ function resetQuery() {
   dateRange.value = [];
   proxy.resetForm("queryRef");
   queryParams.value.pageNum = 1;
-  proxy.$refs["logininforRef"].sort(defaultSort.value.prop, defaultSort.value.order);
+  proxy.$refs["logininforRef"].sort(
+    defaultSort.value.prop,
+    defaultSort.value.order
+  );
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.infoId);
+  ids.value = selection.map((item) => item.infoId);
   multiple.value = !selection.length;
   single.value = selection.length != 1;
-  selectName.value = selection.map(item => item.userName);
+  selectName.value = selection.map((item) => item.userName);
 }
 /** 排序触发事件 */
 function handleSortChange(column, prop, order) {
@@ -189,36 +144,52 @@ function handleSortChange(column, prop, order) {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const infoIds = row.infoId || ids.value;
-  proxy.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?').then(function () {
-    return delLogininfor(infoIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?')
+    .then(function () {
+      return delLogininfor(infoIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 /** 清空按钮操作 */
 function handleClean() {
-  proxy.$modal.confirm("是否确认清空所有登录日志数据项?").then(function () {
-    return cleanLogininfor();
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("清空成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm("是否确认清空所有登录日志数据项?")
+    .then(function () {
+      return cleanLogininfor();
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("清空成功");
+    })
+    .catch(() => {});
 }
 /** 解锁按钮操作 */
 function handleUnlock() {
   const username = selectName.value;
-  proxy.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function () {
-    return unlockLogininfor(username);
-  }).then(() => {
-    proxy.$modal.msgSuccess("用户" + username + "解锁成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('是否确认解锁用户"' + username + '"数据项?')
+    .then(function () {
+      return unlockLogininfor(username);
+    })
+    .then(() => {
+      proxy.$modal.msgSuccess("用户" + username + "解锁成功");
+    })
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("monitor/logininfor/export", {
-    ...queryParams.value,
-  }, `config_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    "monitor/logininfor/export",
+    {
+      ...queryParams.value,
+    },
+    `config_${new Date().getTime()}.xlsx`
+  );
 }
 
 getList();

src/views/monitor/operlog/index.vue

@@ -1,198 +1,144 @@
 <template>
-   <div class="app-container">
+  <div class="app-container pageIndexClass">
+
+    <div style="background:#fff;padding:15px">
       <el-form :model="queryParams" ref="queryRef" :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;"
-               @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="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>
 
       <el-row :gutter="10" class="mb8">
-         <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">
-            <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-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">
+          <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>
 
-      <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" />
-            </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">
-            <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" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
-            <template #default="scope">
-               <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']">
-            <template #default="scope">
-               <span>{{ scope.row.costTime }}毫秒</span>
-            </template>
-         </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>
-            </template>
-         </el-table-column>
+      <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" />
+          </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">
+          <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" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
+          <template #default="scope">
+            <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']">
+          <template #default="scope">
+            <span>{{ scope.row.costTime }}毫秒</span>
+          </template>
+        </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>
+          </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" style="margin-bottom:30px;" :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>
-         <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="6">
-                  <el-form-item label="操作状态：">
-                     <div v-if="form.status === 0">正常</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="10">
-                  <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>
+    </div>
+    <!-- 操作日志详细 -->
+    <el-dialog title="操作日志详细" v-model="open" width="700px" 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="6">
+            <el-form-item label="操作状态：">
+              <div v-if="form.status === 0">正常</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="10">
+            <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";
 
 const { proxy } = getCurrentInstance();
-const { sys_oper_type, sys_common_status } = proxy.useDict("sys_oper_type","sys_common_status");
+const { sys_oper_type, sys_common_status } = proxy.useDict(
+  "sys_oper_type",
+  "sys_common_status"
+);
 
 const operlogList = ref([]);
 const open = ref(false);
@@ -214,8 +160,8 @@ const data = reactive({
     title: undefined,
     operName: undefined,
     businessType: undefined,
-    status: undefined
-  }
+    status: undefined,
+  },
 });
 
 const { queryParams, form } = toRefs(data);
@@ -223,11 +169,13 @@ 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;
-  });
+  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(
+    (response) => {
+      operlogList.value = response.rows;
+      total.value = response.total;
+      loading.value = false;
+    }
+  );
 }
 /** 操作日志类型字典翻译 */
 function typeFormat(row, column) {
@@ -243,11 +191,14 @@ function resetQuery() {
   dateRange.value = [];
   proxy.resetForm("queryRef");
   queryParams.value.pageNum = 1;
-  proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order);
+  proxy.$refs["operlogRef"].sort(
+    defaultSort.value.prop,
+    defaultSort.value.order
+  );
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.operId);
+  ids.value = selection.map((item) => item.operId);
   multiple.value = !selection.length;
 }
 /** 排序触发事件 */
@@ -264,27 +215,39 @@ function handleView(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(() => {});
+  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();

src/views/product/material/index.vue

@@ -102,19 +102,19 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item prop="length" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.length" placeholder="请输入长（cm）" style="width: 100%" :precision="2" :controls="false"
+                      <el-input-number v-model="formData.data.length" placeholder="长（cm）" style="width: 100%" :precision="2" :controls="false"
                                        :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="width" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.width" placeholder="请输入宽（cm）" style="width: 100%" :precision="2" :controls="false"
-                                       :min="0" onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.width" placeholder="宽（cm）" style="width: 100%" :precision="2" :controls="false" :min="0"
+                                       onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="height" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.height" placeholder="请输入高（cm）" style="width: 100%" :precision="2" :controls="false"
+                      <el-input-number v-model="formData.data.height" placeholder="高（cm）" style="width: 100%" :precision="2" :controls="false"
                                        :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>

src/views/systemTenant/tenant/userTenant/index.vue

@@ -60,10 +60,25 @@
                             :props="defaultProps" style="width:100%" @change="handleDeptIdChange" />
           </div>
         </template>
+
         <template #account>
-          <el-input style="width: 42%; margin-right: 10px" v-model="formData.data.userName" @change="changeUserName" placeholder="请输入用户名"></el-input>
-          <el-input style="width: 42%; margin-right: 10px" v-model="formData.data.password" @change="changePassword" placeholder="密码"></el-input>
-          <span style="color: #409eff; cursor: pointer" @click="newPassword">随机生成</span>
+          <el-row style="width:100%">
+            <el-col :span="10">
+              <el-form-item prop="userName" label="" label-width="0px" class="margin-b-0 wid100">
+                <el-input style="width: 100%; margin-right: 10px" v-model="formData.data.userName" @change="changeUserName"
+                          placeholder="请输入用户名"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item :prop="modalType=='add'?'password':''" label="" label-width="0px" class="margin-b-0 wid100">
+                <el-input style="width: 100%; margin-right: 10px" v-model="formData.data.password" @change="changePassword"
+                          placeholder="密码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <span style="color: #409eff; cursor: pointer" @click="newPassword">随机生成</span>
+            </el-col>
+          </el-row>
         </template>
 
         <template #purchaseScope>
@@ -533,6 +548,7 @@ const rules = ref({
   deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
   nickName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
   userName: [{ required: true, message: "请输入用户名", trigger: "blur" }],
+  password: [{ required: true, message: "请输入密码", trigger: "blur" }],
   roleIds: [{ required: true, message: "请选择角色", trigger: "change" }],
   phonenumber: [{ required: true, message: "请输入手机号", trigger: "blur" }],
   companySet: [