manage-client 4.0.95 → 4.1.1

package/build/dev-server.js

@@ -11,17 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://192.168.50.67:31567/'
-var qtx = 'http://192.168.50.67:31567/'
+var shaoguan = 'http://119.146.1.106:8300/'
+var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31567/'
+var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:31567/'
+var wode = 'http://203.57.101.233:9001/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -30,20 +30,20 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://203.57.101.233:9001/'
 
   },
   '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/WeChatPayment': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api': {
     target: 'http://192.168.50.67:31567/'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.95",
+    "version": "4.1.1",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -639,7 +639,7 @@
         }
         const defectData = JSON.parse(defectContent);
         if (defectData.result === '正常') {
-          return '没问题';
+          return '正常';
         } else {
           // 显示数组第一个值
           if (defectData.data && defectData.data.length > 0) {

package/src/main.js

@@ -7,6 +7,7 @@ import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
 import ShanXianSaleManage from './filiale/rongcheng/sale'
+import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -48,6 +49,7 @@ saleManage()
 webmeterManage()
 ManageHome()
 newmanage()
+ShanXianwebSaleManage()
 reportManage()
 ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')

package/src/reportManage.js

@@ -882,8 +882,4 @@ export default function () {
   Vue.component('tc_user_summary_report', (resolve) => {
     require(['./components/SellReport/tongchuan/tcUserSummaryReport'], resolve)
   })
-  // 报表展示组件（荣浩-月用气量报表）
-  Vue.component('rh-month-gas', (resolve) => {
-    require(['./components/SellReport/ronghao/rhMonthGas'], resolve)
-  })
 }

package/src/components/SellReport/ronghao/rhMonthGas.vue

@@ -1,167 +0,0 @@
-<template>
-  <div class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-2 form-group" >
-              <label class="font_normal_body" for="startDate">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 form-group" >
-              <label  class="font_normal_body" for="endDate">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-          </div>
-          <div class="span" style = "float:right;">
-            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-            <report-excel id='gasprice'></report-excel>
-          </div>
-        </div>
-      </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">月用气量报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
-              <!--打印时间：{{{$parent.printTime}}}-->
-              打印时间：{{$parent.printTime}}
-              <!--收费员：{{// $parent.operatorname}}-->
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              <div>
-                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <td :colspan='$parent.spans' class="noborder">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </td>
-          </tr>
-          <tfoot>
-          </tfoot>
-        </table>
-        {{{ $parent.reportStr}}}
-      </div>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { DataModel } from 'vue-client'
-import co from 'co'
-export default {
-  title: '月用气量报表',
-  props: ['data'],
-  data () {
-    return {
-      printTime: this.$login.toStandardTimeString(),
-      depresid: [],
-      userresid: [],
-      f_orgid: this.$login.f.orgid,
-      f_depid: this.$login.f.depids,
-      // f_operatorid: this.$login.f.id,
-      operatorid: [],
-      depid: [],
-      orgname: '',
-      depname: '',
-      criteriaShow: false,
-      operatorname: '',
-      orgCondtionStr: '1=1',
-      f_user_type: '',
-      f_state: ['有效'],
-      model: new DataModel('api/af-revenue/report/rh_month_gas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'}),
-      reportStr: null,
-      resshow: ['company', 'department', 'operator'],
-      spans: 0,
-      initres: {
-        org: [this.$login.f.orgid],
-        dep: [],
-        user: []
-      }
-    }
-  },
-  ready () {
-    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-  },
-  methods: {
-    searchData () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    selfSearch (args) {
-      this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = '1=1'
-      let orgstr = this.orgCondtionStr
-      orgcondition = orgcondition + orgstr
-      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
-      this.$refs.paged.search(args)
-    },
-
-    hidden () {
-      this.criteriaShow = !this.criteriaShow
-    },
-    getRes (condition, obj) {
-      this.orgCondtionStr = condition
-      this.orgname = obj.orgnames[0]
-      this.depname = obj.depnames[0]
-      this.operatorname = obj.operatornames[0]
-    },
-    getdep (obj, val) {
-      this.depname = val[0]
-      this.userresid = obj
-      this.f_depid = obj
-    },
-    getuser ( obj, val) {
-      this.operatorname = val[0]
-      this.f_operatorid = obj
-    }
-  },
-  watch: {
-    'model.data' (val) {
-      let len=0
-      let a=val.split('</tr>')
-      for(let i=0;i<a.length;i++){
-        if(a[i].split('</td>').length-1>len){
-          len=a[i].split('</td>').length-1
-        }
-      }
-      this.spans = len
-    }
-  },
-  computed: {
-
-  }
-}
-</script>
-<style scoped>
-.noborder{
-  border: none;
-}
-</style>