Skip to content

F
FTT_Board
Commit d7e9c4df authored by 王文琼's avatar 王文琼
Browse files
Options

看板模板

parent 22e394e6
Hide whitespace changes
Inline Side-by-side
Showing with 301 additions and 109 deletions
FTT.Board.VueUI/config/index.js
View file @ d7e9c4df
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
const path = require('path') const path = require('path')
var configjson = require("../static/config.json") var configjson = require("../static/config.json")
var baseurl=process.env.IsNeedConfig?configjson.config.ProjectName+"/":"FTT.Board/"; var baseurl=process.env.IsNeedConfig?configjson.config.ProjectName+"/":"FTT.Board/";
console.log(baseurl);
module.exports = { module.exports = {
dev: { dev: {
...@@ -13,7 +14,7 @@ module.exports = { ...@@ -13,7 +14,7 @@ module.exports = {
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
"/api":{ "/api":{
target:"http://localhost/"+baseurl, target:"http://192.168.1.201:8000/Board/",//+baseurl
// target:'http://jhdsoft.gicp.net:9201/fd_board/', // target:'http://jhdsoft.gicp.net:9201/fd_board/',
changOrigin:true, changOrigin:true,
pathRewrite:{ pathRewrite:{
......
FTT.Board.VueUI/package-lock.json
View file @ d7e9c4df
...@@ -283,12 +283,35 @@ ...@@ -283,12 +283,35 @@
} }
}, },
"axios": { "axios": {
"version": "0.18.0", "version": "0.19.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
"integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
"requires": { "requires": {
"follow-redirects": "^1.3.0", "follow-redirects": "1.5.10",
"is-buffer": "^1.1.5" "is-buffer": "^2.0.2"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
},
"follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"requires": {
"debug": "=3.1.0"
}
},
"is-buffer": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
"integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
}
} }
}, },
"babel-code-frame": { "babel-code-frame": {
...@@ -2712,6 +2735,14 @@ ...@@ -2712,6 +2735,14 @@
"stream-shift": "^1.0.0" "stream-shift": "^1.0.0"
} }
}, },
"echarts": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-4.2.1.tgz",
"integrity": "sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==",
"requires": {
"zrender": "4.0.7"
}
},
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
...@@ -2731,9 +2762,9 @@ ...@@ -2731,9 +2762,9 @@
"dev": true "dev": true
}, },
"element-ui": { "element-ui": {
"version": "2.7.2", "version": "2.11.1",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.7.2.tgz", "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.11.1.tgz",
"integrity": "sha512-Exh9QTkm9gwMMPzg1TyaTlBKyr3k4K9XcC5vl0A/mneDvJX//RsURGuOWsCNDVQMdhh5h9e+W5icosh+pKfbCg==", "integrity": "sha512-PACNMHPWqm+/Wc2f/q93pLNzbNyVbpMCXCrYe81czengSWj7IBku7F3zccybkxtWn5qdCmMDBCpG5BzGJL4rKA==",
"requires": { "requires": {
"async-validator": "~1.8.1", "async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0", "babel-helper-vue-jsx-merge-props": "^2.0.0",
...@@ -3367,6 +3398,7 @@ ...@@ -3367,6 +3398,7 @@
"version": "1.7.0", "version": "1.7.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
"dev": true,
"requires": { "requires": {
"debug": "^3.2.6" "debug": "^3.2.6"
}, },
...@@ -3375,6 +3407,7 @@ ...@@ -3375,6 +3407,7 @@
"version": "3.2.6", "version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": { "requires": {
"ms": "^2.1.1" "ms": "^2.1.1"
} }
...@@ -3382,7 +3415,8 @@ ...@@ -3382,7 +3415,8 @@
"ms": { "ms": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
} }
} }
}, },
...@@ -3499,7 +3533,8 @@ ...@@ -3499,7 +3533,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -3520,12 +3555,14 @@ ...@@ -3520,12 +3555,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -3546,7 +3583,8 @@ ...@@ -3546,7 +3583,8 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
...@@ -3697,6 +3735,7 @@ ...@@ -3697,6 +3735,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -3704,12 +3743,14 @@ ...@@ -3704,12 +3743,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -3728,6 +3769,7 @@ ...@@ -3728,6 +3769,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -3821,6 +3863,7 @@ ...@@ -3821,6 +3863,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -3906,7 +3949,8 @@ ...@@ -3906,7 +3949,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -3962,6 +4006,7 @@ ...@@ -3962,6 +4006,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -4005,12 +4050,14 @@ ...@@ -4005,12 +4050,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -4589,7 +4636,8 @@ ...@@ -4589,7 +4636,8 @@
"is-buffer": { "is-buffer": {
"version": "1.1.6", "version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
"dev": true
}, },
"is-callable": { "is-callable": {
"version": "1.1.4", "version": "1.1.4",
...@@ -4962,9 +5010,9 @@ ...@@ -4962,9 +5010,9 @@
} }
}, },
"lodash": { "lodash": {
"version": "4.17.11", "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true "dev": true
}, },
"lodash.camelcase": { "lodash.camelcase": {
...@@ -5351,9 +5399,9 @@ ...@@ -5351,9 +5399,9 @@
} }
}, },
"mixin-deep": { "mixin-deep": {
"version": "1.3.1", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
"integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
"dev": true, "dev": true,
"requires": { "requires": {
"for-in": "^1.0.2", "for-in": "^1.0.2",
...@@ -5402,8 +5450,7 @@ ...@@ -5402,8 +5450,7 @@
"ms": { "ms": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
"dev": true
}, },
"multicast-dns": { "multicast-dns": {
"version": "6.2.3", "version": "6.2.3",
...@@ -8744,9 +8791,9 @@ ...@@ -8744,9 +8791,9 @@
"dev": true "dev": true
}, },
"set-value": { "set-value": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
"integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
"dev": true, "dev": true,
"requires": { "requires": {
"extend-shallow": "^2.0.1", "extend-shallow": "^2.0.1",
...@@ -9326,6 +9373,18 @@ ...@@ -9326,6 +9373,18 @@
"mkdirp": "~0.5.1", "mkdirp": "~0.5.1",
"sax": "~1.2.1", "sax": "~1.2.1",
"whet.extend": "~0.9.9" "whet.extend": "~0.9.9"
},
"dependencies": {
"js-yaml": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
"integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^2.6.0"
}
}
} }
}, },
"tapable": { "tapable": {
...@@ -9553,38 +9612,15 @@ ...@@ -9553,38 +9612,15 @@
} }
}, },
"union-value": { "union-value": {
"version": "1.0.0", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
"dev": true, "dev": true,
"requires": { "requires": {
"arr-union": "^3.1.0", "arr-union": "^3.1.0",
"get-value": "^2.0.6", "get-value": "^2.0.6",
"is-extendable": "^0.1.1", "is-extendable": "^0.1.1",
"set-value": "^0.4.3" "set-value": "^2.0.1"
},
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
},
"set-value": {
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
"dev": true,
"requires": {
"extend-shallow": "^2.0.1",
"is-extendable": "^0.1.1",
"is-plain-object": "^2.0.1",
"to-object-path": "^0.3.0"
}
}
} }
}, },
"uniq": { "uniq": {
...@@ -9811,6 +9847,11 @@ ...@@ -9811,6 +9847,11 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
"integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
}, },
"vue-drag-resize": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/vue-drag-resize/-/vue-drag-resize-1.3.2.tgz",
"integrity": "sha512-XiSEep3PPh9IPQqa4vIy/YENBpYch2SIPNipcPAEGhaSa0V8A8gSq9s7JQ66p/hiINdnR7f5ZqAkOdm6zU/4Gw=="
},
"vue-hot-reload-api": { "vue-hot-reload-api": {
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz",
...@@ -10557,6 +10598,11 @@ ...@@ -10557,6 +10598,11 @@
"dev": true "dev": true
} }
} }
},
"zrender": {
"version": "4.0.7",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-4.0.7.tgz",
"integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
} }
} }
} }
FTT.Board.VueUI/package.json
View file @ d7e9c4df
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
"build": "node build/build.js" "build": "node build/build.js"
}, },
"dependencies": { "dependencies": {
"axios": "^0.18.0", "axios": "^0.19.0",
"element-ui": "^2.7.2", "echarts": "^4.2.1",
"element-ui": "^2.11.1",
"moment": "^2.24.0", "moment": "^2.24.0",
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-drag-resize": "^1.3.2",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue-seamless-scroll": "^1.1.16" "vue-seamless-scroll": "^1.1.16"
}, },
...@@ -37,6 +39,7 @@ ...@@ -37,6 +39,7 @@
"friendly-errors-webpack-plugin": "^1.6.1", "friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"node-sass": "^4.12.0",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0", "ora": "^1.2.0",
"portfinder": "^1.0.13", "portfinder": "^1.0.13",
...@@ -44,6 +47,7 @@ ...@@ -44,6 +47,7 @@
"postcss-loader": "^2.0.8", "postcss-loader": "^2.0.8",
"postcss-url": "^7.2.1", "postcss-url": "^7.2.1",
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"sass-loader": "^7.2.0",
"semver": "^5.3.0", "semver": "^5.3.0",
"shelljs": "^0.7.6", "shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
......
FTT.Board.VueUI/src/config/comboxstore.js
View file @ d7e9c4df
...@@ -46,6 +46,11 @@ export default { ...@@ -46,6 +46,11 @@ export default {
{ ID: 3, Text: "Panle1" ,name:"panle1",src:require("@/assets/image/panle1.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: 4, Text: "Panle2" ,name:"panle2",src:require("@/assets/image/panle2.jpg")},
{ ID: 5, Text: "Table1" ,name:"table1",src:require("@/assets/image/table1.jpg")}, { ID: 5, Text: "Table1" ,name:"table1",src:require("@/assets/image/table1.jpg")},
{ ID: 6, Text: "pie" ,name:"pie",src:require("@/assets/image/table1.jpg")},
{ ID: 7, Text: "radar" ,name:"雷达图",src:require("@/assets/image/table1.jpg")},
{ ID: 8, Text: "bar" ,name:"柱状图",src:require("@/assets/image/table1.jpg")},
{ ID: 9, Text: "scatter" ,name:"散点图",src:require("@/assets/image/table1.jpg")},
{ ID: 10, Text: "chartLine" ,name:"折线图",src:require("@/assets/image/table1.jpg")},
], ],
RefreshTypeCombox: [ RefreshTypeCombox: [
......
FTT.Board.VueUI/src/router/index.js
View file @ d7e9c4df
import Vue from 'vue' import Vue from 'vue'
import Router from 'vue-router' import Router from 'vue-router'
const home = r => { require.ensure(['../views/home/index.vue'], () => { r(require('../views/home/index.vue')) }) }
// board import home from '../views/home/index.vue'
//boardlist import boardlist from '../views/board/boardlist/index.vue'
const boardlist = r => { require.ensure(['../views/board/boardlist/index.vue'], () => { r(require('../views/board/boardlist/index.vue')) }) } import chartList from '../views/board/chartList/index.vue'
const board = r => { require.ensure(['../views/board/index.vue'], () => { r(require('../views/board/index.vue')) }) } import board from '../views/board/index'
import chartPie from '../views/chart/echarts/pie'
import chartRadar from '../views/chart/echarts/radar'
import chartBar from '../views/chart/echarts/bar'
import chartScatter from '../views/chart/echarts/scatter'
import chartLine from '../views/chart/echarts/line'
import chartDemo from '../views/board/chartDemo'
import chartDemo1 from '../views/board/chartDemo1'
import test from '../views/test/index'
import chartDemoList from '../views/board/chartdemoList'
Vue.use(Router) Vue.use(Router)
export default new Router({ export default new Router({
// mode: 'history', // mode: 'history',
// base: config.ProjectName,// // base: config.ProjectName,//
linkActiveClass: 'active', linkActiveClass: 'active',
routes: [ routes: [
{ {
path: '/', path: '/',
name: '主页', name: '主页',
component: home, component: home,
children: [ children: [
{ {
path: '/boardlist', path: '/boardlist',
name: 'boardlist', name: 'boardlist',
meta: { meta: {
title: '看板列表', title: '看板列表',
}, },
component: boardlist, component: boardlist,
}, },
{
path: '/chartlist',
name: 'chartlist',
meta: {
title: '图表列表',
},
component: chartList,
},
{
path: '/chartdemoList',
name: 'chartDemoList',
meta: {
title: '图表列表2',
},
component: chartDemoList,
},
] ]
}, },
{ {
path: '/board', path: '/board',
name: 'board', name: 'board',
meta: { meta: {
title: '看板', title: '看板',
}, },
component: board, component: board,
}, },
], {
path: '/pie',
name: 'pie',
meta: {
title: '饼图',
},
component: chartPie,
},
{
path: '/bar',
name: 'bar',
meta: {
title: '柱状图',
},
component: chartBar,
},
{
path: '/radar',
name: 'radar',
meta: {
title: '雷达图',
},
component: chartRadar,
},
{
path: '/test',
name: 'test',
meta: {
title: '测试',
},
component: test,
},
{
path: '/scatter',
name: 'scatter',
meta: {
title: '散点图',
},
component: chartScatter,
},
{
path: '/line',
name: 'line',
meta: {
title: '折线图',
},
component: chartLine,
},
{
path: '/chartdemo',
name: 'chartdemo',
meta: {
title: '图表模板',
},
component: chartDemo,
},{
path: '/chartdemo1',
name: 'chartdemo1',
meta: {
title: '图表模板1',
},
component: chartDemo1,
},
],
}) })
FTT.Board.VueUI/src/views/board/boardlist/detail.vue
View file @ d7e9c4df
...@@ -441,6 +441,7 @@ export default { ...@@ -441,6 +441,7 @@ export default {
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
console.log(valid);
this.Action(this.ActionBtn); this.Action(this.ActionBtn);
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
......
FTT.Board.VueUI/src/views/board/boardlist/index.vue
View file @ d7e9c4df
...@@ -220,6 +220,7 @@ export default { ...@@ -220,6 +220,7 @@ export default {
return name; return name;
}, },
load() { load() {
console.log("请求数据11。。。")
var me = this; var me = this;
me.Loading = true; me.Loading = true;
var url = me.Api.get.url; var url = me.Api.get.url;
...@@ -234,7 +235,9 @@ export default { ...@@ -234,7 +235,9 @@ export default {
me.DataList = res.rows; me.DataList = res.rows;
} }
me.Loading = false; me.Loading = false;
}); }).catch((res)=>{
console.log(res)
});
}, },
currentPageChange(val) { currentPageChange(val) {
this.PageIndex = val; this.PageIndex = val;
......
FTT.Board.VueUI/src/views/board/index.vue
View file @ d7e9c4df
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
> >
<template v-if="item.length>0"> <template v-if="item.length>0">
<div <div
class="allContent"
v-for="(rows,index1) in item" v-for="(rows,index1) in item"
:key="rows+'row'" :key="rows+'row'"
:style="{height:getRowHeight(item,index1)+'%'}" :style="{height:getRowHeight(item,index1)+'%'}"
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
<div <div
:key="index2+'column'" :key="index2+'column'"
class="columndiv" class="columndiv"
:style="{width:getChartWidth(GetChartStore(column),rows),height:100+'%',borderColor:ruleForm.BorderColor==null?'red':ruleForm.BorderColor}" :style="{width:getChartWidth(GetChartStore(column),rows),height:100+'%',borderColor:ruleForm.BorderColor==null?'red':ruleForm.BorderColor}"
> >
<component <component
...@@ -48,6 +50,7 @@ ...@@ -48,6 +50,7 @@
:boardstore="ruleForm" :boardstore="ruleForm"
:chart="GetChartStore(column)" :chart="GetChartStore(column)"
:Api="Api.charapi" :Api="Api.charapi"
:id="id1+index2"
v-if="GetChartStore(column).IsShow" v-if="GetChartStore(column).IsShow"
></component> ></component>
</div> </div>
...@@ -80,6 +83,11 @@ import comFoot from "@/views/chart/foot"; ...@@ -80,6 +83,11 @@ import comFoot from "@/views/chart/foot";
import Panle1 from "@/views/chart/Panle1"; import Panle1 from "@/views/chart/Panle1";
import Panle2 from "@/views/chart/Panle2"; import Panle2 from "@/views/chart/Panle2";
import Table1 from "@/views/chart/Table1"; import Table1 from "@/views/chart/Table1";
import pie from "@/views/chart/echarts/pie/index";
import radar from "@/views/chart/echarts/radar/index";
import bar from "@/views/chart/echarts/bar/index";
import scatter from "@/views/chart/echarts/scatter/index";
import chartLine from "@/views/chart/echarts/line/index";
export default { export default {
name: "board", name: "board",
components: { components: {
...@@ -87,7 +95,12 @@ export default { ...@@ -87,7 +95,12 @@ export default {
comFoot, comFoot,
Panle1, Panle1,
Panle2, Panle2,
Table1 Table1,
pie,
radar,
bar,
scatter,
chartLine
}, },
data() { data() {
return { return {
...@@ -99,7 +112,11 @@ export default { ...@@ -99,7 +112,11 @@ export default {
comboxstore: comBox, comboxstore: comBox,
ruleForm: null, ruleForm: null,
timer1: null, timer1: null,
pageindex: 0 pageindex: 0,
id1:'pie1',
// columWidth:0,
// columHeight:0
}; };
}, },
watch: { watch: {
...@@ -121,29 +138,34 @@ export default { ...@@ -121,29 +138,34 @@ export default {
} }
} }
}, },
created() {
var boardid = this.$route.query.BoardID;
this.pageindex = this.$route.query.PageIndex;
this.Load(boardid);
},
mounted() { mounted() {
var id = this.$route.query.BoardID; var id = this.$route.query.BoardID;
var me = this; //声明一个变量指向vue实例this,保证作用域一致 var me = this; //声明一个变量指向vue实例this,保证作用域一致
this.timer = setInterval(function() { this.timer = setInterval(function() {
me.Load(id); //修改数据date me.Load(id); //修改数据date
}, 3000); }, 3000);
// this.$nextTick(() => {
// setInterval(() => {
// console.log("下一页");
// me.setActiveItem("page1");
// }, me.time);
// });
}, },
methods: { methods: {
Load(id) { Load(id) {
console.log("请求数据。。。")
var me = this; var me = this;
Axios({ Axios({
method: "get", method: "get",
url: me.Api.get.url, url: me.Api.get.url,
params: { MID: id } params: { MID: id }
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
me.ruleForm = res.rows[0]; me.ruleForm = res.rows[0];
console.log(JSON.stringify( me.ruleForm))
} else { } else {
me.$message.error(res.message); me.$message.error(res.message);
} }
...@@ -200,6 +222,7 @@ export default { ...@@ -200,6 +222,7 @@ export default {
"ID", "ID",
chartstore.ChartType chartstore.ChartType
); );
console.log(chart.Text)
return chart.Text; return chart.Text;
}, },
getChartWidth(chart, rows) { getChartWidth(chart, rows) {
...@@ -295,11 +318,7 @@ export default { ...@@ -295,11 +318,7 @@ export default {
clearInterval(this.timer1); //在vue实例销毁钱，清除我们的定时器 clearInterval(this.timer1); //在vue实例销毁钱，清除我们的定时器
} }
}, },
created() {
var boardid = this.$route.query.BoardID;
this.pageindex = this.$route.query.PageIndex;
this.Load(boardid);
}
}; };
</script> </script>
<style> <style>
...@@ -307,6 +326,12 @@ export default { ...@@ -307,6 +326,12 @@ export default {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
.allContent{
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: row;
}
.columndiv { .columndiv {
box-sizing: border-box; box-sizing: border-box;
border: 1px solid; border: 1px solid;
......
FTT.Board.VueUI/src/views/chart/head.vue
View file @ d7e9c4df
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
data: data data: data
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
console.log(res)
var title = res.rows[0]; var title = res.rows[0];
this.text = title.Title || title; this.text = title.Title || title;
} else { } else {
......
FTT.Board.VueUI/src/views/home/menutree.vue
View file @ d7e9c4df
...@@ -47,12 +47,29 @@ export default { ...@@ -47,12 +47,29 @@ export default {
path: "boardlist" path: "boardlist"
}, },
// { // {
// text: "看板", // text: "图表列表",
// name: "board", // name: "chartlist",
// path: "board" // path: "chartlist"
// }, // },
] ]
} },
{
text: "图表",
iconCls: "el-icon-share",
children: [
{
text: "方案一",
name: "chartlist",
path: "chartlist"
},
{
text: "方案二",
name: "chartDemoList",
path: "chartDemoList"
},
]
}
] ]
}; };
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment