system-clients 3.2.93-temp → 3.2.93-ys

package/src/components/Main.vue

@@ -160,24 +160,6 @@
       </footer>
     </modal>
 
-    <modal v-show="notReportShow" :show.sync="notReportShow" :backdrop="false">
-      <header slot="modal-header" class="text-center">
-        <h3>未上报用户提醒</h3>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <form class="form-horizontal">
-          <div class="row">
-            <div class="col-sm-12">
-              <span style="font-weight:normal">{{ notReportTitle }}</span>
-            </div>
-          </div>
-        </form>
-      </article>
-      <footer slot="modal-footer" style="height: 8vh" class="modal-footer">
-        <button class="button_search" @click="notReportShow = false">确认</button>
-      </footer>
-    </modal>
-
     <!-- 变更录入 模态框 -->
     <add-changemsg :show="AddChangeMsgShow" v-on:toggle="AddChangeMsgShow = false"></add-changemsg>
     <!-- 修改密码组件 -->
@@ -273,8 +255,6 @@ let createWaterMark = function (userName) {
           // img2: '/images/lefticon/退出系统.png',
         },
         treeOrIcon: false,
-        notReportTitle: '',
-        notReportShow: false,
         qrCode:false,
         isManger: false,
         show: false,
@@ -355,28 +335,10 @@ let createWaterMark = function (userName) {
       if (this.config.approve) {
         this.getFlowList()
       }
-      if (this.config.isGetNotReport) {
-        this.getNotReport()
-      }
       // 获取卡表动态库到期时间
       this.getExpireDate()
     },
     methods: {
-      async getNotReport(){
-        this.notReportTitle = ''
-        let http = new HttpResetClass()
-        await http.load('POST', 'rs/sql/getNotReportUserCount', {}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          if (res.data.length > 0){
-            this.notReportTitle = `当前系统物联网表用户有${res.data[0].f_total_web_count}户，超过7天未上报有${res.data[0].f_greater_than_seven_days}户，7天及以内未上报有${res.data[0].f_less_than_orequalto_seven_days}户。如需查询详情，请到物联查询中“失联查询”获取详细信息！`
-          }
-        }).catch((e)=>{})
-        if(this.notReportTitle){
-          this.notReportShow = true
-        }
-      },
       getOrderList(){
         let times = this.config.times * 60 * 1000
         console.log("=定时提示间隔=", times)
@@ -559,7 +521,7 @@ let createWaterMark = function (userName) {
         }
       },
       openUrl() {
-        var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+        var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
         window.open(url, '_blank')
       },
       hindsetting() {
@@ -633,10 +595,20 @@ let createWaterMark = function (userName) {
       console.log(this.$login.f)
       this.$showMessage('您确定要退出系统吗？', ['confirm', 'cancel']).then(async (res) => {
         if (res == 'confirm') {
+          let ip = '';
+          try {
+            const res = await fetch('rs/systemUrl/getIp');
+            const ipData = await res.json();
+            ip = ipData.ip;
+          } catch (e) {
+            console.warn('获取IP失败', e);
+          }
           let data = {
             userid: this.$login.f.id,
             username: this.$login.f.name,
-            usertelephone: this.$login.f.f_user_telephone
+            usertelephone: this.$login.f.f_user_telephone,
+            ip: ip,
+            device_type: 'PC'
           }
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()

package/src/components/server/LoginRecordQuery.vue

@@ -0,0 +1,128 @@
+<template>
+  <div id="file-user-files" class="binary">
+    <div class="flex" style="flex: 1;">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">登陆人员</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.username"
+                       condition="username like '%{}%'" placeholder="登陆人员">
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">登录类型</label>
+                <v-select :options='$parent.$parent.type'
+                          :value.sync="model.type"
+                          close-on-select
+                          condition="type = '{}'"
+                          placeholder='登录类型'
+                          v-model="model.type">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker placeholder="登入/登出时间"
+                            style="width:60%"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            condition="logindate >= '{}'"
+                ></datepicker>
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">结束日期</label>
+                <datepicker placeholder="登入/登出时间"
+                            style="width:60%"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            condition="logindate <= '{}'"
+                ></datepicker>
+              </div>
+              <div class="span" style="float:right;">
+                <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">设备类型</label>
+                <v-select :options='$parent.$parent.device_type'
+                          :value.sync="model.device_type"
+                          close-on-select
+                          condition="device_type = '{}'"
+                          placeholder='设备类型'
+                          v-model="model.device_type">
+                </v-select>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>登陆人员</th>
+              <th>类型</th>
+              <th>登入/登出时间</th>
+              <th>登录ip</th>
+              <th>设备类型</th>
+            </tr>
+          </template>
+          <template partial='body' :model="model">
+            <tr>
+              <td style="text-align:center">{{ $index + 1 }}</td>
+              <td style="text-align:center">{{ row.username }}</td>
+              <td style="text-align:center">{{ row.type }}</td>
+              <td style="text-align:center">{{ row.logindate }}</td>
+              <td style="text-align:center">{{ row.login_ip }}</td>
+              <td style="text-align:center">{{ row.device_type }}</td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '登录操作查询',
+  components: {},
+  data() {
+    return {
+      criteriaShow: false,
+      model: new PagedList('rs/sql/singleTable', 20, {
+        items: '"*"',
+        tablename: '"t_loginrecord"',
+        orderitem: '"id desc"'
+      }),
+      type: [{label: '全部', value: ''}, {label: '登入', value: '登入'}, {label: '登出', value: '登出'}],
+      device_type: [{label: '全部', value: ''}, {label: 'PC', value: 'PC'}, {label: 'PHONE', value: 'PHONE'}]
+    }
+  },
+  ready() {
+    this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+    this.search()
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      this.model.search(args.condition, this.model)
+    }
+  },
+  computed: {}
+}
+</script>

package/src/components/server/ResSelect.vue

@@ -161,9 +161,6 @@
       'parentresid'(){
         this.dealdata()
       },
-      'initresid'(){
-        this.dealdata()
-      }
     },
   }
 </script>