manage-client 3.2.217 → 3.2.218

package/build/dev-server.js

@@ -1,193 +1,179 @@
-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://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-var bendi = 'http://172.168.1.11:8400/#'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-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: bendi
-  },
-  // '/rs/sql/otherChargeQuery': {
-  //   target: 'http://localhost:8080/'
-  // },
-  // '/rs/sql/BusinessType': {
-  //   target: 'http://localhost:8080/'
-  // },
-  // '/rs/logic/getBatchOperaPro': {
-  //   target: 'http://localhost:8080/'
-  // },
-  // '/rs/customExport/areaChargeExportExcel': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/files': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: bendi
-  },
-  '/rs/logic/getSaleInitData': {
-    target: bendi
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: bendi
-  },
-  '/rs/path/getParams': {
-    target: bendi
-  },
-  '/rs/data': {
-    target: bendi
-  },
-  '/rs/license': {
-    target: bendi
-  },
-  '/rs/db': {
-    target: bendi
-  },
-  '/excel': {
-    target: bendi
-  },
-  '/rs/config': {
-    target: bendi
-  },
-  '/rs/sql/getLicenseById': {
-    target: bendi
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: bendi
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/sql/CancellationQuery': {
-    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(8015, 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: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://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:8400/'
+// var bendi = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://203.57.101.233:9001'
+// var bendi = 'http://192.168.50.4:8400'
+var bendi = 'http://119.187.112.234: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: bendi
+  },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: bendi
+  },
+  '/rs/logic/getSaleInitData': {
+    target: bendi
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: bendi
+  },
+  '/rs/path/getParams': {
+    target: bendi
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/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(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

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

package/src/components/daping/CallCenter.vue

@@ -84,7 +84,7 @@
 
 <script>
   import {HttpResetClass} from "vue-client";
-  import dataManage from './json/dataManage.json'
+  // import this.datamanage from './json/this.datamanage.json'
   export default {
     title: '收费',
     data() {
@@ -114,21 +114,21 @@
       let load1 = new HttpResetClass()
       let load2 = new HttpResetClass()
       let load3 = new HttpResetClass()
-      if(!dataManage.callData){
+      if(!this.datamanage.callData){
         load1.load('POST', 'rs/sql/getCallSum', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((res) => {
           this.callData = res.data[0]
         })
       } else {
-        this.callData = dataManage.callData
+        this.callData = this.datamanage.callData
       }
-      if (!dataManage.callSum) {
+      if (!this.datamanage.callSum) {
         load2.load('POST', 'rs/sql/getCallSumCompare', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((rea) => {
           this.arrs = rea.data
         })
       } else {
-        this.arrs = dataManage.callSum
+        this.arrs = this.datamanage.callSum
       }
-      if (!dataManage.callSumByUnit) {
+      if (!this.datamanage.callSumByUnit) {
         load3.load('POST', 'rs/sql/getCallSumByUnit', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((ret) => {
           this.items = []// ret.data
           this.items = ret.data
@@ -137,11 +137,11 @@
           this.items.push(ret.data.filter((item) => item.name === "海勃湾")[0])
         })
       } else {
-        this.items = dataManage.callSumByUnit
+        this.items = this.datamanage.callSumByUnit
       }
 
     },
-    props: {}
+    props: ['datamanage']
   }
 </script>
 <style scoped>

package/src/components/daping/DataManagement.vue

@@ -19,7 +19,6 @@
                 <div class="flex-inline col-sm-6 auto" >
                   <span class="normal-font" >三年未入户总数</span>
                 </div>
-
                 <div class="flex-inline col-sm-6 auto" >
                   <span class="normal-font" >计划安检量</span>
                 </div>
@@ -29,7 +28,7 @@
               <!--</div>-->
             </div>
             <div  style="height: 58%">
-              <safe-check-wh></safe-check-wh>
+              <safe-check-wh :datamanage="datamanage"></safe-check-wh>
             </div>
           </div>
 
@@ -74,7 +73,7 @@
         </div>
       </div>
       <div class="flex background-left-bottom" style="height: 100%;width: 49%;margin-left:1%">
-        <qh-call-center></qh-call-center>
+        <qh-call-center :datamanage="datamanage"></qh-call-center>
       </div>
     </div>
 
@@ -84,7 +83,6 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
-import dataManage from './json/dataManage.json'
 export default {
   title: '数据展示',
   data() {
@@ -116,13 +114,13 @@ export default {
       console.log('穿过来的值')
       this.changeshow = !this.changeshow
       console.log(this.changeshow)
-      if(!dataManage.checkData){
+      if(!this.datamange.checkData){
         let http = new HttpResetClass()
         await http.load('post', '/rs/sql/getCheckSum', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
           this.checkData = res.data[0]
         })
       } else {
-        this.checkData = dataManage.checkData
+        this.checkData = this.datamange.checkData
 
       }
 
@@ -273,7 +271,7 @@ export default {
 
   },
 
-  props: ['changeshow'],
+  props: ['changeshow','datamanage'],
   computed: {
     top() {
       console.log('ssss')

package/src/components/daping/ManageMain.vue

@@ -12,8 +12,8 @@
 
         录入</span>
     </div>
-    <div style="height: 93%;">
-      <qh-data-management :changeshow=showChart2></qh-data-management>
+    <div style="height: 93%;" v-if="show">
+      <qh-data-management :changeshow=showChart2 :datamanage="datamanage"></qh-data-management>
     </div>
 
 
@@ -62,7 +62,9 @@
     title: '收费',
     data() {
       return{
+        datamanage:{},
         sumnum:0,
+        show: false,
         showChart1 : true,
         showChart2 : false,
       }
@@ -80,8 +82,10 @@
     },
     ready () {
       let http = new HttpResetClass()
-      http.load('post', '/rs/sql/getSafecheckSum', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
-       this.sumnum = (res.data[0].value/10000).toFixed(2)
+      http.load('get', '/dataManage.json', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
+        console.log(res.data)
+        this.datamanage = res.data
+        this.show = true
       })
     },
     props: {}

package/src/components/daping/SafecheckBarChart.vue

@@ -5,7 +5,7 @@
 
 <script>
   import {HttpResetClass} from "vue-client";
-  import dataManage from './json/dataManage.json'
+  // import this.datamanage from './json/this.datamanage.json'
   export default {
     title: '收费',
     data() {
@@ -17,7 +17,7 @@
     },
     methods: {
       async resize(){
-        if(!dataManage.checkByMonth){
+        if(!this.datamanage.checkByMonth){
           let http = new HttpResetClass()
           // 收费
           await http.load('post', '/rs/sql/getSafecheckSumByMonth', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
@@ -27,7 +27,7 @@
             this.init()
           })
         }else{
-          let res = dataManage.checkByMonth
+          let res = this.datamanage.checkByMonth
           this.xData = res.map(item => item.time)
           this.yData1 = res.map(item => item.allnum)
           this.yData2 = res.map(item => item.sucnum)
@@ -231,7 +231,7 @@
     ready() {
       this.resize()
     },
-    props: {}
+    props: ['datamanage']
   }
 </script>
 <style scoped>

package/src/components/daping/json/dataManage.json

@@ -1,3 +1,29 @@
 {
+  "checkData":{
+    "wrhsum":1021,
+    "jhsum":82665
+  },
+  "checkByMonth":[
+    {"sucnum":6921,"time":"2022-08","allnum":7000},
+    {"sucnum":6187,"time":"2022-09","allnum":6200},
+    {"sucnum":5985,"time":"2022-10","allnum":6100},
+    {"sucnum":5783,"time":"2022-11","allnum":5900},
+    {"sucnum":6174,"time":"2022-12","allnum":6300},
+    {"sucnum":6712 ,"time":"2023-01","allnum":6800 }
 
+  ],
+  "callData":{
+    "yearamount":12101,
+    "sumsend":2453,
+    "dayamount":12101,
+    "sumwmm":2397
+  },
+  "callSum":[
+    {"lastyear":100,"addvalue":10,"year":118,"name":"昨日呼入量"},
+    {"lastyear":56,"addvalue":3,"year":70,"name":"昨日派单量"}
+  ],
+  "callSumByUnit":[
+    {"value":100,"addvalue":99,"name":"昨日呼入量"},
+    {"value":56,"addvalue":98,"name":"昨日派单量"}
+  ]
 }