readmeter-changan 1.0.34 → 1.0.36

package/.idea/workspace.xml

@@ -3,10 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandHome.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandHome.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfoChangan.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfoChangan.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/readingmeter/UserInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/UserInfo.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -82,12 +78,12 @@
     </dirStrings>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="aode" />
+        <entry key="$PROJECT_DIR$" value="可用版本" />
       </map>
     </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/src/components/readingmeter/ReadMeterCenter.vue" root0="SKIP_INSPECTION" />
@@ -173,7 +169,7 @@
     <option name="width" value="1346" />
     <option name="height" value="698" />
   </component>
-  <component name="ProjectId" id="2faO30RCGMKab8olFs2H0M3s3iR" />
+  <component name="ProjectId" id="2goGbz3JMT5GDNN7vCigYftnU1P" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -227,15 +223,14 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "nodejs_package_manager_path": "yarn",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/ReadMeterClient&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;yarn&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="F:\WorkSpace\ReadMeterClient\src\components\server" />
@@ -391,7 +386,10 @@
       <workItem from="1559695441761" duration="30755000" />
       <workItem from="1560127507511" duration="6282000" />
       <workItem from="1560213914628" duration="7098000" />
-      <workItem from="1714035524956" duration="1848000" />
+      <workItem from="1716356594000" duration="1657000" />
+      <workItem from="1716450078610" duration="20000" />
+      <workItem from="1716544621445" duration="650000" />
+      <workItem from="1716774878936" duration="1241000" />
     </task>
     <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
       <created>1553677761707</created>
@@ -527,7 +525,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <ignored-roots>
-      <path value="$PROJECT_DIR$/../../../../.." />
+      <path value="$PROJECT_DIR$/../../../.." />
     </ignored-roots>
     <MESSAGE value="新增卡表抄表气量核算" />
     <MESSAGE value="临时提交" />

package/build/dev-server.js

@@ -1,132 +1,132 @@
-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 proxyTable = {
-  // '/images': {
-  //   target: 'http://192.168.50.202:8081'
-  //   // target: 'http://127.0.0.1:8088'
-  // },
-  // '/rs/user': {
-  //   target: 'http://192.168.50.202:8081'
-  //   // target: 'http://127.0.0.1:8088'
-  // },
-  // '/excel': {
-  //   target: 'http://127.0.0.1:8082'
-  // },
-  '/rs/db': {
-   target: 'http://192.168.2.79:8081/ldapModule'
-    // target: 'http://127.0.0.1:8089'
-  },
-  '/rs/logic': {
-    target: 'http://127.0.0.1:8025/'
-  },
-  '/rs': {
-    target: 'http://127.0.0.1:8025/'
-    // target: 'http://127.0.0.1:8021/MobileReadMeter'
-    // target: 'http://127.0.0.1:8025/MobileReadMeter'
-    // target: 'http://127.0.0.1:8088'
-    // // target: 'http://125.71.238.50:8088/product'
-  },
-  '/AndroidRest/rs': {
-    pathRewrite: {
-      '/AndroidRest/rs': '/rs'
-    },
-    target: 'http://127.0.0.1:8021/MobileReadMeter'
-  },
-}
-
-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('/images/*', function (req, res) {
-//   proxy.web(req, res, {
-//     // target: 'http://192.168.50.202:8081'
-//     target: 'http://127.0.0.1:8088'
-//   })
-// })
-// app.all('/rs/user/*', function (req, res) {
-//   proxy.web(req, res, {
-//     // target: 'http://192.168.50.202:8081'
-//     target: 'http://127.0.0.1:8088'
-//   })
-// })
-// app.all('/rs/db/*', function (req, res) {
-//   proxy.web(req, res, {
-//    //  target: 'http://192.168.50.202:8081'
-//     target: 'http://127.0.0.1:8088'
-//   })
-// })
-//
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8082'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8888/product'
-//   })
-// })
-
-module.exports = app.listen(8081, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8081')
-})
+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 proxyTable = {
+  // '/images': {
+  //   target: 'http://192.168.50.202:8081'
+  //   // target: 'http://127.0.0.1:8088'
+  // },
+  // '/rs/user': {
+  //   target: 'http://192.168.50.202:8081'
+  //   // target: 'http://127.0.0.1:8088'
+  // },
+  // '/excel': {
+  //   target: 'http://127.0.0.1:8082'
+  // },
+  '/rs/db': {
+   target: 'http://192.168.2.79:8081/ldapModule'
+    // target: 'http://127.0.0.1:8089'
+  },
+  '/rs/logic': {
+    target: 'http://127.0.0.1:8025/'
+  },
+  '/rs': {
+    target: 'http://127.0.0.1:8025/'
+    // target: 'http://127.0.0.1:8021/MobileReadMeter'
+    // target: 'http://127.0.0.1:8025/MobileReadMeter'
+    // target: 'http://127.0.0.1:8088'
+    // // target: 'http://125.71.238.50:8088/product'
+  },
+  '/AndroidRest/rs': {
+    pathRewrite: {
+      '/AndroidRest/rs': '/rs'
+    },
+    target: 'http://127.0.0.1:8021/MobileReadMeter'
+  },
+}
+
+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('/images/*', function (req, res) {
+//   proxy.web(req, res, {
+//     // target: 'http://192.168.50.202:8081'
+//     target: 'http://127.0.0.1:8088'
+//   })
+// })
+// app.all('/rs/user/*', function (req, res) {
+//   proxy.web(req, res, {
+//     // target: 'http://192.168.50.202:8081'
+//     target: 'http://127.0.0.1:8088'
+//   })
+// })
+// app.all('/rs/db/*', function (req, res) {
+//   proxy.web(req, res, {
+//    //  target: 'http://192.168.50.202:8081'
+//     target: 'http://127.0.0.1:8088'
+//   })
+// })
+//
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8082'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8888/product'
+//   })
+// })
+
+module.exports = app.listen(8081, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8081')
+})

package/build/webpack.base.conf.js

@@ -1,75 +1,75 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../dist/static'),
-    publicPath: 'static/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\system-phone\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`
-        ]
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: path.resolve(__dirname, '../dist/static'),
+    publicPath: 'static/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'src': path.resolve(__dirname, '../src')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          `${projectRoot}\\src`,
+          `${projectRoot}\\build`,
+          `${projectRoot}\\examples`,
+          `${projectRoot}\\test`,
+          `${projectRoot}\\node_modules\\vue-client\\src`,
+          `${projectRoot}\\node_modules\\system-phone\\src`,
+          `${projectRoot}\\node_modules\\vue-strap\\src`
+        ]
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "readmeter-changan",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "手机抄表客户端",
   "author": "15529257852@163.com",
   "private": false,