用户信息

src/api/management.js

@@ -1,5 +1,4 @@
 import axios from 'axios';
-import qs from 'qs';
 if (process.env.NODE_ENV === 'development') {
     axios.defaults.baseURL = '/';
 } else if (process.env.NODE_ENV === 'production') {
@@ -11,3 +10,15 @@ export const getZhanghData = params => {
         params
     });
 };
+//获取角色下拉
+export const getRoleApi = params => {
+    return axios.get('api/GetJues', {
+        params
+    });
+};
+//删除角色
+export const deleteRoleApi = params => {
+    return axios.get(`api/DeleteZhangh?UserId=${params}`, {
+        params
+    });
+};

src/api/myld.js

@@ -0,0 +1,12 @@
+import axios from 'axios';
+if (process.env.NODE_ENV === 'development') {
+    axios.defaults.baseURL = '/';
+} else if (process.env.NODE_ENV === 'production') {
+    axios.defaults.baseURL = '/';
+}
+//获取用户信息
+export const getUserApi = params => {
+    return axios.get('api/GetZhanghDetails', {
+        params
+    });
+};

src/config/apiurl.js

@@ -1,4 +1,4 @@
-var ipUurl = window.location.host.split(":")[0];
+var ipUurl = window.location.host.split(':')[0];
 export default {
     //   dataUrl: "http://172.16.1.22:8080/api/AddShipjk",
     //   getSpareElementOrder: "http://172.16.1.22:8080/api/Upload",
@@ -10,16 +10,19 @@ export default {
     //   //编辑保存组件弹窗传参
     //   editComponent: "http://172.16.1.22:8080/api/SetMonqjkzjcs",
 
+    dataUrl: 'http://172.16.1.168:5000/api/AddShipjk',
+    getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload',
+    postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz',
+    saveRoleApi: 'http://172.16.1.168:5000/api/AddZhangh',
+    editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh',
 
-dataUrl: "http://172.16.1.168:5000/api/AddShipjk",
-getSpareElementOrder: "http://172.16.1.168:5000/api/Upload",
-postSetQuanjsz: "http://172.16.1.168:5000/api/SetQuanjsz",
     //新增图形接口
-addFigure: "http://172.16.1.168:5000/api/AddJianktx", 
+    addFigure: 'http://172.16.1.168:5000/api/AddJianktx',
     //编辑图形名称
-editFigure: "http://172.16.1.168:5000/api/EditTuxmc",
+    editFigure: 'http://172.16.1.168:5000/api/EditTuxmc',
     //编辑保存组件弹窗传参
-editComponent: "http://172.16.1.168:5000/api/SetMonqjkzjcs", 
+    editComponent: 'http://172.16.1.168:5000/api/SetMonqjkzjcs'
+
     // `http://${ipUurl}:5000/api/AddShipjk`
     // dataUrl: `http://${ipUurl}:5000/api/AddShipjk`,
     // getSpareElementOrder: `http://${ipUurl}:5000/api/Upload`,

src/page/Login.vue

@@ -54,19 +54,18 @@ export default {
                 telephone: '13088888888',
                 typeCode: 2
             };
-            loginApi(datas).then((res) => {
+            loginApi(datas).then(res => {
                 console.log('c', res);
             });
         },
         submitForm() {
-            this.$refs.login.validate((valid) => {
+            this.$refs.login.validate(valid => {
                 if (valid) {
                     this.$message.success('登录成功');
                     localStorage.setItem('ms_username', this.param.username);
                     this.$router.push('/');
                 } else {
                     this.$message.error('请输入账号和密码');
-                    console.log('error submit!!');
                     return false;
                 }
             });
@@ -150,9 +149,7 @@ export default {
                     letter-spacing: 15px;
                     margin-left: 15px;
                 }
-            
             }
-          
         }
     }
 }

src/views/IdManagement.vue

@@ -2,10 +2,11 @@
     <div class="content-box">
         <div class="container">
             <p class="title">账号管理</p>
-            <el-button @click="addAccountDialog = true" type="primary" style="margin-bottom: 10px;"
+            <el-button @click="addBtn" type="primary" style="margin-bottom: 10px;"
                 ><i class="el-icon-circle-plus-outline" style="margin-right: 3px;"></i>新增</el-button
             >
             <el-table :data="tableData" :height="tableHeight" border style="width: 100%">
+                <el-table-column align="center" label="序号" type="index" width="80"></el-table-column>
                 <el-table-column align="center" prop="userName" label="用户名称" width="180"></el-table-column>
                 <el-table-column align="center" prop="account" label="用户账号" width="180"></el-table-column>
                 <el-table-column align="center" prop="roleName" label="角色"></el-table-column>
@@ -17,29 +18,44 @@
                 <el-table-column align="center" label="操作" width="160">
                     <template slot-scope="scope">
                         <el-button @click="edit(scope.row)" type="text" size="small" class="">编辑</el-button>
-                        <!-- <el-button @click="showView(scope.row)" type="text" size="small" class="el-icon-view"></el-button> -->
+                        <el-button style="color:red" @click="clickDelete(scope.row)" type="text" size="small">删除</el-button>
-                        <el-button @click="clickDelete(scope.row)" type="text" size="small">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
             <div class="dialog">
-                <el-dialog :title="dialogTitle" :visible.sync="addAccountDialog" width="30%">
+                <el-dialog :title="dialogTitle" :visible.sync="addAccountDialog" width="30%" @close="dialogClose">
-                    <el-form label-position="left" label-width="80px" :model="formLabelAlign">
+                    <el-form label-position="left" label-width="100px" :model="formLabelAlign">
                         <el-form-item label="名称：">
-                            <el-input v-model="formLabelAlign.name"></el-input>
+                            <el-input v-model="formLabelAlign.userName"></el-input>
                         </el-form-item>
                         <el-form-item label="账号：">
-                            <el-input v-model="formLabelAlign.account"></el-input>
+                            <el-input :disabled="dialogTitle == '编辑'" v-model="formLabelAlign.account"></el-input>
+                        </el-form-item>
+                        <el-form-item label="密码：">
+                            <el-input v-model="formLabelAlign.passWord"></el-input>
                         </el-form-item>
                         <el-form-item label="角色：">
-                            <el-input v-model="formLabelAlign.role"></el-input>
+                            <el-select
+                                :disabled="dialogTitle == '编辑' && formLabelAlign.userName == 'admin'"
+                                clearable
+                                style="width:100%;"
+                                v-model="formLabelAlign.roleId"
+                                placeholder="请选择"
+                            >
+                                <el-option v-for="item in options" :key="item.roleId" :label="item.roleName" :value="item.roleId">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
-                        <el-form-item label="权限：">
+                        <el-form-item label="是否启用：">
-                            <el-input v-model="formLabelAlign.jurisdiction"></el-input>
+                            <el-radio-group v-model="formLabelAlign.IsEnable">
+                                <el-radio :label="'1'">启用</el-radio>
+                                <el-radio :label="'0'">禁用</el-radio>
+                            </el-radio-group>
                         </el-form-item>
                     </el-form>
                     <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="addAccountDialog = false">确 定</el-button>
+                        <el-button type="primary" @click="saveBtn">确定</el-button>
+                        <el-button @click="addAccountDialog = false">取消</el-button>
                     </span>
                 </el-dialog>
             </div>
@@ -48,16 +64,20 @@
 </template>
 
 <script>
-import { getZhanghData } from '@/api/management';
+import axios from 'axios';
+import { getZhanghData, getRoleApi, deleteRoleApi } from '@/api/management';
+import serverUrl from '@/config/apiurl.js';
 export default {
     data() {
         return {
+            options: [],
             addAccountDialog: false,
             formLabelAlign: {
-                name: '',
+                userName: '',
                 account: '',
-                role: '',
+                roleId: '',
-                jurisdiction: ''
+                IsEnable: '1',
+                passWord: ''
             },
             tableData: [],
             tableHeight: 0,
@@ -72,26 +92,119 @@ export default {
         let windowHeight = document.documentElement.clientHeight || document.body.clientHeight;
         this.tableHeight = windowHeight - 280;
         this.getData();
+        //角色
+        this.getRoleList();
     },
     methods: {
-        getData() {
+        //点击新增按钮
-            getZhanghData().then(res => {
+        addBtn() {
-                console.log(res);
+            this.dialogTitle = '新增';
-                this.tableData = res.data.data;
+            this.addAccountDialog = true;
+        },
+        //弹框关闭
+        dialogClose() {
+            for (let i in this.formLabelAlign) {
+                if (i == 'IsEnable') {
+                    this.formLabelAlign[i] = '1';
+                } else {
+                    this.formLabelAlign[i] = '';
+                }
+            }
+        },
+        //点击确定
+        saveBtn() {
+            let formData = new FormData();
+            formData.append('userName', this.formLabelAlign.userName);
+            formData.append('account', this.formLabelAlign.account);
+            formData.append('roleId', this.formLabelAlign.roleId);
+            formData.append('IsEnable', this.formLabelAlign.IsEnable);
+            formData.append('passWord', this.formLabelAlign.passWord);
+            if (this.dialogTitle === '编辑') {
+                formData.append('userId', this.formLabelAlign.userId);
+            }
+
+            axios({
+                method: 'post',
+                url: this.dialogTitle === '新增' ? serverUrl.saveRoleApi : serverUrl.editRoleApi,
+                data: formData
+            }).then(res => {
+                if (res.data.code == 200) {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                    this.addAccountDialog = false;
+                    this.getData();
+                } else {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
             });
         },
-        edit(scope) {
+        //角色下拉
-            console.log(scope, '编辑');
+        getRoleList() {
+            var _this = this;
+            getRoleApi()
+                .then(res => {
+                    _this.options = res.data.data;
+                })
+                .catch(err => {
+                    _this.$message.error(err.msg);
+                });
+        },
+        //表格数据
+        getData() {
+            getZhanghData()
+                .then(res => {
+                    this.tableData = res.data.data;
+                })
+                .catch(err => {
+                    _this.$message.error(err.msg);
+                });
+        },
+        edit(row) {
+            this.formLabelAlign.roleId = row.roleId;
+            this.formLabelAlign.IsEnable = row.isEnable;
+            this.formLabelAlign.userName = row.userName;
+            this.formLabelAlign.account = row.account;
+            this.formLabelAlign.userId = row.userId;
             this.dialogTitle = '编辑';
             this.addAccountDialog = true;
         },
         showView(scope) {
-            console.log(scope, '查看');
             this.dialogTitle = '查看';
             this.addAccountDialog = true;
         },
-        clickDelete(scope) {
+        clickDelete(row) {
-            console.log(scope, '删除');
+            this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    deleteRoleApi(row.userId).then(res => {
+                        if (res.data.code == 200) {
+                            this.$message({
+                                type: 'success',
+                                message: '删除成功!'
+                            });
+                        } else {
+                            this.$message({
+                                type: 'error',
+                                message: res.data.msg
+                            });
+                        }
+                        this.getData();
+                    });
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
         },
         handleSizeChange(val) {
             console.log(`每页 ${val} 条`);

src/views/logs.vue

@@ -2,94 +2,209 @@
     <div class="content-box">
         <div class="container">
             <p class="title">通知/日志</p>
-    <!-- <div class="test-div">
+            <el-form ref="form" :model="formData" label-width="100px" style="display:flex">
-      <i class="el-icon-edit"></i>
+                <el-form-item label="日期：">
-      <i class="el-icon-share"></i>
+                    <el-date-picker
-      <i class="el-icon-delete"></i>
+                        value-format="yyyy-MM-dd HH:mm:ss"
-    </div> -->
+                        size="small"
+                        v-model="formData.value1"
+                        type="datetimerange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="内容：">
+                    <el-input size="small" v-model="formData.content"></el-input>
+                </el-form-item>
+                <el-form-item label="通知类型：">
+                    <el-select size="small" clearable style="width:100%;" v-model="formData.notificationType" placeholder="请选择">
+                        <el-option v-for="item in options" :key="item.name" :label="item.name" :value="item.name"> </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button @click="lookForMessage" type="primary" size="small">查询</el-button>
+                </el-form-item>
+            </el-form>
             <el-table :data="tableData" :height="tableHeight" border style="width: 100%">
-        <el-table-column align="center" prop="date" label="通知类型" width="180"></el-table-column>
+                <el-table-column align="center" prop="notificationType" label="通知类型" width="180"></el-table-column>
-        <el-table-column align="center" prop="name" label="产生时机" width="180"></el-table-column>
+                <el-table-column align="center" prop="journalTime" label="产生时机" width="180"></el-table-column>
-        <el-table-column align="center" prop="address" label="内容"></el-table-column>
+                <el-table-column show-overflow-tooltip align="center" prop="content" label="内容"></el-table-column>
                 <el-table-column align="center" label="操作" width="160">
                     <template slot-scope="scope">
-            <el-button @click="download(scope.row)" type="text" size="small" class="">下载</el-button>
+                        <el-button @click="showView(scope.row)" type="text" size="small">详情</el-button>
-            <el-button @click="showView(scope.row)" type="text" size="small" class="el-icon-view"></el-button>
+                        <el-button @click="clickDelete(scope.row)" style="color:red" type="text" size="small">删除</el-button>
-            <el-button @click="clickDelete(scope.row)" type="text" size="small" class="el-icon-delete"></el-button>
                     </template>
                 </el-table-column>
             </el-table>
 
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            <el-pagination
-        :current-page.sync="currentPage" :page-sizes="[100, 200, 300, 400]" :page-size="pageSize"
+                @size-change="handleSizeChange"
-        layout="sizes, prev, pager, next" :total="totalNumber" style="padding-top: 10px;">
+                @current-change="handleCurrentChange"
+                :current-page.sync="currentPage"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pageSize"
+                layout="sizes, total,prev, pager, next"
+                :total="totalNumber"
+                style="padding-top: 10px;"
+            >
             </el-pagination>
 
-
+            <el-dialog :title="concetData.notificationType" :visible.sync="dialogVisible" width="30%" @close="notificClosed">
-      <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+                <span>{{ concetData.content }}</span>
-        <span>这是一段信息</span>
-        <!-- <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span> -->
             </el-dialog>
         </div>
     </div>
 </template>
 
 <script>
+import { getTongzrzApi, deleteTongzrzApi, getTongzrzDetailsApi } from '@/api/logs';
+import moment from 'moment';
 export default {
     data() {
         return {
-      tableData: [
+            concetData: {
-        {
+                notificationType: '',
-          date: '2016-05-02',
+                content: ''
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄'
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄'
-        }, {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄'
             },
+            options: [
+                {
+                    name: '通知'
+                },
+                {
+                    name: '警告'
+                },
+                {
+                    name: '报警'
+                },
+                {
+                    name: '成功'
+                }
             ],
+            formData: {
+                value1: [],
+                content: '',
+                notificationType: ''
+            },
+            tableData: [],
             currentPage: 1,
-      pageSize: 100,
+            pageSize: 10,
-      totalNumber: 1000,
+            totalNumber: 0,
             tableHeight: 0,
             dialogVisible: false
-    }
+        };
     },
     created() {
         let windowHeight = document.documentElement.clientHeight || document.body.clientHeight;
-    this.tableHeight = windowHeight - 170;
+        this.tableHeight = windowHeight - 270;
+    },
+    mounted() {
+        this.setTimes();
+        this.getData();
     },
     methods: {
-    download(scope) {
+        setTimes() {
-      console.log(scope, '下载');
+            let arr = [];
+            //当前时间
+            let s = moment().format('YYYY-MM-DD HH:mm:ss'); //1，day就代表前一天
+            //两天前
+            let i = moment(s)
+                .subtract(2, 'days')
+                .format('YYYY-MM-DD HH:mm:ss');
+            arr = [s, i];
+            this.formData.value1 = arr;
+            this.$forceUpdate();
+        },
+        notificClosed() {
+            for (let i in this.concetData) {
+                this.concetData[i] = '';
+            }
+        },
+        clickDelete(row) {
+            this.$confirm('此操作将永久删除该日志, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    deleteTongzrzApi(row.journalId).then(res => {
+                        if (res.data.code == 200) {
+                            this.$message({
+                                type: 'success',
+                                message: '删除成功!'
+                            });
+                        } else {
+                            this.$message({
+                                type: 'error',
+                                message: res.data.msg
+                            });
+                        }
+                        this.getData();
+                    });
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+        },
+        //获取详情数
+        getTongzrzDetails(JournalId) {
+            getTongzrzDetailsApi(JournalId)
+                .then(res => {
+                    if (res.data.code === 200) {
+                        this.concetData = res.data.data;
+                        this.dialogVisible = true;
+                    } else {
+                        this.$message.error(res.data.msg);
+                    }
+                })
+                .catch(err => {
+                    this.$message.error(err.data.msg);
+                });
+        },
+        //点击查询按钮
+        lookForMessage() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        //表格数据
+        getData() {
+            getTongzrzApi({
+                Content: this.formData.content,
+                Type: this.formData.notificationType,
+                CurrentPage: this.currentPage,
+                PageSize: this.pageSize,
+                StartTime: this.formData.value1.length > 0 ? this.formData.value1[0] : '',
+                EndTime: this.formData.value1.length > 0 ? this.formData.value1[1] : ''
+            })
+                .then(res => {
+                    if (res.data.code === 200) {
+                        this.tableData = res.data.data.data;
+                        this.totalNumber = res.data.data.total;
+                    } else {
+                        this.$message.error(res.data.msg);
+                    }
+                })
+                .catch(err => {
+                    this.$message.error(err.data.msg);
+                });
         },
         showView(scope) {
-      console.log(scope, '查看');
+            this.getTongzrzDetails(scope.journalId);
-      this.dialogVisible = true;
-    },
-    clickDelete(scope) {
-      console.log(scope, '删除');
         },
         handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+            this.pageSize = val;
+            this.getData();
         },
         handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+            this.currentPage = val;
-    }
+            this.getData();
         }
     }
+};
 </script>
 
 <style>

src/views/myId.vue

@@ -2,11 +2,6 @@
     <div class="content-box">
         <div class="container">
             <p class="title">我的账号</p>
-    <!-- <div class="test-div">
-      <i class="el-icon-edit"></i>
-      <i class="el-icon-share"></i>
-      <i class="el-icon-delete"></i>
-    </div> -->
             <el-form label-position="left" label-width="60px" :model="formLabelAlign">
                 <el-form-item label="名称：">
                     {{ formLabelAlign.name }}
@@ -23,17 +18,27 @@
 </template>
 
 <script>
+import { getUserApi } from '@/api/myld.js';
+
 export default {
     data() {
         return {
             formLabelAlign: {
                 name: 'admin',
                 account: 'admin',
-        password: '123456',
+                password: '123456'
+            }
+        };
     },
+    methods: {
+        getUser() {
+            console.log(window.localStorage.getItem(''));
         }
+    },
+    mounted() {
+        this.getUser();
     }
-}
+};
 </script>
 
 <style>