Ver Fonte

Merge branch 'sit' of daiyanrong/live-telecast-ui-pc into master

戴艳蓉 há 3 anos atrás
pai
commit
a82b85551e

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/index.html


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.65ca64df.css


BIN
dist/static/css/app.65ca64df.css.gz


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.dae04d70.css


BIN
dist/static/css/app.dae04d70.css.gz


+ 0 - 0
dist/static/css/chunk-00b166e3.4308932c.css → dist/static/css/chunk-00b166e3.7638e7d1.css


+ 0 - 0
dist/static/css/chunk-02a3c4d8.5e4e69d6.css → dist/static/css/chunk-02a3c4d8.c400605d.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-2e7fc444.93e41db1.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-5d56779a.83172500.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-5d56779a.df15f40a.css


+ 0 - 0
dist/static/css/chunk-6b5f92f5.8a6f816e.css → dist/static/css/chunk-6b5f92f5.fa34eaa7.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-8866b724.552b718a.css


+ 0 - 0
dist/static/css/chunk-f0207914.01d50f2c.css → dist/static/css/chunk-f0207914.7edfc431.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.403d31a1.js


BIN
dist/static/js/app.403d31a1.js.gz


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.7a4d56b9.js


BIN
dist/static/js/app.7a4d56b9.js.gz


+ 0 - 0
dist/static/js/chunk-00b166e3.83db099a.js → dist/static/js/chunk-00b166e3.398bb47e.js


+ 0 - 0
dist/static/js/chunk-02a3c4d8.e8a6ad67.js → dist/static/js/chunk-02a3c4d8.7e774796.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-2e7fc444.75e64ff5.js


BIN
dist/static/js/chunk-2e7fc444.75e64ff5.js.gz


+ 0 - 0
dist/static/js/chunk-5d56779a.f8a313e9.js → dist/static/js/chunk-5d56779a.bc0b2c33.js


+ 0 - 0
dist/static/js/chunk-6b5f92f5.e7b1d4d5.js → dist/static/js/chunk-6b5f92f5.67acaf59.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-8866b724.e618fd87.js


BIN
dist/static/js/chunk-8866b724.e618fd87.js.gz


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-f0207914.34720f79.js


BIN
dist/static/js/chunk-f0207914.62a583ab.js.gz → dist/static/js/chunk-f0207914.34720f79.js.gz


Diff do ficheiro suprimidas por serem muito extensas
+ 157 - 140
package-lock.json


+ 3 - 4
package.json

@@ -27,22 +27,23 @@
     "dayjs": "^1.10.4",
     "driver.js": "0.9.5",
     "dropzone": "5.5.1",
-    "echarts": "4.2.1",
     "element-ui": "^2.12.0",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
+    "mockjs": "^1.1.0",
+    "node-sass": "^4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "sass-loader": "^8.0.2",
     "screenfull": "4.2.0",
     "script-loader": "0.7.2",
     "sortablejs": "1.8.4",
     "tui-editor": "1.3.3",
     "uglifyjs-webpack-plugin": "^2.2.0",
-    "vue-count-to": "1.0.13",
     "vue-puzzle-verification": "^1.0.2",
     "vue-quill-editor": "^3.0.6",
     "vue-splitpane": "1.0.4",
@@ -68,8 +69,6 @@
     "lint-staged": "8.1.5",
     "plop": "2.3.0",
     "runjs": "4.3.2",
-    "sass": "1.26.2",
-    "sass-loader": "^8.0.2",
     "script-ext-html-webpack-plugin": "2.1.3",
     "serve-static": "1.13.2",
     "svg-sprite-loader": "4.1.3",

+ 1 - 1
src/main.js

@@ -15,7 +15,7 @@ import globalComponents from './components/global'
 import App from './App'
 import store from './store'
 import base from './assets/utils/prototype/index'
-import './utils/error-log' // error log
+// import './utils/error-log' // error log
 
 import * as filters from './filters' // global filters
 

+ 1 - 1
src/views/mobile/videos/addEdit.vue

@@ -92,7 +92,7 @@
             v-if="isDetail !== '007'"
             type="primary"
             @click="submitForm"
-            >立即创建
+            >保 存
           </el-button>
           <el-button @click="showModelThis = false">{{
             isDetail !== "007" ? "取 消" : "关 闭"

+ 80 - 38
vue.config.js

@@ -10,69 +10,108 @@ function resolve(dir) {
 }
 
 
-const port = process.env.port || process.env.npm_config_port || 8080 
+// If your port is set to 80,
+// use administrator privileges to execute the command line.
+// For example, Mac: sudo npm run
+// You can change the port by the following method:
+// port = 8080 npm run dev OR npm run dev --port = 8080
+const port = process.env.port || process.env.npm_config_port || 8080 // dev port
 
+// All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
+  /**
+   * You will need to set publicPath if you plan to deploy your site under a sub path,
+   * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
+   * then publicPath should be set to "/bar/".
+   * In most cases please use '/' !!!
+   * Detail: https://cli.vuejs.org/config/#publicpath
+   */
   publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
-  lintOnSave: false,
+  lintOnSave: false,//process.env.NODE_ENV === 'development'
   productionSourceMap: false,
   devServer: {
+    // proxy: {
+    //   "/admin": {
+    //     target: process.env.NODE_ENV,
+    //     ws: true,
+    //     secure: false,  // 如果是https接口,需要配置这个参数
+    //     changeOrigin: true, // 是否跨域
+    //     // pathRewrite: {
+    //     //   // 路径重写
+    //     //   "/admin": "/admin" // 这个意思就是以api开头的,定向到哪里, 如果你的后边还有路径的话, 会自动拼接上
+    //     // }
+    //   }
+    // },
     port: port,
     open: true,
     overlay: {
       warnings: false,
       errors: true
     },
+    // before: require('./mock/mock-server.js')
   },
   configureWebpack: config => {
     // 入口文件
     config.entry.app = ["babel-polyfill", "./src/main.js"];
     config.externals = {
-      'vue': 'Vue',
-      axios: "axios",
-      'vue-router': 'VueRouter'
+        'vue': 'Vue',
+        // 'vuex': 'Vuex',
+        axios: "axios",
+        'vue-router': 'VueRouter'
     };
-    // if (isProduction) {
-    config.plugins.push(new CompressionWebpackPlugin({
-      algorithm: 'gzip',
-      test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-      threshold: 10240,
-      minRatio: 0.7
-    }))
-    // }
+    if (isProduction) {
+        config.plugins.push(new CompressionWebpackPlugin({
+            algorithm: 'gzip',
+            test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+            threshold: 10240,
+            // deleteOriginalAssets:true, //删除源文件,不建议
+            minRatio: 0.7
+        }))
+    }
+    // 删除console插件
     let plugins = [
-      new UglifyJsPlugin({
-        uglifyOptions: {
-          compress: {
-            drop_console: true,
-            drop_debugger: true
-          },
-          output: {
-            comments: true
-          }
-        },
-        cache: true,
-        sourceMap: false,
-        parallel: true
-      })
+        new UglifyJsPlugin({
+            uglifyOptions: {
+                compress: {
+                    // warnings: false, // `warnings` is not a supported option
+                    drop_console: true,
+                    drop_debugger: true
+                },
+                output: {
+                    // 去掉注释内容
+                    comments: true
+                }
+            },
+            cache: true, //启用/禁用文件缓存(类型可布尔也可是字符串)
+            sourceMap: false,
+            parallel: true
+        })
     ];
-
-    // if (isProduction) {
-    config.plugins = [...config.plugins, ...plugins];
-    // }
-  },
+    // 只有打包生产环境才需要将console删除
+    if (isProduction) {
+        config.plugins = [...config.plugins, ...plugins];
+    }
+},
 
   chainWebpack(config) {
+    // it can improve the speed of the first screen, it is recommended to turn on preload
+    // it can improve the speed of the first screen, it is recommended to turn on preload
     config.plugin('preload').tap(() => [
       {
         rel: 'preload',
+        // to ignore runtime.js
+        // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171
         fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
         include: 'initial'
       }
     ])
+
+    // when there are many pages, it will cause too many meaningless requests
     config.plugins.delete('prefetch')
+
+    // set svg-sprite-loader
     config.module
       .rule('svg')
       .exclude.add(resolve('src/icons'))
@@ -88,6 +127,7 @@ module.exports = {
         symbolId: 'icon-[name]'
       })
       .end()
+//process.env.NODE_ENV !== 'development'
     config
       .when(true,
         config => {
@@ -95,6 +135,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()
@@ -106,22 +147,23 @@ module.exports = {
                   name: 'chunk-libs',
                   test: /[\\/]node_modules[\\/]/,
                   priority: 10,
-                  chunks: 'initial'
+                  chunks: 'initial' // only package third parties that are initially dependent
                 },
                 elementUI: {
-                  name: 'chunk-elementUI',
-                  priority: 20,
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/
+                  name: 'chunk-elementUI', // split elementUI into a single package
+                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
                 },
                 commons: {
                   name: 'chunk-commons',
-                  test: resolve('src/components'),
-                  minChunks: 3,
+                  test: resolve('src/components'), // can customize your rules
+                  minChunks: 3, //  minimum common number
                   priority: 5,
                   reuseExistingChunk: true
                 }
               }
             })
+          // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk
           config.optimization.runtimeChunk('single')
         }
       )

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff