manage-client 3.1.18 → 3.1.19-zk

package/build/dev-server.js

@@ -1,174 +1,170 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// 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://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8400'
-var system = 'http://192.168.50.4:8400'
-//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'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://127.0.0.1:8081/'
+var fuwu = 'http://192.168.20.27:8400/'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: fuwu
+  },
+  '/rs/sql': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

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

package/src/components/BasisEcharts/RingChart.vue

@@ -78,6 +78,7 @@
               trigger: 'item',
               // borderColor: 'rgba(255,255,255,.3)',
               // backgroundColor: 'rgba(13,5,30,.6)',
+              extraCssText: 'width:auto;height:25%;',
               borderWidth: 1,
               padding: 5,
               formatter: function(parms) {

package/src/components/daping/ManageMain.vue

@@ -6,7 +6,7 @@
 
         客服</span>
       <img src="../../../static/NewManageHome/title_left.png" alt="" style="vertical-align:middle">
-      <img src="../../../static/NewManageHome/title_wujie.png" alt="" style="vertical-align:middle">
+      <img src="../../../static/NewManageHome/title_wuhai.png" alt="" style="vertical-align:middle">
       <img src="../../../static/NewManageHome/title_right.png" alt="" style="vertical-align:middle">
       <span  class="title_main" style="vertical-align:right;background: url('../../../static/NewManageHome/矩形1186拷贝.png')"  @click="showCharts('数据化管理')" b>
 

package/src/components/statistical/StatisticalAnalysis.vue

@@ -1,50 +1,49 @@
 <template lang="html">
   <div :class="classname"  :style="{width:width,height:height}">
-    <div class="form-horizontal select-overspread container-fluid auto">
-      <div class="row">
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" >使用公司:</label>
-          <res-select restype='organization'
-                      v-model="model.orgid"
-                      :initresid="model.id">
+    <div style="height: 97%;">
+      <div class="col-sm-3" style="height: 97%">
+        <div class="row form-group" style="height: 5%">
+            <label class="font_normal_body" >使用公司:</label>
+          <res-select :initresid='model.orgid'
+                      @res-select="getorg"
+                      :is-mul="false"
+                      class="select select_list"
+                      restype='organization'
+                      style="width: 60%">
           </res-select>
         </div>
-        <div style="text-align:center;"><p>营收系统数据统计信息</p></div>
-      </div>
-    </div>
-    <div style="height: 97%;">
-      <div class="col-sm-3 " style="height: 97%">
-        <div style="width: 100%;height: 97%;" align="center">
-          <p>用户数量</p>
-          <table border="1" style="text-align:center;">
-            <tr>
-              <th><nobr>现有户数</nobr></th>
-              <th><nobr>年度新增</nobr></th>
-              <th><nobr>本月新增</nobr></th>
+        <div class="row" style="margin-left: 5%;margin-right: 5%;height: 15%;text-align:center;" >
+          <h4 style="font-size: 18px;">用户数量</h4>
+          <table class="col-sm-12 table table-bordered table-striped" style="font-size: 16px;">
+            <tr class="text-center">
+              <th style="text-align:center;"><nobr>现有户数</nobr></th>
+              <th style="text-align:center;"><nobr>年度新增</nobr></th>
+              <th style="text-align:center;"><nobr>本月新增</nobr></th>
             </tr>
             <tr>
-              <td><nobr>{{num}}</nobr></td>
-              <td><nobr>{{year}}</nobr></td>
-              <td><nobr>{{month}}</nobr></td>
+              <td style="text-align:center;"><nobr>{{num}}</nobr></td>
+              <td style="text-align:center;"><nobr>{{year}}</nobr></td>
+              <td style="text-align:center;"><nobr>{{month}}</nobr></td>
             </tr>
           </table>
-          <div style="width: 100%;height: 50%">
-            <p style="text-align:center;" auto>民用分类实有户数</p>
-            <ring-chart :sdata="sdata2" ></ring-chart>
-          </div>
-          <div style="width: 100%;height: 50%">
-            <p style="text-align:center;">工商业分类实有户数</p>
-            <ring-chart :sdata="sdata1" ></ring-chart>
-          </div>
+        </div>
+        <div style="width: 100%;height: 40%;margin-top: 10%;text-align:center;">
+          <h4 style="font-size: 18px;">民用分类实有户数</h4>
+          <ring-chart :sdata="sdata2" ></ring-chart>
+        </div>
+        <div style="width: 100%;height: 40%;text-align:center;">
+          <h4 style="font-size: 18px;">工商业分类实有户数</h4>
+          <ring-chart :sdata="sdata1" ></ring-chart>
         </div>
       </div>
-      <div class="col-sm-6" style="height: 97%">
+      <div class="col-sm-6" style="height: 97%;text-align:center;">
+        <h3>营收系统数据统计信息</h3>
         <div style="width: 100%;height: 50%">
           <div>
             <bar-chart :xdata="xdata" :sdata="sdata" :legend="legendData" :xname="xname" :yname="yname"> </bar-chart>
           </div>
         </div>
-        <div style="width: 100%;height: 47%">
+        <div style="width: 100%;height: 50%">
         <div>
 <!--          <bussiness-type :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>-->
           <bar-chart :xdata="xdata3" :sdata="sdata3" :legend="legendData1" :xname="xname" :yname="yname"> </bar-chart>
@@ -52,8 +51,8 @@
         </div>
       </div>
       <div class="col-sm-3" style="height: 97%">
-          <div style="width: 100%;height: 97%" align="center">
-            <p>各类表具在用用户数量</p>
+          <div style="width: 100%;height: 95%;margin-top: 10%;margin-right: 5%;" align="center">
+            <h4 style="font-size: 18px;">各类表具在用用户数量</h4>
             <data-grid :model=mood class="table_sy"  partial='list' >
               <template partial='head' >
                 <tr>
@@ -98,22 +97,21 @@ export default {
     }
   },
   watch:{
-    'model.orgid'(val) {
-      if (val) {
-        // console.log("77777777777777777",val)
+    'f_orgid'(val) {
+      // if (val) {
         this.ks()
-      }
+      // }
     }
   },
   data() {
     return {
       jurisdiction: this.$login.r,
       model: {
-        id: [this.$login.f.orgid],
         orgid: [this.$login.f.orgid],
         startDate: Util.toStandardDateString(),
         endDate: Util.toStandardDateString()
       },
+      f_orgid: '',
       xdata:[],
       sdata: [],
       legendData: ['民用'],
@@ -129,15 +127,28 @@ export default {
       month:'',
       arr:[],
       arrs:[],
-      mood:''
+      mood:'',
+      resoptions: []
     }
 
   },
   ready() {
-    this.ks()
+
   },
   methods: {
     ks(){
+        this.xdata = []
+        this.sdata =  []
+        this.sdata1 = []
+        this.sdata2 = []
+        this.xdata3 =  []
+        this.sdata3 =  []
+        this.num = ''
+        this.year = ''
+        this.month = ''
+        this.arr = []
+        this.arrs = []
+        this.mood = ''
       this.getuser()
       this.getType()
       this.getType1()
@@ -146,39 +157,43 @@ export default {
       this.getmeterbrand()
       console.log("7777777777777",this.sdata)
     },
-    async  getuser (){
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      // this.$parent.f_orgid = this.f_orgid
+    },
+    async getuser (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-     await load.load('POST','rs/sql/getUser', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getUser', {data: {f_orgid: this.f_orgid}}).then((res) => {
           console.log("加载res",res)
         for (var i = 0; i < res.data.length; i++) {
           this.num = res.data[i].number
-          this.year= res.data[i].year
-          this.month= res.data[i].month
+          this.year = res.data[i].year
+          this.month = res.data[i].month
         }
         })
     },
-    async  getType (){
+    async getType (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getTypess', {data: {f_orgid: id}}).then((res) => {
-        const rdata=res.data
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getTypess', {data: {f_orgid: this.f_orgid}}).then((res) => {
+        const rdata = res.data
         for (let i = 0; i < rdata.length; i++) {
-          const  object={
-              value:rdata[i].f_type,
-              name:rdata[i].f_devices_type
+          const object={
+              value: rdata[i].f_type,
+              name: rdata[i].f_devices_type
           }
           this.sdata2.push(object)
         }
       })
     },
-    async  getType1 (){
+    async getType1 (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getTypek', {data: {f_orgid: id}}).then((res) => {
-        const rdata=res.data
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getTypek', {data: {f_orgid: this.f_orgid}}).then((res) => {
+        const rdata = res.data
         for (let i = 0; i < rdata.length; i++) {
-          const  object={
+          const object = {
             value:rdata[i].f_type,
             name:rdata[i].f_devices_type
           }
@@ -186,10 +201,10 @@ export default {
         }
       })
     },
-    async  getnumber (){
+    async getnumber (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getNumberss', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getNumberss', {data: {f_orgid: this.f_orgid}}).then((res) => {
         const rdata=res.data
         for (let i = 0; i < rdata.length; i++) {
           this.arr.push(rdata[i].num)
@@ -199,10 +214,10 @@ export default {
         this.sdata.push(this.arr)
       })
     },
-    async  getnumber1 (){
+    async getnumber1 (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getNumbers', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getNumbers', {data: {f_orgid: this.f_orgid}}).then((res) => {
         console.log("加载res3",res)
         const rdata=res.data
         for (let i = 0; i < rdata.length; i++) {
@@ -216,20 +231,16 @@ export default {
         this.sdata3.push(this.arrs)
       })
     },
-    async  getmeterbrand (){
+    async getmeterbrand (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getMeterbrand', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getMeterbrand', {data: {f_orgid: this.f_orgid}}).then((res) => {
         this.mood=res
       })
-    },
-    searchdata () {
-      this.$refs.pay.searchdata()
-    },
-    // getRes (obj) {
-    //   this.model.orgid = obj
-    //   // this.ks()
-    // }
+    }
+    // searchdata () {
+    //   this.$refs.pay.searchdata()
+    // },
   }
 }
 </script>