address-client 1.6.83 → 1.6.84

package/build/dev-server.js

@@ -1,89 +1,89 @@
-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 gongsi = 'http://192.168.50.203:7003', changan = 'http://192.168.2.84:7003'
-var proxyTable = {
-  '/rs/search': {
-    target: changan
-  },
-  '/rs/logic/getLogin': {
-    target: changan
-  },
-  '/rs/logic/getInitData': {
-    target: changan
-  },
-  '/rs/vue': {
-    target: changan
-  },
-  '/rs/user': {
-    target: changan
-  },
-  '/rs': {
-    target: changan
-  }
-}
-
-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'))
-
-module.exports = app.listen(8084, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8084')
-})
+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 gongsi = 'http://192.168.2.84:7003/', changan = 'http://192.168.2.84:7003/'
+var proxyTable = {
+  '/rs/search': {
+    target: changan
+  },
+  '/rs/logic/getLogin': {
+    target: changan
+  },
+  '/rs/logic/getInitData': {
+    target: changan
+  },
+  '/rs/vue': {
+    target: changan
+  },
+  '/rs/user': {
+    target: changan
+  },
+  '/rs': {
+    target: changan
+  }
+}
+
+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'))
+
+module.exports = app.listen(8084, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8084')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "1.6.83",
+  "version": "1.6.84",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AddAreaMsg.vue

@@ -305,6 +305,7 @@
                 style="width: 60%"
                 :value.sync="areamodel.f_price_type" :value-single="true"
                 :options='f_price_types' placeholder='气价类型'
+                @change="priceChange"
                 close-on-select>
               </v-select>
             </div>
@@ -321,6 +322,7 @@
                 style="width: 60%"
                 :value.sync="areamodel.f_price_name" :value-single="true"
                 :options='pricenames' placeholder='气价名称'
+                @
                 close-on-select>
               </v-select>
             </div>
@@ -490,6 +492,15 @@
                      v-model="areamodel.twoalarm" placeholder='第二档报警气量'
               />
             </div>
+            <div class="col-sm-6 form-group form-input-group ">
+              <label  class="font_normal_body _zoom4">第二套档案标识</label>
+              <v-select :value.sync="areamodel.f_second_state"
+                        v-model="areamodel.f_second_state"
+                        :search="false"
+                        :value-single = "true"
+                        :options='second_states' placeholder='请选择'
+              ></v-select>
+            </div>
           </div>
           <div v-if="f_special" class="col-sm-6">
             <br/>
@@ -522,6 +533,7 @@ export default {
       residential_properties: this.$appdata.getParam('小区性质'),
       heating_style: this.$appdata.getParam('供暖方式'),
       blockslist:  this.$appdata.getParam('所属街办'),
+      second_states: [{label: '否', value: '否'}, {label: '是', value: '是'}],
       // repair_point: [{label: '航天站', value: '航天站'},
       //   {label: '韦曲站', value: '韦曲站'}, {label: '郭杜站', value: '郭杜站'},
       //   {label: '沣东站', value: '沣东站'},
@@ -593,6 +605,10 @@ export default {
     this.$LoadParams.loadParam()
   },
   methods: {
+    // 气价类型变更修改单价类型
+    priceChange(val){
+        this.areamodel.price_type = val==='阶梯气价' ?'阶梯单价':'普通单价'
+    },
     //初始化省市区,添加街道
     initpcds(pconditon) {
       console.log("省市区准备")