Commit b50c5142 authored by 罗超's avatar 罗超

年会示例

parent 4554cfbe
...@@ -1777,14 +1777,6 @@ ...@@ -1777,14 +1777,6 @@
"resolved": "http://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.0.tgz", "resolved": "http://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.0.tgz",
"integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=" "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg="
}, },
"async-validator": {
"version": "1.8.5",
"resolved": "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
}
},
"asynckit": { "asynckit": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz", "resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
...@@ -1921,7 +1913,8 @@ ...@@ -1921,7 +1913,8 @@
"babel-helper-vue-jsx-merge-props": { "babel-helper-vue-jsx-merge-props": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "http://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", "resolved": "http://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=" "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=",
"dev": true
}, },
"babel-loader": { "babel-loader": {
"version": "8.0.4", "version": "8.0.4",
...@@ -1980,6 +1973,7 @@ ...@@ -1980,6 +1973,7 @@
"version": "6.26.0", "version": "6.26.0",
"resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"dev": true,
"requires": { "requires": {
"core-js": "^2.4.0", "core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0" "regenerator-runtime": "^0.11.0"
...@@ -3119,7 +3113,8 @@ ...@@ -3119,7 +3113,8 @@
"core-js": { "core-js": {
"version": "2.5.7", "version": "2.5.7",
"resolved": "http://registry.npm.taobao.org/core-js/download/core-js-2.5.7.tgz", "resolved": "http://registry.npm.taobao.org/core-js/download/core-js-2.5.7.tgz",
"integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=" "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
"dev": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -3547,7 +3542,8 @@ ...@@ -3547,7 +3542,8 @@
"deepmerge": { "deepmerge": {
"version": "1.5.2", "version": "1.5.2",
"resolved": "http://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz", "resolved": "http://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
"integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=",
"dev": true
}, },
"default-gateway": { "default-gateway": {
"version": "2.7.2", "version": "2.7.2",
...@@ -3886,19 +3882,6 @@ ...@@ -3886,19 +3882,6 @@
"batch-processor": "^1.0.0" "batch-processor": "^1.0.0"
} }
}, },
"element-ui": {
"version": "2.4.8",
"resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.4.8.tgz",
"integrity": "sha1-BMaEVA+EmD70QLUWaAsNxqTGbv8=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
"deepmerge": "^1.2.0",
"normalize-wheel": "^1.0.1",
"resize-observer-polyfill": "^1.5.0",
"throttle-debounce": "^1.0.1"
}
},
"elliptic": { "elliptic": {
"version": "6.4.1", "version": "6.4.1",
"resolved": "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.1.tgz", "resolved": "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.1.tgz",
...@@ -5013,12 +4996,14 @@ ...@@ -5013,12 +4996,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"
...@@ -5033,17 +5018,20 @@ ...@@ -5033,17 +5018,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"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",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5160,7 +5148,8 @@ ...@@ -5160,7 +5148,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5172,6 +5161,7 @@ ...@@ -5172,6 +5161,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5186,6 +5176,7 @@ ...@@ -5186,6 +5176,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"
} }
...@@ -5193,12 +5184,14 @@ ...@@ -5193,12 +5184,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.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5217,6 +5210,7 @@ ...@@ -5217,6 +5210,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"
} }
...@@ -5297,7 +5291,8 @@ ...@@ -5297,7 +5291,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5309,6 +5304,7 @@ ...@@ -5309,6 +5304,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"
} }
...@@ -5430,6 +5426,7 @@ ...@@ -5430,6 +5426,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -6878,6 +6875,11 @@ ...@@ -6878,6 +6875,11 @@
"topo": "3.x.x" "topo": "3.x.x"
} }
}, },
"jquery": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
"integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
},
"js-md5": { "js-md5": {
"version": "0.7.3", "version": "0.7.3",
"resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
...@@ -7744,11 +7746,6 @@ ...@@ -7744,11 +7746,6 @@
"integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=", "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
"dev": true "dev": true
}, },
"normalize-wheel": {
"version": "1.0.1",
"resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
},
"npm-run-path": { "npm-run-path": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "http://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz", "resolved": "http://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz",
...@@ -9499,7 +9496,8 @@ ...@@ -9499,7 +9496,8 @@
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.11.1", "version": "0.11.1",
"resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz", "resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
"integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=" "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=",
"dev": true
}, },
"regenerator-transform": { "regenerator-transform": {
"version": "0.12.4", "version": "0.12.4",
...@@ -9718,11 +9716,6 @@ ...@@ -9718,11 +9716,6 @@
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"dev": true "dev": true
}, },
"resize-observer-polyfill": {
"version": "1.5.0",
"resolved": "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.0.tgz",
"integrity": "sha1-Zg/x2XEqI4K6osrUUKRxYgn5ymk="
},
"resolve": { "resolve": {
"version": "1.8.1", "version": "1.8.1",
"resolved": "http://registry.npm.taobao.org/resolve/download/resolve-1.8.1.tgz", "resolved": "http://registry.npm.taobao.org/resolve/download/resolve-1.8.1.tgz",
...@@ -10833,11 +10826,6 @@ ...@@ -10833,11 +10826,6 @@
} }
} }
}, },
"throttle-debounce": {
"version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
"integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
},
"through2": { "through2": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.3.tgz", "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.3.tgz",
......
...@@ -7,16 +7,19 @@ ...@@ -7,16 +7,19 @@
"build": "vue-cli-service build" "build": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
"@aspnet/signalr": "^1.1.4",
"axios": "^0.18.0", "axios": "^0.18.0",
"echarts": "^4.2.0-rc.1", "echarts": "^4.2.0-rc.1",
"echarts-wordcloud": "^1.1.3", "echarts-wordcloud": "^1.1.3",
"element-ui": "^2.12.0", "element-ui": "^2.12.0",
"html2canvas": "^1.0.0-alpha.12", "html2canvas": "^1.0.0-alpha.12",
"jquery": "^3.4.1",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"jspdf": "^1.4.1", "jspdf": "^1.4.1",
"moment": "^2.22.2", "moment": "^2.22.2",
"particleground-light": "^1.0.6", "particleground-light": "^1.0.6",
"register-service-worker": "^1.0.0", "register-service-worker": "^1.0.0",
"signalr": "^2.4.1",
"socket.io-client": "^2.2.0", "socket.io-client": "^2.2.0",
"velocity-animate": "^1.5.2", "velocity-animate": "^1.5.2",
"vue": "^2.5.17", "vue": "^2.5.17",
...@@ -45,5 +48,12 @@ ...@@ -45,5 +48,12 @@
"> 1%", "> 1%",
"last 2 versions", "last 2 versions",
"not ie <= 8" "not ie <= 8"
] ],
"eslintConfig": {
"root": true,
"env": {
"node": true,
"jquery": true
}
}
} }
...@@ -11,6 +11,7 @@ import axios from 'axios' ...@@ -11,6 +11,7 @@ import axios from 'axios'
import echarts from 'echarts' import echarts from 'echarts'
import VueSocketio from 'vue-socket.io'; import VueSocketio from 'vue-socket.io';
import socketio from 'socket.io-client'; import socketio from 'socket.io-client';
import 'signalr'
// Vue.use(VueSocketio,socketio('http://127.0.0.1:5000/data_server')); // Vue.use(VueSocketio,socketio('http://127.0.0.1:5000/data_server'));
// 使用Vue.use()方法就会调用工具方法中的install方法 // 使用Vue.use()方法就会调用工具方法中的install方法
// Vue.use(VueLazyload, { // Vue.use(VueLazyload, {
...@@ -27,22 +28,23 @@ Vue.http = Vue.prototype.$http = axios ...@@ -27,22 +28,23 @@ Vue.http = Vue.prototype.$http = axios
Vue.prototype.$echarts = echarts Vue.prototype.$echarts = echarts
Vue.prototype.$VueSocketio = VueSocketio Vue.prototype.$VueSocketio = VueSocketio
Vue.prototype.$socketio = socketio Vue.prototype.$socketio = socketio
router.beforeEach((to, from, next) => { // Vue.prototype.$signalr = require("@aspnet/signalr")
if (to.meta.title) { router.beforeEach((to, from, next) => {
document.title = to.meta.title if (to.meta.title) {
} document.title = to.meta.title
next() }
next()
}) })
Vue.prototype.getLocalStorage = function() { Vue.prototype.getLocalStorage = function() {
var localStorageData = window.localStorage["userInfo"]; var localStorageData = window.localStorage["userInfo"];
if (localStorageData != undefined) { if (localStorageData != undefined) {
return JSON.parse(localStorageData); return JSON.parse(localStorageData);
} else { } else {
return null; return null;
} }
}, },
new Vue({ new Vue({
router, router,
store, store,
render: h => h(App) render: h => h(App)
}).$mount('#app') }).$mount('#app')
\ No newline at end of file
...@@ -10,69 +10,74 @@ import PerCompetition from './components/viitto/PerCompetition' ...@@ -10,69 +10,74 @@ import PerCompetition from './components/viitto/PerCompetition'
import ActivityBoard from './components/viitto/ActivityBoard' import ActivityBoard from './components/viitto/ActivityBoard'
import salesGuestList from './components/viitto/salesGuestList' import salesGuestList from './components/viitto/salesGuestList'
import saleGuestTable from './components/viitto/saleGuestTable' import saleGuestTable from './components/viitto/saleGuestTable'
import demo from './views/demo'
Vue.use(Router) Vue.use(Router)
export default new Router({ export default new Router({
mode: 'hash', mode: 'hash',
base: process.env.BASE_URL, base: process.env.BASE_URL,
routes: [ routes: [{
{ path: '/',
path: '/', name: 'login',
name: 'login', component: login,
component: login, },
}, {
{ path: '/demo',
path: '/index', name: 'demo',
name: 'index', component: demo,
component: index, },
meta: { {
'title':"MAGE Data Services", path: '/index',
'http-equiv':"X-UA-Compatible", name: 'index',
'content':'IE=Edge,chrome=1' component: index,
} meta: {
}, 'title': "MAGE Data Services",
'http-equiv': "X-UA-Compatible",
'content': 'IE=Edge,chrome=1'
{ }
path: '/viittoData', },
name: 'viittoData',
component: viittoData,
}, {
{ path: '/viittoData',
path: '/viittoData2', name: 'viittoData',
name: 'viittoData2', component: viittoData,
component: viittoData2, },
}, {
{ path: '/viittoData2',
path: '/dataLook', name: 'viittoData2',
name: 'dataLook', component: viittoData2,
component: dataLook, },
}, {
{ path: '/dataLook',
path: '/saleDataLook', name: 'dataLook',
name: 'saleDataLook', component: dataLook,
component: saleDataLook, },
}, {
{ path: '/saleDataLook',
path: '/PerCompetition', name: 'saleDataLook',
name: 'PerCompetition', component: saleDataLook,
component: PerCompetition, },
}, {
{ path: '/PerCompetition',
path: '/ActivityBoard', name: 'PerCompetition',
name: 'ActivityBoard', component: PerCompetition,
component: ActivityBoard, },
}, {
{ path: '/ActivityBoard',
path: '/salesGuestList', name: 'ActivityBoard',
name: 'salesGuestList', component: ActivityBoard,
component: salesGuestList, },
}, {
{ path: '/salesGuestList',
path: '/saleGuestTable', name: 'salesGuestList',
name: 'saleGuestTable', component: salesGuestList,
component: saleGuestTable },
} {
] path: '/saleGuestTable',
}) name: 'saleGuestTable',
component: saleGuestTable
}
]
})
\ No newline at end of file
This diff is collapsed.
<template>
<div>
signalr connect
<div>
<div>{{showmsg}}</div>
<div>在线人数:{{online}}</div>
<div>签到:{{sigin}}</div>
<input v-model="value" placeholder="请输入..." />
<Button type="info" @click="sendMsg">信息按钮</Button>
</div>
</div>
</template>
<script>
export default {
data() {
return {
value: "",
showmsg: "222",
proxy: {},
online:'0',
sigin:""
};
},
mounted() {
var $this = this;
$this.connectServer();
},
methods: {
connectServer() {
var $this = this;
var conn = $.hubConnection("http://localhost:7838/signalr", {
qs: `i=10086&n=罗超&p=${encodeURIComponent(
"http://imgfile.oytour.com/New/Upload/User/20191018150051176.png"
)}`
});
$this.proxy = conn.createHubProxy("annualLeaveHub");
$this.getMsg();
conn
.start()
.done(data => {
$this.sendMsg();
})
.fail(data => {});
},
sendMsg() {
var $this = this;
$this.proxy.invoke("Hello", $this.value).done(msg => {
console.log(msg)
});
},
getMsg() {
var $this = this;
$this.proxy.on("clientMethod", data => {
$this.showmsg = data;
});
$this.proxy.on("updateUsersOnlineCount",data=>{
$this.online = data;
})
$this.proxy.on("notifySignin", data=>{
console.log('1231231231')
$this.sigin=data
})
}
}
};
</script>
\ No newline at end of file
var webpack = require('webpack')
module.exports = { module.exports = {
configureWebpack: { configureWebpack: {
resolve: { resolve: {
alias: { alias: {
'assets': '@/assets', 'assets': '@/assets',
'components': '@/components', 'components': '@/components',
'views': '@/views', 'views': '@/views',
} }
}, },
externals: [ plugins: [
'BMap' new webpack.ProvidePlugin({
] $: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery',
'root.jQuery': 'jquery'
})
],
externals: [
'BMap'
]
}, },
} }
\ No newline at end of file \ No newline at end of file
...@@ -3716,6 +3716,11 @@ joi@^13.0.0: ...@@ -3716,6 +3716,11 @@ joi@^13.0.0:
isemail "3.x.x" isemail "3.x.x"
topo "3.x.x" topo "3.x.x"
jquery@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
js-md5@^0.7.3: js-md5@^0.7.3:
version "0.7.3" version "0.7.3"
resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2" resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"
......
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