system-clients 1.6.377 → 1.6.378

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "1.6.377",
+  "version": "1.6.378",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -27,16 +27,20 @@
     "vue": "^1.0.17"
   },
   "devDependencies": {
+    "address-client": "1.3.53.1",
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.0.0",
     "chai": "^3.5.0",
+    "co": "^4.6.0",
     "connect-history-api-fallback": "^1.1.0",
     "cross-env": "^1.0.7",
     "cross-spawn": "^2.1.5",
     "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
     "eslint": "^2.0.0",
     "eslint-config-standard": "^5.1.0",
     "eslint-friendly-formatter": "^1.2.2",
@@ -51,6 +55,7 @@
     "file-loader": "^0.8.4",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
+    "http-proxy": "^1.17.0",
     "http-proxy-middleware": "^0.11.0",
     "inject-loader": "^2.0.1",
     "isparta-loader": "^2.0.0",
@@ -65,7 +70,10 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
+    "less": "^2.7.3",
+    "ldap-clients": "0.4.5",
+    "jsencrypt": "3.0.0-rc.1",
+    "manage-client": "1.0.4",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "ncp": "^2.0.0",
@@ -77,16 +85,18 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "^1.18.5",
+    "vue-client": "1.21.7-jc",
+    "crypto-js": "^4.1.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
+    "vue-loader": "8.2.1",
     "vue-resource": "^1.5.0",
     "vue-router": "^0.7.13",
     "vue-strap": "^1.0.9",
     "vue-style-loader": "^1.0.0",
-    "vue-validator": "^3.0.0-alpha.2",
-    "webpack": "^1.12.2",
+    "vue-validator": "2.1.7",
+    "webpack": "1.12.2",
+    "webpack-bundle-analyzer": "^2.8.3",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3"

package/src/App.vue

@@ -1,24 +1,28 @@
-<template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-// import cardListen from './plugins/CardListen'
-
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<route :comp="{name: 'manage-home'}"></route>-->
+          <!--<route :comp="{name: 'meter-reading'}"></route>-->
+          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
+          <!--<route :comp="{name: 'vender-management'}"></route>-->
+          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
+          <route :comp="{name: 'login'}"></route>
+          <!-- <route :comp="{name: 'load-data'}"></route> -->
+          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+export default {
+  ready () {
+    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+  }
+}
+</script>

package/src/components/equipment/PosList.vue

@@ -30,7 +30,7 @@
               <button type="button" class="button_search btn" @click="search()" v-el:cx>查询</button>
               <export-excel :data="{condition: condition}"
                             :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/saleExport" sql-name="equipmentQuery" template-name='pos导出' :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/saleExport" sql-name="sale_equipmentQuery" template-name='pos导出' :choose-col="true"></export-excel>
               <!--              <button type="button" class="button_search btn" @click="$parent.$parent.add() " v-el:cx>新增</button>-->
               <!--              <div style="float: right" class="button_spacing"-->
               <!--                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->