system-clients 3.2.99 → 3.2.100-temp

package/src/components/Main.vue

@@ -160,6 +160,24 @@
       </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>
     <!-- 修改密码组件 -->
@@ -189,8 +207,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
-  let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -227,6 +244,12 @@ let createWaterMark = function (userName) {
   (document.head.append || document.head.appendChild).apply(document.head, [style]);
 }
 
+  window.onunload = () => {
+    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+  }
+  window.onbeforeunload = () => {
+    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+  }
   export default {
     title: '主界面',
     props: ['functions', 'userid', 'config'],
@@ -250,9 +273,12 @@ let createWaterMark = function (userName) {
           // img2: '/images/lefticon/退出系统.png',
         },
         treeOrIcon: false,
+        notReportTitle: '',
+        notReportShow: false,
         qrCode:false,
         isManger: false,
         show: false,
+        orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
         systemname: '客服系统',
         date: this.$login.toStandardDateString(),
         tabs: [],       //已初始化页签数组
@@ -329,10 +355,28 @@ 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)
@@ -391,7 +435,7 @@ let createWaterMark = function (userName) {
         this.OrderDaiBan  = ''
         this.AppDaiBan  = ''
         let http = new HttpResetClass()
-        await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+        await http.load('POST', '/rs/sql/singleTable', {data: {
             tablename:'t_order_center',
             condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
           }}, {
@@ -439,7 +483,7 @@ let createWaterMark = function (userName) {
       async getExpireDate(){
         // 获取分公司的表品牌id
         let http = new HttpResetClass()
-        await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+        await http.load('POST', '/rs/sql/singleTable', {data: {
             tablename:'t_gasbrand_orgid',
             condition:`f_using_orgid ='${this.$login.f.orgid}'`
           }}, {
@@ -453,7 +497,7 @@ let createWaterMark = function (userName) {
           }
           if (this.gasbrandIdData.length > 0) {
             // 获取卡表到期时间
-            http.load('POST', '/api/af-system/sql/singleTable', {data: {
+            http.load('POST', '/rs/sql/singleTable', {data: {
                 tablename:'t_gasbrand',
                 condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
               }}, {
@@ -464,6 +508,7 @@ let createWaterMark = function (userName) {
                 res.data.forEach(itre => {
                   let band = null
                   if ('f_dynamic_expire' in itre) {
+                      console.log(itre.f_dynamic_expire)
                       if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
                         let todayold =  new Date(itre.f_dynamic_expire)
                         todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
@@ -499,14 +544,13 @@ let createWaterMark = function (userName) {
         }
         if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('派单员') !== -1){
           const data = {
-            "condition":
-              {
-                "condition":" 1=1  and processins.activities[ state='开始活动' and (defname in('站点接单'))].count(*) > 0 ",
-                "sign":"1=1"
-              },
-            "userid":this.functions.name
+            condition:{
+              condition:'1=1',
+              sign:'1=1'
+            },
+            userid:this.functions.name
           }
-          new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          new HttpResetClass().load('POST','rs/sql/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
             if(res.data && res.data.n !== 0){
               this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
             }
@@ -514,7 +558,7 @@ let createWaterMark = function (userName) {
         }
       },
       openUrl() {
-        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}`
+        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}`
         window.open(url, '_blank')
       },
       hindsetting() {
@@ -593,28 +637,13 @@ let createWaterMark = function (userName) {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
-          try {
-            await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
-          }catch(e){
-          }
+          await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }
       })
     }
   },
   computed: {
-    orgpathnames(){
-      let names = this.$login.f.name
-      if(this.$login.f.deps){
-          names = `${this.$login.f.deps}-${names}`
-      }
-      if(this.$login.f.orgs){
-          names = `${this.$login.f.orgs}-${names}`
-      }
-      return names
-    },
-
     nowDate() {
       return this.$login.getNowDate()
     }

package/src/components/TabButton.vue

@@ -1,201 +1,201 @@
-<template>
-  <div class='flex foot_tabset1'>
-    <!-- Nav tabs -->
-    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
-      <li style="margin-right: 10px;height: 100%"
-          :id="'vc-tabset-li-'+attach +'-'+$index"
-          v-for="r in renderData"
-          @click.prevent="handleTabListClick($index, r)"
-          :disabled="r.disabled"
-      >
-        <button v-if="button" class="button_new" style="width: max-content" v-bind:class="{
-            'btn-succ': ($index === active),
-            'disabled': r.disabled
-          }">
-          <slot name="header">
-            {{ r.header }}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
-                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </button>
-        <span v-if="!button" v-bind:class="{
-            'span-active': ($index === active),
-            'span-disable': ($index !== active)
-          }">
-          <slot name="header">
-            {{ r.header }}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
-                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </span>
-
-      </li>
-    </ul>
-
-    <!-- Tab panes -->
-    <div class="tab-content span" v-el:tab-content>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-import {remove} from 'vue-client/src/stores/Remove.js'
-
-export default {
-  props: {
-    navStyle: {
-      type: String,
-      default: 'tabs'
-    },
-    effect: {
-      type: String,
-      default: 'fadein'
-    },
-    active: {
-      type: Number,
-      default: 0
-    },
-    close: {
-      type: Boolean,
-      default: false
-    },
-    button: {
-      type: Boolean,
-      default: true
-    },
-    attach: {
-      type: String,
-      default: 'vuestrap'
-    },
-    content: {}
-  },
-  ready() {
-    remove.$on('remove', (name) => {
-      console.log('tabset收$on 到的名字为：', name)
-      this.$removeTab(name)
-    })
-  },
-  data() {
-    return {
-      // 数据格式：{comp, header，disabled}
-      // - comp: 当前页签对应的tab组件
-      renderData: []
-    }
-  },
-  methods: {
-    handleTabListClick(index, el) {
-      // 没有打开过, 则添加显示
-      this.$dispatch('tab-changed')
-      if (!this.$parent.show.includes(el.header)) {
-        this.$parent.show.push(el.header)
-      }
-      if (el.comp._scope && el.comp._scope.tab) {
-        this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
-      }
-      if (!el.disabled) this.active = index
-    },
-    // deletetab函数为自己添加
-    deletetTab(el) {
-      this.$removeTab(el.comp._scope.tab.comp.name)
-      remove.$emit('delete', el.comp._scope.tab.comp.name)
-    },
-    // 根据删除也下标，修改所有页签的下标
-    modifyAllIndex(index) {
-      let cur = this.active
-      this.$nextTick(() => {
-        // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
-        for (var i = index; i < this.renderData.length; i++) {
-          this.renderData[i].comp.index -= 1
-        }
-        // 修改激活页
-        // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
-        // 当关闭当前激活页之前（激活页向前移动一位）
-        if (this.active > index || this.active === this.renderData.length) {
-          this.active = cur - 1
-        } else if (cur === 0) {
-          this.active = 0
-        } else {
-          this.active = cur
-        }
-        if (this.active === -1) {
-          this.$dispatch('tab-changed', null)
-        } else {
-          this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
-        }
-      })
-    }
-  },
-  events: {
-    'delete'(index) {
-      this.modifyAllIndex(index)
-    }
-  }
-}
-</script>
-
-<style scoped>
-ul > li > a {
-  position: relative;
-}
-
-ul > li > a > span {
-  display: none;
-}
-
-.span-active {
-  width: max-content;
-  border-bottom: 3px solid #5ac0d9;
-  height: 100%;
-  display: inline-block;
-  font-size: 1.5rem;
-  color: #666;
-  font-weight: 550;
-  padding: 0px 10px;
-  padding-top: 3px;
-  vertical-align: bottom;
-}
-
-.span-disable {
-  width: max-content;
-  height: 100%;
-  display: inline-block;
-  font-size: 1.5rem;
-  color: #666;
-  font-weight: 550;
-  padding: 0px 10px;
-  padding-top: 3px;
-  vertical-align: bottom;
-}
-
-/*ul > li > a:hover > span {*/
-/*display: initial;*/
-/*position: absolute;*/
-/*right: 0;*/
-/*top: 35%;*/
-/*border: 1px solid #EAEAEA;*/
-/*}*/
-/*ul > li > a:hover > span:hover {*/
-/*border: 1px solid #EAEAEA;*/
-/*color: #5cb95c;*/
-/*}*/
-ul > li > button {
-  background-color: #FFFFFF;
-  border-radius: 4px;
-  color: #999;
-  border: 1px solid #5cb95c;
-}
-
-.btn-succ {
-  background-color: #6aa6e2;
-  border-radius: 4px;
-  color: #fff;
-}
-
-.foot_tabset1 > .nav {
-  /*overflow-x: scroll;*/
-  white-space: nowrap;
-}
-</style>
+<template>
+  <div class='flex foot_tabset1'>
+    <!-- Nav tabs -->
+    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
+      <li style="margin-right: 10px;height: 100%"
+          :id="'vc-tabset-li-'+attach +'-'+$index"
+          v-for="r in renderData"
+          @click.prevent="handleTabListClick($index, r)"
+          :disabled="r.disabled"
+      >
+        <button v-if="button" class="button_new" style="width: max-content" v-bind:class="{
+            'btn-succ': ($index === active),
+            'disabled': r.disabled
+          }">
+          <slot name="header">
+            {{ r.header }}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
+                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </button>
+        <span v-if="!button" v-bind:class="{
+            'span-active': ($index === active),
+            'span-disable': ($index !== active)
+          }">
+          <slot name="header">
+            {{ r.header }}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
+                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </span>
+
+      </li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content span" v-el:tab-content>
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import {remove} from 'vue-client/src/stores/Remove.js'
+
+export default {
+  props: {
+    navStyle: {
+      type: String,
+      default: 'tabs'
+    },
+    effect: {
+      type: String,
+      default: 'fadein'
+    },
+    active: {
+      type: Number,
+      default: 0
+    },
+    close: {
+      type: Boolean,
+      default: false
+    },
+    button: {
+      type: Boolean,
+      default: true
+    },
+    attach: {
+      type: String,
+      default: 'vuestrap'
+    },
+    content: {}
+  },
+  ready() {
+    remove.$on('remove', (name) => {
+      console.log('tabset收$on 到的名字为：', name)
+      this.$removeTab(name)
+    })
+  },
+  data() {
+    return {
+      // 数据格式：{comp, header，disabled}
+      // - comp: 当前页签对应的tab组件
+      renderData: []
+    }
+  },
+  methods: {
+    handleTabListClick(index, el) {
+      // 没有打开过, 则添加显示
+      this.$dispatch('tab-changed')
+      if (!this.$parent.show.includes(el.header)) {
+        this.$parent.show.push(el.header)
+      }
+      if (el.comp._scope && el.comp._scope.tab) {
+        this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
+      }
+      if (!el.disabled) this.active = index
+    },
+    // deletetab函数为自己添加
+    deletetTab(el) {
+      this.$removeTab(el.comp._scope.tab.comp.name)
+      remove.$emit('delete', el.comp._scope.tab.comp.name)
+    },
+    // 根据删除也下标，修改所有页签的下标
+    modifyAllIndex(index) {
+      let cur = this.active
+      this.$nextTick(() => {
+        // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
+        for (var i = index; i < this.renderData.length; i++) {
+          this.renderData[i].comp.index -= 1
+        }
+        // 修改激活页
+        // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
+        // 当关闭当前激活页之前（激活页向前移动一位）
+        if (this.active > index || this.active === this.renderData.length) {
+          this.active = cur - 1
+        } else if (cur === 0) {
+          this.active = 0
+        } else {
+          this.active = cur
+        }
+        if (this.active === -1) {
+          this.$dispatch('tab-changed', null)
+        } else {
+          this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
+        }
+      })
+    }
+  },
+  events: {
+    'delete'(index) {
+      this.modifyAllIndex(index)
+    }
+  }
+}
+</script>
+
+<style scoped>
+ul > li > a {
+  position: relative;
+}
+
+ul > li > a > span {
+  display: none;
+}
+
+.span-active {
+  width: max-content;
+  border-bottom: 3px solid #5ac0d9;
+  height: 100%;
+  display: inline-block;
+  font-size: 1.5rem;
+  color: #666;
+  font-weight: 550;
+  padding: 0px 10px;
+  padding-top: 3px;
+  vertical-align: bottom;
+}
+
+.span-disable {
+  width: max-content;
+  height: 100%;
+  display: inline-block;
+  font-size: 1.5rem;
+  color: #666;
+  font-weight: 550;
+  padding: 0px 10px;
+  padding-top: 3px;
+  vertical-align: bottom;
+}
+
+/*ul > li > a:hover > span {*/
+/*display: initial;*/
+/*position: absolute;*/
+/*right: 0;*/
+/*top: 35%;*/
+/*border: 1px solid #EAEAEA;*/
+/*}*/
+/*ul > li > a:hover > span:hover {*/
+/*border: 1px solid #EAEAEA;*/
+/*color: #5cb95c;*/
+/*}*/
+ul > li > button {
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  color: #999;
+  border: 1px solid #5cb95c;
+}
+
+.btn-succ {
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  color: #fff;
+}
+
+.foot_tabset1 > .nav {
+  /*overflow-x: scroll;*/
+  white-space: nowrap;
+}
+</style>