manage-client 3.2.147 → 3.2.149

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='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://192.168.50.4:8400'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = '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: 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: fuwu
-  }
-}
-
-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 = 'https://qnjtkf.cn:7400'
+// var bendi = 'http://172.168.1.11:9001'
+var fuwu = 'https://qnjtkf.cn:7400'
+// 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: fuwu
+  }
+}
+
+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/build/webpack.base.conf.js

@@ -60,7 +60,7 @@ module.exports = {
         loader: 'style!css'
       },
       {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf|TTF)(\?.*)?$/,
         loader: 'url',
         query: {
           limit: 10000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.147",
+  "version": "3.2.149",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -64,6 +64,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
+    "swiper": "^5.4.5",
     "system-clients": "3.1.89-20",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",

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

@@ -174,6 +174,16 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
                          condition="f_metertitles = '{}'" placeholder='表封号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">旧&emsp;表&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber_old = '{}'" placeholder='旧表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                <label class="font_normal_body">旧&emsp;卡&emsp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                       condition="f_card_old = '{}'" placeholder='旧卡号'>
+                </div>
               </div>
             </div>
           </criteria>

package/src/filiale/qianneng/ChargeQuery.vue

@@ -853,7 +853,7 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
+        model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`,startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
           f_pregas: 0,
           f_delaypay: 0,
           fee:0,

package/src/filiale/wuhai/ChargeQuery.vue

@@ -724,19 +724,19 @@
                   一阶气量合计: {{sumsmodel.f_stairamount1.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
+                  一阶气费合计:&emsp;{{sumsmodel.f_stair1fee.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   二阶气量合计:&emsp;{{sumsmodel.f_stair2amount.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
+                  二阶气费合计:&emsp;{{sumsmodel.f_stair2fee.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   三阶气量合计:&emsp;{{sumsmodel.f_stair3amount.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
+                  三阶气费合计:&emsp;{{sumsmodel.f_stair3fee.toFixed(2)}}
               </td>
           </tr>
         </table>

package/src/filiale/zhongyi/CallReport/CallReportMainPage.vue

@@ -73,7 +73,7 @@ export default {
 .content-header {
   width: 8.333vw;
   height: 3.519vh;
-  font-size: 40px;
+  font-size: 3.704vh;
   color: #fff;
   position: absolute;
   top: 1.389vh;

package/src/filiale/zhongyi/CallReport/IncomingTelegram.vue

@@ -3,16 +3,18 @@
   <div class="incoming-telegram">
     <p><i></i><span>来电数量统计</span></p>
     <i></i><i></i>
-    <div>
+    <div class="incoming-telegram-div">
       <span>{{ data.netAppointment}}</span><br>
       <span>年度网厅预约话务(次)</span>
     </div>
-    <div>
+    <div class="incoming-telegram-div">
       <span>{{ data.hotLine }}</span><br>
       <span>年度热线服务话务(次)</span>
     </div>
     <span class="text1">接通率</span>
     <span class="text2">接通率</span>
+    <div class="blueLadder"></div>
+    <div class="yellowLadder"></div>
 
 
   </div>
@@ -91,9 +93,7 @@ export default {
 }
 
 .incoming-telegram p span {
-  /* width: 161px;
-  height: 26px; */
-  font-size: 27px;
+  font-size: 2.5vh;
   color: #FFFFFF;
   position: absolute;
   top: 1.852vh;
@@ -101,7 +101,7 @@ export default {
 }
 
 
-.incoming-telegram div {
+.incoming-telegram-div {
   position: absolute;
   top: 11vh;
   left: 1.042vw;
@@ -113,12 +113,12 @@ export default {
 }
 
 .incoming-telegram div span:nth-of-type(1) {
-  font-size: 54px;
+  font-size: 5vh;
   font-weight: bold;
   color: #FFCD00;
   display: block;
   text-align: center;
-  margin-bottom: -24px;
+  margin-bottom: -2.222vh;
 }
 
 .incoming-telegram div:nth-of-type(2) span:nth-of-type(1) {
@@ -126,7 +126,7 @@ export default {
 }
 
 .incoming-telegram div span:nth-of-type(2) {
-  font-size: 22px;
+  font-size: 2.037vh;
   /* font-weight: bold; */
   color: #FFFEFE;
 }
@@ -134,29 +134,47 @@ export default {
 .rate-top{
   width: 45%;
   height: 30% !important;
-  margin: 1px 1px 1px 220px;
+  margin: 0.093vh 0.052vw 0.093vh 11.458vw;
 }
 .rate-bottom{
   width: 45%;
   height: 30% !important;
-  margin: 240px 1px 1px 220px;
+  margin: 22.222vh 0.052vw 0.093vh 11.458vw;
 }
 
 .text1 {
-  font-size: 22px;
+  font-size: 2.037vh;
   font-weight: bold;
   color: #FFFEFE;
   position: absolute;
-  top: 24.722vh;
-  right: 3.385vw;
+  top: 20.722vh;
+  right: 3.59375vw;
 }
 .text2 {
-  font-size: 22px;
+  font-size: 2.037vh;
   font-weight: bold;
   color: #FFFEFE;
   position: absolute;
-  top: 45.185vh;
-  right: 3.385vw;
+  top: 42.185vh;
+  right: 3.59375vw;
+}
+.blueLadder{
+  width: 4.948vw;
+  height: 0.37vh;
+  background: url('../../../../static/images/zhongyi/blueLadder.png') no-repeat;
+  background-size: cover;
+  position: absolute;
+  top: 45.556vh;
+  right: 2.76vw;
+}
+.yellowLadder{
+  width: 4.948vw;
+  height: 0.37vh;
+  background: url('../../../../static/images/zhongyi/yellowLadder.png') no-repeat;
+  background-size: cover;
+  position: absolute;
+  top: 24.167vh;
+  right: 2.76vw;
 }
 /* 来电统计样式结束 */
 </style>