Merge commit 'edcfa09c2e7cc1af3b4ff104bba2b44a5107f571' into gzb

src/api/index.js

     method: "post",
     data
   });
+// 登录日志
+export const list_log = (data) =>
+  request({
+    url: window._config.baseUrl + "log/list_log",
+    method: "post",
+    data
+  });

src/views/history/index.vue

           type="year"
           placeholder="请选择年份"
           v-model="historySearch.dhyear"
+          @on-change="searchList()"
           style="margin-right: 16px; width: 200px"
           :clearable="false"
         />
       ></Page>
     </div>
     <Modal
-      v-model="userAddForm.show"
+      v-model="historyAddForm.show"
       class="modal1"
       :mask-closable="false"
-      title="添加用户信息"
+      title="添加发展历程"
     >
       <Form
         :label-width="90"
         label-position="right"
-        ref="userAddForm"
+        ref="historyAddForm"
         :rules="addFormRules"
-        :model="userAddForm"
+        :model="historyAddForm"
       >
-        <FormItem label="用户姓名" prop="username">
-          <Input v-model="userAddForm.username" placeholder="请输入用户姓名" />
+        <FormItem label="语言" prop="date">
+          <RadioGroup v-model="historyAddForm.ltype">
+            <Radio :label="1">中文</Radio>
+            <Radio :label="2">英文</Radio>
+          </RadioGroup>
         </FormItem>
-        <FormItem label="登录账号" prop="loginname">
-          <Input v-model="userAddForm.loginname" placeholder="请输入登录账号" />
-        </FormItem>
-        <FormItem label="登录密码" prop="loginpwd">
-          <Input v-model="userAddForm.loginpwd" placeholder="请输入登录密码" />
+        <FormItem label="日期" prop="date">
+          <DatePicker
+            type="month"
+            placeholder="请选择日期"
+            v-model="historyAddForm.date"
+            style="margin-right: 16px; width: 200px"
+            :clearable="false"
+          />
         </FormItem>
-        <FormItem label="手机号" prop="userphone">
-          <Input v-model="userAddForm.userphone" placeholder="请输入手机号" />
+        <FormItem label="内容" prop="content">
+          <Input
+            v-model="historyAddForm.content"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入内容"
+          />
         </FormItem>
       </Form>
       <div slot="footer" style="text-align: right">
-        <Button @click="userAddForm.show = false">取消</Button>
+        <Button @click="historyAddForm.show = false">取消</Button>
         <Button @click="toSaveAdd()" type="primary">保存</Button>
       </div>
     </Modal>
     <Modal
-      v-model="userModifyForm.show"
+      v-model="historyModifyForm.show"
       class="modal1"
       :mask-closable="false"
-      title="修改用户信息"
+      title="修改发展历程"
     >
       <Form
         :label-width="90"
         label-position="right"
-        ref="userModifyForm"
+        ref="historyModifyForm"
         :rules="modifyFormRules"
-        :model="userModifyForm"
+        :model="historyModifyForm"
       >
-        <FormItem label="用户姓名" prop="username">
-          <Input
-            v-model="userModifyForm.username"
-            placeholder="请输入用户姓名"
-          />
-        </FormItem>
-        <FormItem label="登录账号" prop="loginname">
-          <Input
-            v-model="userModifyForm.loginname"
-            placeholder="请输入登录账号"
-          />
+        <FormItem label="语言" prop="date">
+          <RadioGroup v-model="historyModifyForm.ltype">
+            <Radio :label="1">中文</Radio>
+            <Radio :label="2">英文</Radio>
+          </RadioGroup>
         </FormItem>
-        <FormItem label="登录密码" prop="loginpwd">
-          <Input
-            v-model="userModifyForm.loginpwd"
-            placeholder="请输入登录密码"
+        <FormItem label="日期" prop="date">
+          <DatePicker
+            type="month"
+            placeholder="请选择日期"
+            v-model="historyModifyForm.date"
+            style="margin-right: 16px; width: 200px"
+            :clearable="false"
           />
         </FormItem>
-        <FormItem label="手机号" prop="userphone">
+        <FormItem label="内容" prop="content">
           <Input
-            v-model="userModifyForm.userphone"
-            placeholder="请输入手机号"
+            v-model="historyModifyForm.content"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入内容"
           />
         </FormItem>
       </Form>
       <div slot="footer" style="text-align: right">
-        <Button @click="userModifyForm.show = false">取消</Button>
-        <Button @click="toSaveModifyUser()" type="primary">保存</Button>
+        <Button @click="historyModifyForm.show = false">取消</Button>
+        <Button @click="toSaveModifyHistory()" type="primary">保存</Button>
       </div>
     </Modal>
   </div>
 import { dateFormat } from "@/utils";
 export default {
   data() {
-    // 手机号验证
-    const phoneCheck = async (rule, value, callback) => {
-      var filter = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-      if (!value) {
-        return;
-      }
-      let blnTest = filter.test(value);
-      if (!blnTest) {
-        return callback(new Error("手机号码格式不正确"));
-      }
-    };
     return {
       dateFormat,
       historySearch: {
           width: 90
         },
         {
-          title: "状态",
+          title: "语言",
           slot: "ltypeSlot",
           width: 90
         },
           width: 150
         }
       ],
-      userAddForm: {
+      historyAddForm: {
         show: false,
-        username: "",
-        loginname: "",
-        loginpwd: "",
-        userphone: null
+        date: new Date(),
+        content: "",
+        ltype: 1
       },
       addFormRules: {
-        username: [
+        content: [
           {
             required: true,
-            message: "用户姓名不能为空",
+            message: "内容不能为空",
             trigger: "blur"
           }
-        ],
-        loginname: [
-          {
-            required: true,
-            message: "登录账号不能为空",
-            trigger: "blur"
-          },
-          {
-            min: 4,
-            max: 18,
-            message: "登录账号长度为4~18个字符",
-            trigger: "blur"
-          }
-        ],
-        loginpwd: [
-          {
-            required: true,
-            message: "登录密码不能为空",
-            trigger: "blur"
-          },
-          {
-            min: 6,
-            max: 16,
-            message: "登录密码长度为6~16个字符",
-            trigger: "blur"
-          }
-        ],
-        userphone: [{ validator: phoneCheck, trigger: "blur" }]
+        ]
       },
-      userModifyForm: {
+      historyModifyForm: {
         show: false,
-        dhid: null,
-        username: "",
-        loginname: "",
-        loginpwd: "",
-        userphone: null
+        date: null,
+        content: ""
       },
       modifyFormRules: {
-        username: [
+        content: [
           {
             required: true,
-            message: "用户姓名不能为空",
-            trigger: "blur"
-          }
-        ],
-        loginname: [
-          {
-            required: true,
-            message: "登录账号不能为空",
-            trigger: "blur"
-          },
-          {
-            min: 4,
-            max: 18,
-            message: "登录账号长度为4~18个字符"
-          }
-        ],
-        loginpwd: [
-          // {
-          //   required: true,
-          //   message: "登录密码不能为空",
-          //   trigger: "blur",
-          // },
-          {
-            min: 6,
-            max: 16,
-            message: "登录密码长度为6~16个字符",
+            message: "内容不能为空",
             trigger: "blur"
           }
-        ],
-        userphone: [{ validator: phoneCheck, trigger: "blur" }]
+        ]
       },
       userInfo: {}
     };
       });
     },
     toAdd() {
-      this.userAddForm = {
+      this.historyAddForm = {
         show: true,
-        username: "",
-        loginname: "",
-        loginpwd: "",
-        userphone: null
+        date: new Date(),
+        content: "",
+        ltype: 1
       };
     },
     toSaveAdd() {
-      this.$refs.userAddForm.validate((valid) => {
+      this.$refs.historyAddForm.validate((valid) => {
         if (valid) {
           dh_save({
-            username: this.userAddForm.username,
-            loginname: this.userAddForm.loginname,
-            loginpwd: this.userAddForm.loginpwd,
-            createid: this.userInfo.dhid,
-            userphone: this.userAddForm.userphone
+            dhyear: this.historyAddForm.date.getFullYear(),
+            dhmonth: this.historyAddForm.date.getMonth() + 1 + "月",
+            content: this.historyAddForm.content,
+            ltype: this.historyAddForm.ltype,
+            createid: this.userInfo.userid
           }).then((data) => {
             if (data.code === 0) {
-              this.userAddForm.show = false;
+              this.historyAddForm.show = false;
               this.$Message.success(data.msg);
               this.searchList();
             } else {
       });
     },
     toModifyHistory(user) {
-      this.userModifyForm = {
+      let _date = new Date();
+      _date.setFullYear(user.dhyear);
+      _date.setMonth(parseInt(user.dhmonth) - 1);
+      this.historyModifyForm = {
         show: true,
         dhid: user.dhid,
-        username: user.username,
-        loginname: user.loginname,
-        loginpwd: user.loginpwd,
-        userphone: user.userphone
+        content: user.content,
+        date: _date
       };
     },
-    toSaveModifyUser() {
-      this.$refs.userModifyForm.validate((valid) => {
+    toSaveModifyHistory() {
+      this.$refs.historyModifyForm.validate((valid) => {
         if (valid) {
           dh_update({
-            username: this.userModifyForm.username,
-            loginname: this.userModifyForm.loginname,
-            loginpwd: this.userModifyForm.loginpwd,
-            createid: this.userInfo.dhid,
-            userphone: this.userModifyForm.userphone,
-            dhid: this.userModifyForm.dhid
+            dhyear: this.historyModifyForm.date.getFullYear(),
+            dhmonth: this.historyModifyForm.date.getMonth() + 1 + "月",
+            content: this.historyModifyForm.content,
+            dhid: this.historyModifyForm.dhid
           }).then((data) => {
             if (data.code === 0) {
-              this.userModifyForm.show = false;
+              this.historyModifyForm.show = false;
               this.$Message.success(data.msg);
               this.searchList();
             } else {

src/views/layout.vue

         >
       </div>
     </div>
-    <div class="layout_main">
-      <router-view></router-view>
+    <div class="layout_out">
+      <div class="layout_main">
+        <router-view></router-view>
+      </div>
     </div>
   </div>
 </template>
 .header_html_root .header_html_item.router-link-active {
   border-bottom: 4px solid #2d8cf0;
 }
+.layout_out {
+  max-height: calc(100vh - 54px);
+  overflow: auto;
+}
 .layout_main {
   margin: 0 auto;
   width: 1200px;

src/views/log/index.vue

 <template>
-  <div>user</div>
+  <div>
+    <div class="searchBox">
+      <div>
+        <RadioGroup v-model="logSearch.userstate" @on-change="searchList()">
+          <Radio :label="0">全部</Radio>
+          <Radio :label="1">正常</Radio>
+          <Radio :label="10">已删除</Radio>
+        </RadioGroup>
+        <Input
+          v-model="logSearch.username"
+          @on-enter="searchList()"
+          placeholder="请输入用户姓名"
+          style="margin: 0 16px; width: 200px"
+          clearable
+        />
+        <Button type="primary" @click="searchList()">搜索</Button>
+      </div>
+    </div>
+    <Table border :columns="logColumns" :data="logSearch.list">
+      <template slot-scope="{ row }" slot="loginstateSlot">
+        <span>{{ row.loginstate === 1 ? "成功" : "失败" }}</span>
+      </template>
+      <template slot-scope="{ row }" slot="logtimeSlot">
+        <span>{{ dateFormat(row.logtime) }}</span>
+      </template>
+    </Table>
+    <div class="foot_page" v-if="logSearch.total > 0">
+      <Page
+        :total="logSearch.total"
+        @on-change="changePage"
+        :current="logSearch.page"
+        show-total
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { list_log } from "@/api";
+import { dateFormat } from "@/utils";
 export default {
   data() {
-    return {};
+    return {
+      dateFormat,
+      logSearch: {
+        loginname: "",
+        logtime: null,
+        endtime: null,
+        page: 1,
+        size: 10,
+        total: 0,
+        list: []
+      },
+      logColumns: [
+        {
+          title: "序号",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index + (this.logSearch.page - 1) * this.logSearch.size + 1
+            );
+          }
+        },
+        {
+          title: "用户姓名",
+          key: "username",
+          width: 100
+        },
+        {
+          title: "登录账号",
+          key: "loginname",
+          width: 140
+        },
+        {
+          title: "登录状态",
+          slot: "loginstateSlot",
+          width: 100
+        },
+        {
+          title: "登录地址",
+          key: "logaddress"
+        },
+        {
+          title: "登录IP",
+          key: "logip",
+          width: 140
+        },
+        {
+          title: "登录时间",
+          slot: "logtimeSlot",
+          width: 200
+        },
+        {
+          title: "备注",
+          key: "logtxt"
+        }
+      ],
+      userInfo: {}
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(localStorage.getItem("xhWebAdminUser"));
+    this.getLogList();
+  },
+  methods: {
+    searchList() {
+      this.logSearch.page = 1;
+      this.getLogList();
+    },
+    getLogList() {
+      list_log({
+        page: this.logSearch.page,
+        size: this.logSearch.size,
+        userstate: this.logSearch.userstate,
+        username: this.logSearch.username
+      })
+        .then((data) => {
+          if (data.code === 0) {
+            this.logSearch.total = data.obj.total;
+            this.logSearch.list = data.obj.list;
+          } else {
+            this.logSearch.total = 0;
+            this.logSearch.list = [];
+            this.$Message.error(data.msg);
+          }
+        })
+        .catch(() => {});
+    },
+    changePage(page) {
+      this.logSearch.page = page;
+      this.getLogList();
+    }
+  }
 };
 </script>
 
-<style scoped lang="less"></style>
+<style scoped lang="less">
+.searchBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 16px 0;
+}
+.foot_page {
+  padding: 16px 0;
+  text-align: right;
+}
+</style>

src/views/users/index.vue

         userstate: 0,
         username: "",
         total: 0,
-        list: [],
+        list: []
       },
       userColumns: [
         {
                 (this.userSearch.page - 1) * this.userSearch.size +
                 1
             );
-          },
+          }
         },
         {
           title: "用户姓名",
-          key: "username",
+          key: "username"
         },
         {
           title: "登录账号",
-          key: "loginname",
+          key: "loginname"
         },
         {
           title: "手机号",
-          key: "userphone",
+          key: "userphone"
         },
         {
           title: "状态",
           slot: "userstateSlot",
-          width: 90,
+          width: 90
         },
         {
           title: "创建人",
           key: "createname",
-          width: 120,
+          width: 120
         },
         {
           title: "创建时间",
           slot: "createtimeSlot",
-          width: 200,
+          width: 200
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 150,
-        },
+          width: 150
+        }
       ],
       userAddForm: {
         show: false,
         username: "",
         loginname: "",
         loginpwd: "",
-        userphone: null,
+        userphone: null
       },
       addFormRules: {
         username: [
           {
             required: true,
             message: "用户姓名不能为空",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         loginname: [
           {
             required: true,
             message: "登录账号不能为空",
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             min: 4,
             max: 18,
             message: "登录账号长度为4~18个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         loginpwd: [
           {
             required: true,
             message: "登录密码不能为空",
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             min: 6,
             max: 16,
             message: "登录密码长度为6~16个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
-        userphone: [{ validator: phoneCheck, trigger: "blur" }],
+        userphone: [{ validator: phoneCheck, trigger: "blur" }]
       },
       userModifyForm: {
         show: false,
         username: "",
         loginname: "",
         loginpwd: "",
-        userphone: null,
+        userphone: null
       },
       modifyFormRules: {
         username: [
           {
             required: true,
             message: "用户姓名不能为空",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         loginname: [
           {
             required: true,
             message: "登录账号不能为空",
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             min: 4,
             max: 18,
-            message: "登录账号长度为4~18个字符",
-          },
+            message: "登录账号长度为4~18个字符"
+          }
         ],
         loginpwd: [
           // {
             min: 6,
             max: 16,
             message: "登录密码长度为6~16个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
-        userphone: [{ validator: phoneCheck, trigger: "blur" }],
+        userphone: [{ validator: phoneCheck, trigger: "blur" }]
       },
-      userInfo: {},
+      userInfo: {}
     };
   },
   created() {
         page: this.userSearch.page,
         size: this.userSearch.size,
         userstate: this.userSearch.userstate,
-        username: this.userSearch.username,
+        username: this.userSearch.username
       })
         .then((data) => {
           if (data.code === 0) {
             }
           });
         },
-        onCancel: () => {},
+        onCancel: () => {}
       });
     },
     toAdd() {
         username: "",
         loginname: "",
         loginpwd: "",
-        userphone: null,
+        userphone: null
       };
     },
     toSaveAdd() {
             loginname: this.userAddForm.loginname,
             loginpwd: this.userAddForm.loginpwd,
             createid: this.userInfo.userid,
-            userphone: this.userAddForm.userphone,
+            userphone: this.userAddForm.userphone
           }).then((data) => {
             if (data.code === 0) {
               this.userAddForm.show = false;
         username: user.username,
         loginname: user.loginname,
         loginpwd: user.loginpwd,
-        userphone: user.userphone,
+        userphone: user.userphone
       };
     },
     toSaveModifyUser() {
     changePage(page) {
       this.userSearch.page = page;
       this.getUsersList();
-    },
-  },
+    }
+  }
 };
 </script>