system-clients 3.2.1-17 → 3.2.1-20

package/.eslintrc.js

@@ -1,16 +1,16 @@
-// module.exports = {
-//   root: true,
-//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-//   extends: 'standard',
-//   // required to lint *.vue files
-//   plugins: [
-//     'eslint-plugin-html'
-//   ],
-//   // add your custom rules here
-//   'rules': {
-//     // allow paren-less arrow functions
-//     'arrow-parens': 0,
-//     // allow debugger during development
-//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-//   }
-// }
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/build/webpack.base.conf.js

@@ -1,85 +1,85 @@
-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/mergeUser'),
-    publicPath: 'mergeUser/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          /src/,
-          /build/,
-          /examples/,
-          /test/,
-          /node_modules\/vue-client\/src/,
-          /node_modules\/vue-strap\/src/,
-          /node_modules\/system-clients\/src/,
-          /node_modules\/ldap-clients\/src/,
-          /node_modules\/address-client\/src/
-        ],
-        options: {
-          presets: ['es2015']
-        }
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
-      {
-        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/mergeUser'),
+    publicPath: 'mergeUser/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'src': path.resolve(__dirname, '../src'),
+      'test': path.resolve(__dirname, '../test')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          /src/,
+          /build/,
+          /examples/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/,
+          /node_modules\/system-clients\/src/,
+          /node_modules\/ldap-clients\/src/,
+          /node_modules\/address-client\/src/
+        ],
+        options: {
+          presets: ['es2015']
+        }
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
+      {
+        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": "system-clients",
-  "version": "3.2.1-17",
+  "version": "3.2.1-20",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,24 +1,24 @@
-<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>
+  <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>

package/src/components/Main.vue

@@ -267,11 +267,7 @@ export default {
         }
         new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){
-             this.$showMessage('你有'+res.data.n+'个工单待处理，是否跳转到站点工单页面',['confirm','cancel']).then((res) => {
-               if(res === 'confirm'){
-                 this.$refs.route.init('stand-work', {})
-               }
-             })
+             this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
           }
         })
       }