zhulizhen1111 5 年之前
父節點
當前提交
787dfe702f

+ 5 - 5
build/check-versions.js

@@ -39,16 +39,16 @@ module.exports = function () {
   }
 
   if (warnings.length) {
-    console.log('')
-    console.log(chalk.yellow('To use this template, you must update following to modules:'))
-    console.log()
+    // console.log('')
+    // console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    // console.log()
 
     for (let i = 0; i < warnings.length; i++) {
       const warning = warnings[i]
-      console.log('  ' + warning)
+      // console.log('  ' + warning)
     }
 
-    console.log()
+    // console.log()
     process.exit(1)
   }
 }

二進制
build/logo.png


+ 59 - 49
build/utils.js

@@ -1,45 +1,55 @@
-'use strict'
-const path = require('path')
-const config = require('../config')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const packageConfig = require('../package.json')
+"use strict";
+const path = require("path");
+const config = require("../config");
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const packageConfig = require("../package.json");
 
-exports.assetsPath = function (_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production'
-    ? config.build.assetsSubDirectory
-    : config.dev.assetsSubDirectory
+exports.assetsPath = function(_path) {
+  const assetsSubDirectory =
+    process.env.NODE_ENV === "production"
+      ? config.build.assetsSubDirectory
+      : config.dev.assetsSubDirectory;
 
-  return path.posix.join(assetsSubDirectory, _path)
-}
+  return path.posix.join(assetsSubDirectory, _path);
+};
 
-exports.cssLoaders = function (options) {
-  options = options || {}
+exports.cssLoaders = function(options) {
+  options = options || {};
 
   const cssLoader = {
-    loader: 'css-loader',
+    loader: "css-loader",
     options: {
       sourceMap: options.sourceMap
     }
-  }
+  };
+
+  const px2remLoader = {
+    loader: "px2rem-loader",
+    options: {
+      remUnit: 192
+    }
+  };
 
   const postcssLoader = {
-    loader: 'postcss-loader',
+    loader: "postcss-loader",
     options: {
       sourceMap: options.sourceMap
     }
-  }
+  };
 
   // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+  function generateLoaders(loader, loaderOptions) {
+    const loaders = options.usePostCSS
+      ? [cssLoader, postcssLoader,px2remLoader]
+      : [cssLoader,px2remLoader];
 
     if (loader) {
       loaders.push({
-        loader: loader + '-loader',
+        loader: loader + "-loader",
         options: Object.assign({}, loaderOptions, {
           sourceMap: options.sourceMap
         })
-      })
+      });
     }
 
     // Extract CSS when that option is specified
@@ -47,10 +57,10 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
-        fallback: 'vue-style-loader'
-      })
+        fallback: "vue-style-loader"
+      });
     } else {
-      return ['vue-style-loader'].concat(loaders)
+      return ["vue-style-loader"].concat(loaders);
     }
   }
 
@@ -58,44 +68,44 @@ exports.cssLoaders = function (options) {
   return {
     css: generateLoaders(),
     postcss: generateLoaders(),
-    less: generateLoaders('less'),
-    sass: generateLoaders('sass', { indentedSyntax: true }),
-    scss: generateLoaders('sass'),
-    stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
-}
+    less: generateLoaders("less"),
+    sass: generateLoaders("sass", { indentedSyntax: true }),
+    scss: generateLoaders("sass"),
+    stylus: generateLoaders("stylus"),
+    styl: generateLoaders("stylus")
+  };
+};
 
 // Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function (options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
+exports.styleLoaders = function(options) {
+  const output = [];
+  const loaders = exports.cssLoaders(options);
 
   for (const extension in loaders) {
-    const loader = loaders[extension]
+    const loader = loaders[extension];
     output.push({
-      test: new RegExp('\\.' + extension + '$'),
+      test: new RegExp("\\." + extension + "$"),
       use: loader
-    })
+    });
   }
 
-  return output
-}
+  return output;
+};
 
 exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
+  const notifier = require("node-notifier");
 
   return (severity, errors) => {
-    if (severity !== 'error') return
+    if (severity !== "error") return;
 
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
+    const error = errors[0];
+    const filename = error.file && error.file.split("!").pop();
 
     notifier.notify({
       title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}
+      message: severity + ": " + error.name,
+      subtitle: filename || "",
+      icon: path.join(__dirname, "logo.png")
+    });
+  };
+};

+ 2 - 29
build/webpack.base.conf.js

@@ -8,21 +8,12 @@ function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
-const createLintingRule = () => ({
-  test: /\.(js|vue)$/,
-  loader: 'eslint-loader',
-  enforce: 'pre',
-  include: [resolve('src'), resolve('test')],
-  options: {
-    formatter: require('eslint-friendly-formatter'),
-    emitWarning: !config.dev.showEslintErrorsInOverlay
-  }
-})
+
 
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
-    app: ['babel-polyfill', 'event-source-polyfill','./src/main.js']
+    app: './src/main.js'
   },
   output: {
     path: config.build.assetsRoot,
@@ -40,7 +31,6 @@ module.exports = {
   },
   module: {
     rules: [
-      ...(config.dev.useEslint ? [createLintingRule()] : []),
       {
         test: /\.vue$/,
         loader: 'vue-loader',
@@ -74,23 +64,6 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
-      },
-      {
-        test: /\.less$/,
-        use: [
-          {loader: 'style-loader'},
-          {loader: 'css-loader'},
-          {
-            loader: 'px2rem-loader',
-            // options here
-            options: {
-              remUni: 75,
-              remPrecision: 8
-            }
-          },
-          {loader: 'less-loader'},
-        ]
-        
       }
     ]
   },

+ 2 - 6
build/webpack.prod.conf.js

@@ -11,9 +11,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
-const env = process.env.NODE_ENV === 'testing'
-  ? require('../config/test.env')
-  : require('../config/prod.env')
+const env = require('../config/prod.env')
 
 const webpackConfig = merge(baseWebpackConfig, {
   module: {
@@ -63,9 +61,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      filename: process.env.NODE_ENV === 'testing'
-        ? 'index.html'
-        : config.build.index,
+      filename: config.build.index,
       template: 'index.html',
       inject: true,
       minify: {

文件差異過大導致無法顯示
+ 11262 - 38160
package-lock.json


+ 8 - 27
package.json

@@ -15,9 +15,12 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "bootstrap": "^4.3.1",
+    "bootstrap-vue": "^2.0.4",
     "echarts": "^4.2.0-rc.1",
+    "event-source-polyfill": "^1.0.9",
     "iview": "^3.1.1-rc.1",
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.1",
     "svg-sprite-loader": "^4.1.2",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
@@ -27,45 +30,24 @@
   "devDependencies": {
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
-    "babel-eslint": "^8.2.1",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
-    "babel-jest": "^21.0.2",
     "babel-loader": "^7.1.1",
-    "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
-    "bootstrap-vue": "^2.0.0-rc.11",
     "chalk": "^2.0.1",
-    "chromedriver": "^2.27.2",
     "copy-webpack-plugin": "^4.0.1",
-    "cross-spawn": "^5.0.1",
     "css-loader": "^0.28.0",
-    "eslint": "^4.15.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eslint-plugin-vue": "^4.0.0",
-    "event-source-polyfill": "^1.0.4",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
-    "jest": "^22.0.4",
-    "jest-serializer-vue": "^0.3.0",
-    "less": "^3.8.1",
-    "less-loader": "^4.1.0",
-    "nightwatch": "^0.9.12",
+    "less": "^3.9.0",
+    "less-loader": "^5.0.0",
     "node-notifier": "^5.1.2",
+    "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",
@@ -74,12 +56,11 @@
     "postcss-url": "^7.2.1",
     "px2rem-loader": "^0.1.9",
     "rimraf": "^2.6.0",
-    "selenium-server": "^3.0.1",
+    "sass-loader": "^7.1.0",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
-    "vue-jest": "^1.0.2",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",

+ 1 - 1
src/main.js

@@ -1,5 +1,5 @@
 
-import './assets/css/reset.css'
+import '@/assets/css/reset.css'
 import 'jquery'
 import Vue from 'vue'
 import App from './App'

+ 3 - 3
src/views/asset/index.vue

@@ -123,14 +123,14 @@
 </template>
 
 <script>
-import PicSwipe from '../vr/PicSwipe'
+import picSwipe from '../VR/picSwipe.vue'
 import assetTable from './AssetTable'
-import eqRight from '../vr/EqRight'
+import eqRight from '../VR/equipRit'
 import messageModal from '../spread/MessageModal'
 import axios from 'axios'
 export default {
   components: {
-    PicSwipe,
+    picSwipe,
     assetTable,
     eqRight,
     messageModal

+ 1 - 2
src/views/detail/EneryParams.vue

@@ -71,9 +71,8 @@
 
 <script>
 import axios from 'axios'
-// import {currentTime} from '../../tools/currentDate.js'
 import {formatTime, amendTime, date} from '../../tools/formatTime.js'
-import alarmCharts from '../main/AlarmCharts'
+import alarmCharts from '../main/alarmCharts'
 export default {
   components: {
     alarmCharts

+ 1 - 2
src/views/detail/EnvirmentParams.vue

@@ -73,8 +73,7 @@
 <script>
 import axios from 'axios'
 import {formatTime, amendTime, date} from '../../tools/formatTime.js'
-// import {currentTime} from '../../tools/currentDate.js'
-import alarmCharts from '../main/AlarmCharts'
+import alarmCharts from '../main/alarmCharts'
 export default {
   components: {
     alarmCharts

+ 3 - 3
src/views/spread/index.vue

@@ -128,15 +128,15 @@
 </template>
 
 <script>
-import PicSwipe from '../vr/PicSwipe'
+import picSwipe from '../VR/picSwipe'
 import propertyTable from './PropertyTable'
-import eqRight from '../vr/EqRight'
+import eqRight from '../VR/equipRit.vue'
 import messageModal from './MessageModal'
 import {currentTime} from '../../tools/currentDate.js'
 import axios from 'axios'
 export default {
   components: {
-    PicSwipe,
+    picSwipe,
     propertyTable,
     eqRight,
     messageModal

+ 1 - 1
src/views/system/index.vue

@@ -58,7 +58,7 @@
 
 <script>
 
-import eqRight from '../vr/EqRight'
+import eqRight from '../VR/equipRit.vue'
 import {SystemCodetoClass} from '../../tools/systemClass.js'
 import {formatCodetoClass} from '../../tools/formatData.js'
 import {formatTime} from '../../tools/formatTime.js'

+ 2 - 10
src/views/vr/EqRight.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="eqS-right">
+  <div class="my-eq-right">
        <div class="atten-content">
          <p>重点关注的内容</p>
          <div><span></span><li>此区域暂时没有数据!</li></div>
@@ -42,10 +42,6 @@
                <p class="rate-num">{{subsetCount}}</p>
                <p class="rate-name">同类设备数量</p>
            </div>
-           <!-- <div>
-               <p class="rate-num">2<span style="font-size:14px">%</span>    </p>
-               <p class="rate-name">平均故障率</p>
-           </div> -->
            <div>
                <p class="rate-num">{{repairRadio}}<span style="font-size:14px">%</span> </p>
                <p class="rate-name">同类设备故障率</p>
@@ -82,10 +78,6 @@
              <span class="type-number" style="font-size:14px">{{moniData}}个机位<img src="/static/img/left.png" alt=""></span>
            </li>
          </ul>
-         <!-- <div class="video-box">
-           <video class="my-video" ></video>
-           <p><button class="my-button" v-for="(item ,index ) in btn" :key="index" :class="{btnClass:type==item.type}" @click="changeVideo(item)">{{item.name}}</button></p>
-         </div> -->
        </div>
   </div>
 </template>
@@ -185,7 +177,7 @@ export default {
 </script>
 
 <style scoped lang="less" >
-.eqS-right {
+.my-eq-right {
     min-width: 300px;
    .atten-content {
         background: #FFFFFF;

+ 4 - 4
src/views/vr/index.vue

@@ -116,9 +116,9 @@
 </template>
 
 <script>
-import PicSwipe from './PicSwipe'
-import eqTable from './EqTable'
-import eqRight from './EqRight'
+import picSwipe from './picSwipe.vue'
+import eqTable from './eqTable'
+import eqRight from "./equipRit.vue"
 import messageModal from '../spread/MessageModal'
 import {formatCodetoClass} from '../../tools/formatData.js'
 import {currentTime} from '../../tools/currentDate.js'
@@ -126,7 +126,7 @@ import serveTable from './serveTable'
 import axios from 'axios'
 export default {
   components: {
-    PicSwipe,
+    picSwipe,
     eqTable,
     eqRight,
     messageModal,