manage-client 3.1.1-79-aode → 3.1.1-8-fx

package/ManageClient.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.1-25" type="WEB_MODULE" version="4">
+<module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

package/build/dev-server.js

@@ -1,160 +1,160 @@
-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 str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
- var str = 'http://192.168.10.14:8300', fuwu = '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/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': {
-    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(8099, 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:8093/manage', fuwu = 'http://127.0.0.1:8300'
+//  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/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': {
+    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/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 	}
 }
 
-version = '3.1.1-25'
+version = '3.1.0-17'
 apply plugin: 'java'
 task release(type:Exec) {
 	workingDir '.'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.1-79-aode",
+  "version": "3.1.1-8-fx",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -52,20 +52,21 @@
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "vue-amap": "0.5.10",
+    "jsencrypt": "3.0.0-rc.1",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "1.0.93-aode",
+    "sale-client": "3.1.0-22",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.22.21-aode",
+    "vue-client": "1.21.71",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",
-    "system-clients": "3.1.92-aode",
+    "system-clients": "3.0.41",
     "vue-resource": "^1.5.0",
     "vue-router": "^0.7.13",
     "vue-strap": "^1.0.9",

package/src/ManageHome.js

@@ -1,16 +1,14 @@
 import Vue from 'vue'
 
 import echarts from 'echarts'
+import MagLoadParams from  './stores/MagLoadParams'
+import MagGetSaleParam from  './stores/MagGetSaleParams'
 
 /** **************************收费组件注册******************************/
 
 export default function () {
   Vue.prototype.$echarts = echarts
 
-  Vue.component('safehidden-analy', (resolve) => {
-    require(['./components/safeCheck/analysis/SafeHiddenAnaly'], resolve)
-  })
-
   /** **************************安全服务******************************/
   //安全服务首页
   // Vue.component('security-servicehome', (resolve) => {

package/src/components/SellReport/ReportPool.vue

@@ -7,11 +7,11 @@
     </div>
     </div>
     <!-- 使用动态页签
-    <dynamic :comps='[]' name='report'></dynamic> -->
+    <!-- <dynamic :comps='[]' name='report'></dynamic> -->
     <!-- 使用路由切换 -->
-    <div :style="{width:'78%'}">
+    <div  style="margin-left: 1%;" :style="{width:'75%'}">
       <div class="flex" v-if="$refs.route.cards.length === 0">
-        <echarts-box></echarts-box>
+        <echarts-box ></echarts-box>
       </div>
       <route v-ref:route @save-success="$refs.history.search" v-show="!($refs.route.cards.length === 0)"></route>
     </div>

package/src/components/SellReport/jingwei/PaymentNotice.vue

@@ -261,7 +261,7 @@
         operatorname: '',
         orgCondtionStr: '1=1',
         defaultfield: ['number','f_building','f_unit','floor_room','f_address','f_userinfo_code','f_user_name',
-          'f_last_date','f_last_tablebase','f_input_date','f_tablebase','f_oughtfee','f_oughtamount'
+          'f_last_date','f_last_tablebase','f_hand_date','f_tablebase','f_oughtfee','f_oughtamount'
           ,'f_balance','yinshou','f_curbalance','f_charge_state','lswjd'],
       }
     },

package/src/components/WebReport/EchartsBox.vue

@@ -1,49 +1,45 @@
 <template lang="html">
-  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
-    <div class="form-horizontal select-overspread container-fluid auto">
+  <div class="basic-main" v-if="jurisdiction.includes('首页')">
+    <div class="form-horizontal select-overspread container-fluid auto" style="height:40px" >
       <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="[]"
-                      class="datepicker"
-                      :format="'yyyy-MM-dd'"
-                      :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%"
-                      class="datepicker"
-                      v-model="model.endDate"
-                      :value.sync="model.endDate"
-                      :disabled-days-of-Week="[]"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-2 form-group">
-          <label class="font_normal_body" for="endDate">使用公司:</label>
-          <res-select restype='organization'
-                      @res-select="getRes"
-                      :initresid="model.id">
-          </res-select>
-        </div>
+        <div class="col-sm-3">
+        <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'"
+                    :show-reset-button="reset">
+        </datepicker>
       </div>
+        <div class="col-sm-3">
+        <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'"
+                    :show-reset-button="reset">
+        </datepicker>
+      </div>
+        <div class="col-sm-3">
+        <label class="font_normal_body" for="endDate">使用公司:</label>
+        <res-select restype='organization'
+                    @res-select="getRes"
+                    :initresid="model.id">
+        </res-select>
+      </div>
+    </div>
     </div>
-    <div style="height: 97%;">
+    <div class="flex" style="height: 97%;margin-top: 10px">
       <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
-        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
-          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
-                        v-ref:pay></site-manager>
+        <div  style="flex: 1;border-right: 1px dashed #888;width: 50%">
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></site-manager>
         </div>
-        <div style="flex: 1;width: 50%">
-          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
-                        v-ref:pay></bank-manager>
+        <div  style="flex: 1;width: 50%">
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay></bank-manager>
         </div>
       </div>
       <div class="flex-row" style="flex: 1;height: 48%">
@@ -52,9 +48,9 @@
           <div  style="flex: 1;">
             <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
           </div>
-          <!--          <div style="flex: 1;">-->
-          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
-          <!--          </div>-->
+<!--          <div style="flex: 1;">-->
+<!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
+<!--          </div>-->
         </div>
 
         <div style="flex: 1;width: 50%">
@@ -68,28 +64,13 @@
 
 <script>
   import * as Util from '../../Util'
-
   export default {
-    props: {
-      classname: {
-        type: String,
-        default: 'basic-main'
-      },
-      width: {
-        type: String,
-        default: '98.5%'
-      },
-      height: {
-        type: String,
-        default: '98%'
-      }
-    },
     data() {
       return {
         jurisdiction: this.$login.r,
         model: {
-          id: [this.$login.f.orgid],
-          orgid: [this.$login.f.orgid],
+          id:[this.$login.f.orgid],
+          orgid:[this.$login.f.orgid],
           startDate: Util.toStandardDateString(),
           endDate: Util.toStandardDateString()
         }