Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

 # just a flag
 # just a flag
-ENV = 'demonstration'
-NODE_ENV=development
+ENV = 'production'
+NODE_ENV=production
 # base api
 # base api
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/service-bdcdj'
 
 
 # 演示，正式后端
 # 演示，正式后端
-VUE_APP_API_BASE_URL = 'http://192.168.2.38:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.38:8008/service-bdcdj'

@@ -4,8 +4,8 @@
   "description": "HOUTAI",
   "description": "HOUTAI",
   "author": "psh",
   "author": "psh",
   "scripts": {
   "scripts": {
-    "dev": "vue-cli-service serve --mode development",
-    "build": "vue-cli-service build --mode build-development"
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build"
   },
   },
   "dependencies": {
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "@babel/polyfill": "^7.12.1",

@@ -22,14 +22,13 @@
 </template>
 </template>
 <script>
 <script>
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
-import logonImg from '@/image/logo.png'
 export default {
 export default {
   computed: {
   computed: {
     ...mapGetters(['sidebar', 'avatar', 'name'])
     ...mapGetters(['sidebar', 'avatar', 'name'])
   },
   },
   data () {
   data () {
     return {
     return {
-      logo: logonImg
+      logo: require('../../image/logo.png')
     }
     }
   },
   },
   methods: {
   methods: {

@@ -8,7 +8,7 @@
   .sidebar-container {
   .sidebar-container {
     transition: width 0.28s;
     transition: width 0.28s;
     width: $sideBarWidth !important;
     width: $sideBarWidth !important;
-    height: calc(100% - $headerHeight);
+    height: calc(100% - #{$headerHeight});
     position: fixed;
     position: fixed;
     font-size: 0px;
     font-size: 0px;
     top: $headerHeight;
     top: $headerHeight;

@@ -224,7 +224,22 @@ export default {
       })
       })
     },
     },
     handleMinus (index, row) {
     handleMinus (index, row) {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         removeTreeListItem(this.tableData, row.bsmDict)
         removeTreeListItem(this.tableData, row.bsmDict)
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     },
     handleSubmit () {
     handleSubmit () {
       editDictNode({
       editDictNode({

@@ -25,8 +25,10 @@ module.exports = {
     assetsDir: 'static',
     assetsDir: 'static',
     lintOnSave: process.env.NODE_ENV === 'development',
     lintOnSave: process.env.NODE_ENV === 'development',
     productionSourceMap: false,
     productionSourceMap: false,
+    filenameHashing: false,
     // webpack开发服务器
     // webpack开发服务器
     devServer: {
     devServer: {
+        hot: true,
         port: port,
         port: port,
         open: true,
         open: true,
         disableHostCheck: true,
         disableHostCheck: true,
@@ -37,24 +39,29 @@ module.exports = {
         proxy: {
         proxy: {
             '/bdcdj': {
             '/bdcdj': {
                 target: process.env.VUE_APP_API_BASE_URL,//本机服务
                 target: process.env.VUE_APP_API_BASE_URL,//本机服务
-                ws: false,
                 changeOrigin: true,
                 changeOrigin: true,
                 pathRewrite: {
                 pathRewrite: {
-                    '^/bdcdj': '' // 需要rewrite的,
+                    '^/bdcdj': ''
+                }
+            },
+            '/service-bdcdj': {
+                target: process.env.VUE_APP_API_BASE_URL,
+                changeOrigin: true,
+                pathRewrite: {
+                    '^/service-bdcdj': ''
                 }
                 }
             }
             }
-
         },
         },
     },
     },
     css: {
     css: {
-        extract: true, // 是否使用css分离插件 ExtractTextPlugin
+        extract: false, // 是否使用css分离插件 ExtractTextPlugin
         sourceMap: false, // 开启 CSS source maps?
         sourceMap: false, // 开启 CSS source maps?
         loaderOptions: {
         loaderOptions: {
             sass: {
             sass: {
                 prependData: `@import "@/styles/variables.scss";`
                 prependData: `@import "@/styles/variables.scss";`
             }
             }
         },
         },
-        modules: false,// 启用 CSS modules for all css / pre-processor files.
+        modules: false,
     },
     },
     // configureWebpack通过操作对象的形式，来修改默认的webpack配置
     // configureWebpack通过操作对象的形式，来修改默认的webpack配置
     configureWebpack: {
     configureWebpack: {
@@ -117,17 +124,17 @@ module.exports = {
                                     name: 'chunk-libs',
                                     name: 'chunk-libs',
                                     test: /[\\/]node_modules[\\/]/,
                                     test: /[\\/]node_modules[\\/]/,
                                     priority: 10,
                                     priority: 10,
-                                    chunks: 'initial' // only package third parties that are initially dependent
+                                    chunks: 'initial'
                                 },
                                 },
                                 elementUI: {
                                 elementUI: {
-                                    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
+                                    name: 'chunk-elementUI',
+                                    priority: 20,
+                                    test: /[\\/]node_modules[\\/]_?element-ui(.*)/
                                 },
                                 },
                                 commons: {
                                 commons: {
                                     name: 'chunk-commons',
                                     name: 'chunk-commons',
-                                    test: resolve('src/components'), // can customize your rules
-                                    minChunks: 3, //  minimum common number
+                                    test: resolve('src/components'),
+                                    minChunks: 3,
                                     priority: 5,
                                     priority: 5,
                                     reuseExistingChunk: true
                                     reuseExistingChunk: true
                                 }
                                 }