Selaa lähdekoodia

标题、logo修改

chuwuya 2 vuotta sitten
vanhempi
commit
19c1fc548a

+ 11 - 0
package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "axios": "^1.3.4",
         "core-js": "^3.8.3",
+        "dayjs": "^1.11.7",
         "element-ui": "^2.15.13",
         "js-cookie": "^3.0.1",
         "vue": "^2.7.14",
@@ -4608,6 +4609,11 @@
       "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.1.tgz",
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
+    "node_modules/dayjs": {
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
+      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
+    },
     "node_modules/de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
@@ -15557,6 +15563,11 @@
       "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.1.tgz",
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
+    "dayjs": {
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
+      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",

+ 2 - 2
package.json

@@ -9,6 +9,7 @@
   "dependencies": {
     "axios": "^1.3.4",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.7",
     "element-ui": "^2.15.13",
     "js-cookie": "^3.0.1",
     "vue": "^2.7.14",
@@ -21,10 +22,9 @@
     "@vue/cli-plugin-vuex": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "babel-plugin-component": "^1.1.1",
-
+    "less-loader": "^11.1.0",
     "sass": "^1.32.7",
     "sass-loader": "^12.0.0",
-    "less-loader": "^11.1.0",
     "svg-sprite-loader": "^6.0.11",
     "vue-template-compiler": "^2.6.14"
   }

BIN
public/favicon.ico


+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>智慧运营管理平台</title>
     <!-- <script type="module" src="/src/plugins/gverify.js"></script> -->
   </head>
   <body>

+ 16 - 16
src/api/security/logMonitor.js

@@ -2,27 +2,27 @@ import { get, post } from "@/utils/requestMethod";
 
 /**
  * 获取日志列表
- * @param {*} page 
- * @param {*} page_size 
- * @param {*} name 
- * @param {*} module 
- * @param {*} operation_type 
- * @param {*} operation_status 
- * @returns 
+ * @param {*} page
+ * @param {*} page_size
+ * @param {*} name
+ * @param {*} module
+ * @param {*} operation_type
+ * @param {*} operation_status
+ * @returns
  */
 const getLogList = (
   page,
-  page_size=10,
-  name="",
-  module_name="",
-  operation_type="",
-  operation_status=""
+  page_size = 10,
+  name = "",
+  module_name = "",
+  operation_type = "",
+  operation_status = "",
+  start_time = "",
+  end_time = ""
 ) => {
   return get(
-    `/log/log_list?page=${page}&page_size=${page_size}&name=${name}&module=${module_name}&operation_type=${operation_type}&operation_status=${operation_status}`
+    `/log/log_list?page=${page}&page_size=${page_size}&name=${name}&module=${module_name}&operation_type=${operation_type}&operation_status=${operation_status}&start_time=${start_time}&end_time=${end_time}`
   );
 };
 
-export{
-    getLogList 
-}
+export { getLogList };

+ 4 - 2
src/api/user/user.js

@@ -2,18 +2,20 @@ import { get, post, put, del } from "@/utils/requestMethod";
 
 /**
  * 获取用户列表
- * @param {*} status
+ * @param {*} status 账户状态0为正常,1为禁用
  * @param {*} page
  * @param {*} page_size
+ * @name 对user_name进行模糊查询
  * @returns
  */
 const getUserList = (
     status,
     page,
     page_size = 20,
+    name=""
 ) => {
     return get(
-        `/users/user_list?status=${status}&page=${page}&page_size=${page_size}`
+        `/users/user_list?status=${status}&page=${page}&page_size=${page_size}&name=${name}`
     );
 }
 //添加用户

BIN
src/assets/images/logo.png


+ 4 - 2
src/layout/Navbar.vue

@@ -2,8 +2,7 @@
   <div>
     <div v-show="isLogin" class="left-menu">
         <hamburger class="hamburger-container" :is-active="opened" @toggleClick="toggleSideBar" />
-      <div>
-      </div>
+        <!-- <el-image class="logo" :src="require('@/assets/images/logo.png')"></el-image> -->
       <div class="title">
         <p style="margin-top:15px">智慧运营管理中心</p>
       </div>
@@ -88,6 +87,9 @@ export default {
       background: #266999;
     }
   }
+  .logo{
+
+  }
 
   .title {
     position: absolute;

+ 3 - 0
src/main.js

@@ -9,6 +9,8 @@ Vue.config.productionTip = false;
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
 import locale from "element-ui/lib/locale/lang/zh-CN";
+// 引入dayjs库
+import dayjs from "dayjs";
 Vue.use(ElementUI, { locale });
 
 //拖拽注册
@@ -16,6 +18,7 @@ import "./utils/directive";
 
 Vue.use(ElementUI, { locale });
 Vue.prototype.axios = axios;
+Vue.prototype.$dayjs=dayjs
 
 new Vue({
   router,

+ 14 - 2
src/views/securityManagement/logMonitor.vue

@@ -51,7 +51,8 @@
               type="datetimerange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              :default-time="['12:00:00']"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00']"
             >
             </el-date-picker>
           </el-form-item>
@@ -245,13 +246,24 @@ export default {
     },
     getTableData(page) {
       this.tableData = [];
+      let startTime =""
+      let endTime = ""
+      if(this.form.timeVal===""){
+        startTime=""
+        endTime=""
+      }else if(this.form.timeVal.length>0){
+        startTime = this.form.timeVal[0]
+        endTime=this.form.timeVal[1]
+      }
       getLogList(
         page,
         this.currentPageSize,
         this.form.nameInput,
         this.form.moduleName,
         this.form.operationType,
-        this.form.operationStatus
+        this.form.operationStatus,
+        startTime,
+        endTime
       ).then((res) => {
         if (res.data.code === 0 && res.data.data.length > 0) {
           this.paginationData.total = res.data.total

+ 1 - 3
src/views/systemManagement/indexConfiguration/smartBoard.vue

@@ -33,9 +33,7 @@
             </el-table>
         </div>
         <div class="bottom">
-            <div class="bottom_button" v-show="show">
-                <el-button class="delete" type="text">批量删除</el-button>
-            </div>
+    
             <page class="page" :paginationData="paginationData"></page>
         </div>
     </div>

+ 43 - 55
src/views/userManagement/personManagement/tables/activeUser.vue

@@ -6,26 +6,19 @@
             <el-button class="delete" @click="batchDelete">批量删除</el-button>
         </div>
         <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" :header-cell-style="{ textAlign: 'center' }"
-            :cell-style="{ textAlign: 'center' }" height="405" style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50">
-            </el-table-column>
-            <el-table-column prop="username" label="用户名">
-            </el-table-column>
-            <el-table-column prop="phone_num" label="手机号">
-            </el-table-column>
-            <el-table-column prop="email" label="邮箱">
-            </el-table-column>
-            <el-table-column prop="role" label="角色">
-            </el-table-column>
-            <el-table-column prop="permission" label="权限">
-            </el-table-column>
-            <el-table-column prop="working_address" label="单位">
-            </el-table-column>
-            <el-table-column prop="register_time" label="注册时间">
-            </el-table-column>
+            :cell-style="{ textAlign: 'center' }" height="405" style="width: 100%"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="50"> </el-table-column>
+            <el-table-column prop="username" label="用户名"> </el-table-column>
+            <el-table-column prop="phone" label="手机号"> </el-table-column>
+            <el-table-column prop="email" label="邮箱"> </el-table-column>
+            <el-table-column prop="role" label="角色"> </el-table-column>
+            <el-table-column prop="permission" label="权限"> </el-table-column>
+            <el-table-column prop="working_address" label="单位"> </el-table-column>
+            <el-table-column prop="register_time" label="注册时间"> </el-table-column>
             <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                    <el-tag :color="scope.row.status == true ? '#06f77e' : '#757776'"></el-tag>
+                    <el-tag :color="scope.row.status !== null || undefined ? '#06f77e' : '#757776'"></el-tag>
                 </template>
             </el-table-column>
             <el-table-column prop="operation" label="操作">
@@ -64,7 +57,7 @@ export default {
                 pagerCount: 5,
                 currentPage: 1,
                 pageSizes: [5, 10, 20, 30],
-                total: 0,
+                total: 30,
                 currentChange: (val) => {
                     this.getTableData(val);
                 },
@@ -72,7 +65,7 @@ export default {
                     this.handleSizeChange(val);
                 },
             },
-        }
+        };
     },
     mounted() {
         this.initData();
@@ -89,27 +82,32 @@ export default {
         },
         getTableData(page) {
             this.tableData = [];
-            getUserList(
-                0,
-                page,
-                this.currentPageSize
-            ).then((res) => {
+            getUserList(0, page, this.currentPageSize).then((res) => {
                 if (res.data.code === 0 && res.data.data.length > 0) {
                     this.paginationData.total = res.data.total;
                     this.tableData = res.data.data.map((e) => {
                         return {
                             username: e.name,
-                            phone: e.phone,
-                            email: e.email,
-                            role: e.role,
-                            permission: e.permission,
-                            working_address: e.company,
-                            register_time: e.register_time,
-                            status: e.on_job_status
-                        }
-                    })
+                            phone: e.phone == "undefined" || !e.phone ? "--" : e.phone,
+                            email: e.email == "undefined" || !e.email ? "--" : e.email,
+                            role: e.role == "undefined" || !e.role ? "--" : e.role,
+                            permission:
+                                e.permission == "undefined" || !e.permission
+                                    ? e.permission
+                                    : "--",
+                            working_address:
+                                e.company == "undefined" || !e.company ? "--" : e.company,
+                            register_time: this.$dayjs(e.register_time).format(
+                                "YYYY-MM-DD HH:mm:ss"
+                            ),
+                            status:
+                                e.on_job_status == "undefined" || !e.on_job_status
+                                    ? "--"
+                                    : e.on_job_status,
+                        };
+                    });
                 }
-            })
+            });
         },
         handleSizeChange(val) {
             this.currentPageSize = val;
@@ -125,38 +123,28 @@ export default {
             let options = {
                 id: data.id,
                 username: data.username,
-                password: data.password
+                password: data.password,
             };
             deleteSingleUser(options).then((res) => {
                 if (res.data.code === 0) {
-                    this.$message.success('删除成功');
+                    this.$message.success("删除成功");
                     this.getTableData(1);
                 }
-            })
-        },
-        userDetail(data) {
-
+            });
         },
+        userDetail(data) { },
         userInfoEdit(data) {
             let options = {
                 id: data.id,
-
             };
-            updateUserDetail(options).then((res) => {
-
-            })
-        },
-        batchActivate() {
-
-        },
-        batchDelete() {
-
+            updateUserDetail(options).then((res) => { });
         },
-        exportData() {
-
-        }
-    }
+        batchActivate() { },
+        batchDelete() { },
+        exportData() { },
+    },
 }
+
 </script>
 <style lang="less" scoped>
 .el-tag {

+ 23 - 16
src/views/userManagement/personManagement/tables/deactiveUser.vue

@@ -5,10 +5,8 @@
             <el-button class="disabled" @click="batchDisabled">批量禁用</el-button>
             <el-button class="delete" @click="batchDelete">批量删除</el-button>
         </div>
-        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark"
-            :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }" 
-            height="405"
-            style="width: 100%"
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" :header-cell-style="{ textAlign: 'center' }"
+            :cell-style="{ textAlign: 'center' }" height="405" style="width: 100%"
             @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50">
             </el-table-column>
@@ -53,7 +51,7 @@ export default {
     components: { page },
     data() {
         return {
-            tableData:[],
+            tableData: [],
             multipleSelection: [],
             currentPageSize: 10,
             currentPage: 1,
@@ -97,13 +95,22 @@ export default {
                     this.tableData = res.data.data.map((e) => {
                         return {
                             username: e.name,
-                            phone:e.phone,
-                            email:e.email,
-                            role:e.role,
-                            permission:e.permission,
-                            working_address:e.company,
-                            register_time:e.register_time,
-                            status:e.on_job_status
+                            phone: e.phone == "undefined" || !e.phone ? "--" : e.phone,
+                            email: e.email == "undefined" || !e.email ? "--" : e.email,
+                            role: e.role == "undefined" || !e.role ? "--" : e.role,
+                            permission:
+                                e.permission == "undefined" || !e.permission
+                                    ? e.permission
+                                    : "--",
+                            working_address:
+                                e.company == "undefined" || !e.company ? "--" : e.company,
+                            register_time: this.$dayjs(e.register_time).format(
+                                "YYYY-MM-DD HH:mm:ss"
+                            ),
+                            status:
+                                e.on_job_status == "undefined" || !e.on_job_status
+                                    ? "--"
+                                    : e.on_job_status,
                         }
                     })
                 }
@@ -114,14 +121,14 @@ export default {
             this.currentPageSize = val;
             this.getTableData(this.currentPage);
         },
-        exportData(){
+        exportData() {
 
         },
-        batchDelete(){
+        batchDelete() {
 
         },
-        batchDisabled(){
-            
+        batchDisabled() {
+
         }
     }
 }