更新

admin-ui/src/views/monitor/operlog/index.vue

@@ -2,15 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-form-item label="模块" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable @keyup.enter.native="handleQuery" class="se" />
+        <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="操作员" prop="operName">
-        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable @keyup.enter.native="handleQuery" class="se" />
-      </el-form-item>
-      <el-form-item label="类型" prop="businessType">
-        <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable class="se">
-          <el-option v-for="dict in dict.type.sys_oper_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
+      <el-form-item label="操作账号" prop="operName">
+        <el-input v-model="queryParams.operName" placeholder="请输入操作人员账号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="操作状态" clearable class="se">
@@ -18,15 +13,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="操作时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -41,19 +28,18 @@
       <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['monitor:operlog:export']">导出</el-button></el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table ref="tables" border :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange" height="calc(100vh - 328px)">
+    <el-table ref="tables" border :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange" height="calc(100vh - 270px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="系统模块" align="center" prop="title" />
-      <el-table-column label="操作类型" align="center" prop="businessType">
+      <el-table-column label="操作模块" align="left" prop="title" />
+      <el-table-column label="操作类型" align="center" prop="businessType" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType" />
         </template>
       </el-table-column>
-      <el-table-column label="请求方式" align="center" prop="requestMethod" />
-      <el-table-column label="操作人员" align="center" prop="operName" width="120" :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="operLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="操作状态" align="center" prop="status">
+      <el-table-column label="请求方式" align="center" prop="requestMethod" width="120" />
+      <el-table-column label="操作人员" align="center" prop="operName" width="150" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作IP" align="center" prop="operIp" width="150" :show-overflow-tooltip="true" />
+      <el-table-column label="操作状态" align="center" prop="status" width="110">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status" />
         </template>
@@ -63,7 +49,7 @@
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" >
+      <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">详细</el-button>
         </template>
@@ -73,7 +59,6 @@
       </template>
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
     <!-- 操作日志详细 -->
     <el-dialog title="操作日志详细" :visible.sync="open" :close-on-click-modal="false" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
@@ -157,7 +142,7 @@ export default {
   methods: {
     /** 查询登录日志 */
     getList() {
-      list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      list(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.list = response.rows;
         this.total = response.total;
       });
@@ -180,7 +165,7 @@ export default {
     },
     /** 多选框选中数据 */
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.operId);
+      this.ids = selection.map((item) => item.operId);
       this.multiple = !selection.length;
     },
     /** 排序触发事件 */
@@ -199,7 +184,7 @@ export default {
       const operIds = row.operId || this.ids;
       this.$modal
         .confirm('是否确认删除日志编号为"' + operIds + '"的数据项？')
-        .then(function() {
+        .then(function () {
           return delOperlog(operIds);
         })
         .then(() => {
@@ -212,7 +197,7 @@ export default {
     handleClean() {
       this.$modal
         .confirm('是否确认清空所有操作日志数据项？')
-        .then(function() {
+        .then(function () {
           return cleanOperlog();
         })
         .then(() => {

admin-ui/src/views/work/project/edit.vue

@@ -20,7 +20,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="项目周期" prop="sData">
+            <el-form-item label="项目周期" prop="startDate">
               <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :disabled="param.detail" style="width: 100% !important"></el-date-picker>
             </el-form-item>
           </el-col>

admin-ui/src/views/work/project/index.vue

@@ -5,7 +5,7 @@
         <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item label="项目编号" prop="num">
-        <el-input v-model="queryParams.num" placeholder="请输入项目编号" @keyup.enter.native="handleQuery" class="inp" clearable />
+        <el-input v-model="queryParams.num" placeholder="请输入项目编号" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item label="项目状态" prop="state">
         <el-select v-model="queryParams.state" placeholder="充值状态" clearable style="width: 117px">
@@ -153,7 +153,7 @@ export default {
       }
     },
     del(row) {
-      this.$confirm('是否确认删除选中数据?', '警告', { type: 'warning' }).then(() => {
+      this.$confirm('是否确认删除选中项目? 会影响已经接包用户！', '警告', { type: 'warning' }).then(() => {
         this.get({ url: '/work/project/remove/' + (row.id || this.ids) }).then((response) => {
           this.$modal.msgSuccess('删除成功');
           this.getList();