manage-client 3.2.103-2 → 3.2.103-5

package/build/dev-server.js

@@ -1,176 +1,176 @@
-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='https://qnjtkf.cn:8400'
-var qtx='https://qnjtkf.cn:8400'
-var bendi = 'https://qnjtkf.cn:8400'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'https://qnjtkf.cn:8400'
-// var fuwu = 'http://172.168.1.11:9001'
-var system = 'https://qnjtkf.cn: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: bendi
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'https://qnjtkf.cn:8400'
-  },
-  '/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: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://203.57.101.233:9001'
+// var bendi = 'http://172.168.1.11:9001'
+var fuwu = 'http://192.168.50.4: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: 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: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/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(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.2.103-2",
+  "version": "3.2.103-05",
   "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'
   export default {
     title: '收费',
     data() {
@@ -114,19 +114,31 @@
       let load1 = new HttpResetClass()
       let load2 = new HttpResetClass()
       let load3 = new HttpResetClass()
-      load1.load('POST', 'rs/sql/getCallSum', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((res) => {
-        this.callData = res.data[0]
-      })
-      load2.load('POST', 'rs/sql/getCallSumCompare', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((rea) => {
-        this.arrs = rea.data
-      })
-      load3.load('POST', 'rs/sql/getCallSumByUnit', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((ret) => {
-        this.items = ret.data
-        // this.items =ret.data
-        // this.items.push(ret.data.filter((item) => item.name === "滨河")[0])
-        // this.items.push(ret.data.filter((item) => item.name === "乌达")[0])
-        // this.items.push(ret.data.filter((item) => item.name === "海勃湾")[0])
-      })
+      if(!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
+      }
+      if (!dataManage.callSum) {
+        load2.load('POST', 'rs/sql/getCallSumCompare', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((rea) => {
+          this.arrs = rea.data
+        })
+      } else {
+        this.arrs = dataManage.callSum
+      }
+      if (!dataManage.callSumByUnit) {
+        load3.load('POST', 'rs/sql/getCallSumByUnit', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((ret) => {
+          ret.data
+          // this.items =ret.data
+          // this.items.push(ret.data.filter((item) => item.name === "滨河")[0])
+          // this.items.push(ret.data.filter((item) => item.name === "乌达")[0])
+          // this.items.push(ret.data.filter((item) => item.name === "海勃湾")[0])
+        })
+      } else {
+        this.items = dataManage.callSumByUnit
+      }
 
     },
     props: {}

package/src/components/daping/DataManagement.vue

@@ -11,10 +11,10 @@
                   <span class="font-title">安检</span>
                 </div>
                 <div  class="flex-inline col-sm-6 auto" >
-                  <span id="weiruhu">{{checkData.wrhsum > 10000 ? (checkData.wrhsum/10000).toFixed(0) + '万' : checkData.wrhsum}}</span>
+                  <span id="weiruhu">{{checkData.wrhsum > 1000000 ? (checkData.wrhsum/10000).toFixed(2) + '万' : checkData.wrhsum}}</span>
                 </div>
                 <div  class="flex-inline col-sm-6 auto" >
-                  <span id="anjian">{{checkData.jhsum > 10000 ? (checkData.jhsum/10000).toFixed(0) + '万' : checkData.jhsum}}</span>
+                  <span id="anjian">{{checkData.jhsum > 1000000 ? (checkData.jhsum/10000).toFixed(2) + '万' : checkData.jhsum}}</span>
                 </div>
                 <div class="flex-inline col-sm-6 auto" >
                   <span class="normal-font" >三年未入户总数</span>
@@ -84,6 +84,7 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
+import dataManage from './json/dataManage.json'
 export default {
   title: '数据展示',
   data() {
@@ -115,10 +116,16 @@ export default {
       console.log('穿过来的值')
       this.changeshow = !this.changeshow
       console.log(this.changeshow)
-      let http = new HttpResetClass()
-      await http.load('post', '/rs/sql/getCheckSum', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
-        this.checkData = res.data[0]
-      })
+      if(!dataManage.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
+
+      }
+
       // await http.load('post', '/rs/sql/getHeatStationTable', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
       //   console.log('热源厂---------------')
       //   console.log(res)

package/src/components/daping/SafeCheckRing.vue

@@ -5,7 +5,7 @@
 
 <script>
   import {HttpResetClass} from "vue-client";
-
+  // import dataManage from 'src/components/daping/json/dataManage.json'
   export default {
     title: '收费',
     data () {
@@ -16,6 +16,7 @@
     },
     methods: {
       async resize(){
+        // if(dataManage.safeCheckRing)
         let http = new HttpResetClass()
         // 收费
         await http.load('post', '/rs/sql/getSafecheckSumByType', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{

package/src/components/daping/SafecheckBarChart.vue

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

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

@@ -0,0 +1,26 @@
+{
+"checkData":{
+  "wrhsum":2458,
+  "jhsum":81300
+},
+  "checkByMonth":[{"sucnum":8359,"time":"2021-11","allnum":8359},
+    {"sucnum":2114,"time":"2021-12","allnum":2114},
+    {"sucnum":5528,"time":"2022-01","allnum":5528},
+    {"sucnum":6921,"time":"2022-02","allnum":6921},
+    {"sucnum":3820,"time":"2022-03","allnum":3820}
+ ],
+  "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":"昨日派单量"}
+  ]
+}

package/src/components/sale/businessquery/FillCardQuery.vue

@@ -266,9 +266,6 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               卡费合计:&emsp;{{sumsmodel.f_cardfees}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
-            </td>
           </tr>
         </table>
       </div>
@@ -312,7 +309,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -396,7 +393,6 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
       },
 
       initParams() {