优化

.gitignore

@@ -11,3 +11,6 @@
 /FTT.Board/FTT.Board.Api/bin/roslyn
 /FTT.Board/Ftt.Board.EF/bin
 /FTT.Board/Ftt.Board.EF/obj
+/MTM-Vue - 副本
+/FTT.Board.VueUI/board
+/Product

FTT.Board.VueUI/.babelrc

+// {
+//   "presets": [
+//     [
+//       "env",
+//       {
+//         "modules": false,
+//         "targets": {
+//           "browsers": [
+//             "> 1%",
+//             "last 2 versions",
+//             "not ie <= 8"
+//           ]
+//         }
+//       }
+//     ],
+//     "stage-2"
+//   ],
+//   "plugins": [
+//     "transform-vue-jsx",
+//     "transform-runtime"
+//   ]
+// }
+
 {
+  // 此项指明，转码的规则
   "presets": [
-    ["env", {
-      "modules": false,
-      "targets": {
-        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+    // env项是借助插件babel-preset-env，下面这个配置说的是babel对es6,es7,es8进行转码，并且设置amd,commonjs这样的模块化文件，不进行转码
+    [
+      "env",
+      {
+        "modules": false
       }
-    }],
+    ],
+    // 下面这个是不同阶段出现的es语法，包含不同的转码插件
     "stage-2"
   ],
-  "plugins": ["transform-vue-jsx", "transform-runtime"]
-}
+  // 下面这个选项是引用插件来处理代码的转换，transform-runtime用来处理全局函数和优化babel编译
+  "plugins": [
+    "transform-runtime"
+  ],
+  // 下面指的是在生成的文件中，不产生注释
+  "comments": false,
+  // 下面这段是在特定的环境中所执行的转码规则，当环境变量是下面的test就会覆盖上面的设置
+  "env": {
+    // test 是提前设置的环境变量，如果没有设置BABEL_ENV则使用NODE_ENV，如果都没有设置默认就是development
+    "test": {
+      "presets": [
+        "env",
+        "stage-2"
+      ],
+      // instanbul是一个用来测试转码后代码的工具
+      "plugins": [
+        "istanbul"
+      ]
+    }
+  }
+}
\ No newline at end of file

FTT.Board.VueUI/build/utils.js

@@ -47,7 +47,8 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
-        fallback: 'vue-style-loader'
+        fallback: 'vue-style-loader',
+        publicPath:'./'
       })
     } else {
       return ['vue-style-loader'].concat(loaders)

FTT.Board.VueUI/build/webpack.prod.conf.js

@@ -25,7 +25,8 @@ const webpackConfig = merge(baseWebpackConfig, {
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js'),
+    publicPath:'./' 
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html

FTT.Board.VueUI/config/dev.env.js

 'use strict'
 const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
-
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  API_HOST:'""',
+  IsNeedConfig:false,
 })

FTT.Board.VueUI/config/index.js

@@ -3,7 +3,8 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
-
+var configjson = require("../static/config.json")
+var baseurl=process.env.IsNeedConfig?configjson.config.ProjectName+"/":"FTT.Board/";
 module.exports = {
   dev: {
 
@@ -12,7 +13,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       "/api":{
-        target:"http://localhost/FTT.Board/",
+        target:"http://localhost/"+baseurl,
         // target:'http://jhdsoft.gicp.net:9201/fd_board/',
         changOrigin:true,
         pathRewrite:{
@@ -51,8 +52,8 @@ module.exports = {
 
     // Paths
     assetsRoot: path.resolve(__dirname, '../board'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsSubDirectory: './static',
+    assetsPublicPath: './',
 
     /**
      * Source Maps

FTT.Board.VueUI/config/prod.env.js

 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  API_HOST:"'FTT_Board'",
+  IsNeedConfig:true,
 }

FTT.Board.VueUI/package-lock.json

@@ -1025,6 +1025,38 @@
         }
       }
     },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
+      }
+    },
     "babel-preset-stage-2": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
@@ -3488,14 +3520,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3510,20 +3540,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3640,8 +3667,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3653,7 +3679,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3668,7 +3693,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3676,14 +3700,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3702,7 +3724,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3783,8 +3804,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3796,7 +3816,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3918,7 +3937,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

FTT.Board.VueUI/package.json

@@ -26,7 +26,9 @@
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-preset-env": "^1.3.2",
+    "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.22.0",
+    "babel-preset-stage-3": "^6.24.1",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",

FTT.Board.VueUI/src/config/comboxstore.js

@@ -41,11 +41,12 @@ export default {
         },
     ],
     ChartTypeCombox: [
-        { ID: 1, Text: "头部" },
-        { ID: 2, Text: "底部" },
-        { ID: 3, Text: "Panle1" },
-        { ID: 4, Text: "Panle2" },
-        { ID: 5, Text: "Table1" },
+        { ID: 1, Text: "头部",name:"head" ,src:require("@/assets/image/head.jpg")},
+        { ID: 2, Text: "底部" ,name:"foot",src:require("@/assets/image/foot.jpg")},
+        { ID: 3, Text: "Panle1" ,name:"panle1",src:require("@/assets/image/panle1.jpg")},
+        { ID: 4, Text: "Panle2" ,name:"panle2",src:require("@/assets/image/panle2.jpg")},
+        { ID: 5, Text: "Table1" ,name:"table1",src:require("@/assets/image/table1.jpg")},
+        
     ],
     RefreshTypeCombox: [
         { ID: 1, Text: "换页" },

FTT.Board.VueUI/src/function/axios.js

 /* vue中ajax请求 插件 */
 import axios from 'axios'
+
 /* 因为axios post请求参数没有序列化，后台获取不到需要引入qs来序列化 post请求参数 */
 function isUndefined(val) {
     return typeof val === 'undefined';
@@ -20,7 +21,6 @@ function isJSON(str) {
             return false;
         }
     }
-    console.log('It is not a string!')
 }
 axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded';
 axios.defaults.headers.post['Content-Type'] = "application/json; charset=UTF-8";
@@ -29,16 +29,21 @@ function setContentTypeIfUnset(headers, value) {
         headers['Content-Type'] = value;
     }
 }
+var configjson = require("../../static/config.json")
+// var baseurl=process.env.IsNeedConfig?configjson.config.ProjectName+"/":"/";
 const Axios = axios.create({
     //  baseURL: 'http:m.test.com', // 因为我本地做了反向代理
     // baseURL: process.env.API_HOST,
-    baseURL: '/',
+    baseURL: "/",
     timeout: 18000000, // 响应超时
     responseType: 'json',
     withCredentials: true, // 是否允许带cookie这些// 跨域
 })
 /* POST传参序列化(添加请求拦截器) */
 Axios.interceptors.request.use(config => {
+    if(process.env.IsNeedConfig){
+        config.url=configjson.config.ProjectName+'/'+config.url;
+    }
     // 在发送请求之前做某件事
     if (config.method === 'post') {
     

FTT.Board.VueUI/src/router/index.js

@@ -8,7 +8,9 @@ const board = r => { require.ensure(['../views/board/index.vue'], () => { r(requ
 Vue.use(Router)
 
 export default new Router({
-  mode: 'history',
+  // mode: 'history',
+  // base: config.ProjectName,//
+  linkActiveClass: 'active',
   routes: [
     {
       path: '/',
@@ -37,26 +39,3 @@ export default new Router({
   ],
 
 })
-// const routes = [
-//   { path: '/', name: 'homeLink', component: Home },
-//   { path: '/menu', name: 'menuLink', component: Menu },
-//   { path: '/admin', name: 'adminLink', component: Admin },
-//   {
-//     path: '/about', name: 'aboutLink', redirect: '/about/contact', component: About, children: [
-//       //表示about页面中默认跳转到/about/contact 这个路由页面下。
-//       {
-//         path: '/about/contact', name: 'contactLink', redirect: '/personName', component: Contact, children: [
-//           //在/about/contact页面中默认展现三级路由personName 的内容。
-//           { path: '/phone', name: "phoneNumber", component: Phone },
-//           { path: '/personName', name: "personName", component: PersonName },
-//         ]
-//       },
-//       { path: '/history', name: 'historyLink', component: History },
-//       { path: '/delivery', name: 'deliveryLink', component: Delivery },
-//       { path: '/orderingGuide', name: 'orderingGuideLink', component: OrderingGuide },
-//     ]
-//   },
-//   { path: '/login', name: 'loginLink', component: Login },
-//   { path: '/register', name: 'registerLink', component: Register },
-//   // {path:'*',redirect:'/'},
-// ]

FTT.Board.VueUI/src/views/board/boardlist/detail.vue

@@ -46,6 +46,7 @@
                   <el-select v-model="ruleForm.ChartType" placeholder="请选择容器类型">
                     <el-popover  width="160"   placement="right-end"   trigger="hover"       v-for="item in comboxstore.ChartTypeCombox"   :key="item.ID">
                       <p>这是一段内容这是一段内容确定删除吗？{{item.ID}}</p>
+                       <img :src="item.src" class="image">
                       <el-option
                         :key="item.ID"
                         :label="item.Text"
@@ -94,6 +95,7 @@
                 </el-form-item>
 
                 <el-form-item label="刷新类别" v-if="ruleForm.ChartType==5">
+                  
                   <el-select v-model="ruleForm.RefreshType" placeholder="请选择容器刷新类别">
                     <el-option
                       v-for="item in comboxstore.RefreshTypeCombox"
@@ -160,6 +162,8 @@
           </div>
         </div>
       </el-dialog>
+
+    
     </el-card>
   </div>
 </template>

FTT.Board.VueUI/src/views/board/boardlist/index.vue

@@ -102,6 +102,8 @@
           </el-form>
         </div>
       </el-dialog>
+
+     
     </el-card>
   </div>
 </template>

FTT.Board.VueUI/src/views/chart/Table1.vue

@@ -136,7 +136,6 @@ export default {
       }).then(res => {
         if (res.success) {
           var titlename = new Array();
-          //分之
           for (var name in res.rows[0]) {
             if (name.indexOf("_") > 0) {
               var arr = name.split("_");

FTT.Board.VueUI/static/config.json

+{
+    "config":{
+        "ProjectName":"board"
+    }
+}
\ No newline at end of file

FTT.Board/FTT.Board.Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -12,7 +12,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>C:\Users\Administrator\Desktop\Board\Product\Board\FD_Board</publishUrl>
+    <publishUrl>D:\git\FTT_Board\Product\BoardApp</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file