Skip to content

F
FTT_Board
Commit 8166a3c8 authored by 刘飞's avatar 刘飞
Browse files
Options

优化

parent 744cc1fb
Show whitespace changes
Inline Side-by-side
Showing with 995 additions and 451 deletions
FTT.Board.VueUI/package-lock.json
View file @ 8166a3c8
......@@ -348,6 +348,14 @@
"integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=",
"dev": true
},
"axios": {
"version": "0.21.0",
"resolved": "https://registry.npm.taobao.org/axios/download/axios-0.21.0.tgz",
"integrity": "sha1-Jt8IiAOiNQ3/LCf5b++Z/klEKso=",
"requires": {
"follow-redirects": "^1.10.0"
}
},
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
......@@ -2788,6 +2796,14 @@
"entities": "^1.1.1"
}
},
"dom7": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/dom7/download/dom7-3.0.0.tgz",
"integrity": "sha1-uGHOXWemvs16qjrQKUL/FLEkAzE=",
"requires": {
"ssr-window": "^3.0.0-alpha.1"
}
},
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
......@@ -3572,8 +3588,7 @@
"follow-redirects": {
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
"integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
"dev": true
"integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
},
"for-in": {
"version": "1.0.2",
......@@ -10360,6 +10375,11 @@
"tweetnacl": "~0.14.0"
}
},
"ssr-window": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/ssr-window/download/ssr-window-3.0.0.tgz",
"integrity": "sha1-/VuCgBY4lD4MxwTEaRgBQ1r3rDc="
},
"ssri": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
......@@ -10670,6 +10690,15 @@
}
}
},
"swiper": {
"version": "6.3.5",
"resolved": "https://registry.npm.taobao.org/swiper/download/swiper-6.3.5.tgz",
"integrity": "sha1-dES2gND9r+hIWYJaw1WbWwG9GRY=",
"requires": {
"dom7": "^3.0.0-alpha.7",
"ssr-window": "^3.0.0-alpha.4"
}
},
"tapable": {
"version": "0.2.9",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
......@@ -11162,6 +11191,12 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
"integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
},
"vue-awesome-swiper": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/vue-awesome-swiper/download/vue-awesome-swiper-4.1.1.tgz",
"integrity": "sha1-j3qyIa0AMCHXVrhqphj0KZJJAP4=",
"dev": true
},
"vue-drag-resize": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/vue-drag-resize/-/vue-drag-resize-1.3.2.tgz",
......
FTT.Board.VueUI/package.json
View file @ 8166a3c8
......@@ -14,11 +14,12 @@
"echarts": "^4.2.1",
"element-ui": "^2.11.1",
"moment": "^2.24.0",
"swiper": "^6.3.5",
"uglifyjs-webpack-plugin": "^1.0.0",
"vue": "^2.5.2",
"vue-drag-resize": "^1.3.2",
"vue-router": "^3.0.1",
"vue-seamless-scroll": "^1.1.16"
"vue-seamless-scroll": "^1.1.21"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
......@@ -55,6 +56,7 @@
"style-loader": "^1.2.1",
"stylus-loader": "^3.0.2",
"url-loader": "^0.5.8",
"vue-awesome-swiper": "^4.1.1",
"vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
......
FTT.Board.VueUI/src/App.vue
View file @ 8166a3c8
......@@ -63,7 +63,4 @@ html {
html::-webkit-scrollbar {
width: 0px;
}
#app div{
/* overflow: hidden; */
}
</style>
FTT.Board.VueUI/src/components/view/HtmlPanel.vue 0 → 100644
View file @ 8166a3c8
<template>
<div>
<!-- <mu-circular-progress :size="40" v-if="loading"/> -->
<div v-html="html"></div>
</div>
</template>
<script>
export default{
// 使用时请使用 :url.sync=""传值
props: {
url: {
required: true
}
},
data () {
return {
loading: false,
html: ''
}
},
watch: {
url (value) {
this.load(value)
}
},
mounted () {
this.load(this.url)
},
methods: {
load (url) {
if (url && url.length > 0) {
// 加载中
this.loading = true
let param = {
accept: 'text/html, text/plain'
}
this.$http.get(url, param).then((response) => {
this.loading = false
// 处理HTML显示
this.html = response.data
}).catch(() => {
this.loading = false
this.html = '加载失败'
})
}
}
}
}
</script>
\ No newline at end of file
FTT.Board.VueUI/src/main.js
View file @ 8166a3c8
......@@ -37,6 +37,13 @@ import echarts from 'echarts'
Vue.use(echarts)
Vue.prototype.echarts = echarts
import VueAwesomeSwiper from 'vue-awesome-swiper'
// import 'swiper/dist/css/swiper.css'
import 'swiper/swiper-bundle.min.css'
Vue.use(VueAwesomeSwiper, /* { default options with global component } */)
Vue.prototype.__defaultErrorHandlder = function (code, message) {
let msg = '';
console.log(message);
......@@ -86,11 +93,11 @@ Vue.prototype.__defaultErrorHandlder = function (code, message) {
});
}
Vue.prototype.jsController = function(){
JsControllerObj.CsExecuter("StartReadRFID",'ComReadCardCallBack')
Vue.prototype.jsController = function () {
JsControllerObj.CsExecuter("StartReadRFID", 'ComReadCardCallBack')
}
function ComReadCardCallBack(data){
function ComReadCardCallBack(data) {
console.log(data);
}
......
FTT.Board.VueUI/src/views/board/chartDemoList/index.vue
View file @ 8166a3c8
<template>
<div>
<el-row :gutter="20">
<el-col :span="4" v-for="(o) in 6" :key="o">
<el-col :span="4" v-for="o in 6" :key="o">
<el-card :body-style="{ padding: '0px' }">
<el-image :src="url" :fit="fit" :preview-src-list="srcList" lazy></el-image>
<el-image
:src="url"
:fit="fit"
:preview-src-list="srcList"
lazy
></el-image>
<!-- <img src="../../../assets/image/chartDemo1.png" class="image"> -->
<div style="padding: 14px;">
......@@ -11,394 +16,567 @@
<div class="bottom clearfix">
<time class="time">描述描述描述dsfddddddddddddd...</time>
<div style="height: 10px;"></div>
<el-button type="primary" style="float: right;" @click="goDemo(o)">编辑</el-button>
<el-button type="primary" style="float: right;" @click="goDemo(o)"
>编辑</el-button
>
</div>
</div>
</el-card>
</el-col>
</el-row>
<div id="demo" style="width: 600px;height:400px;">111</div>
<!-- <div id="demo" style="width: 600px;height:400px;">111</div> -->
<!-- <div class="container">
<div class="ul" height="160px">
<div class="li">小刘同学加入了凹凸实验室</div>
<div class="li">小邓同学加入了凹凸实验室</div>
<div class="li">小李同学加入了凹凸实验室</div>
<div class="li">小王同学加入了凹凸实验室</div>
<div class="li">小刘同学加入了凹凸实验室</div>
</div>
</div> -->
<vue-seamless-scroll
:data="CardPartsStatisticsList"
class="seamless-warp"
:class-option="classOption"
>
<ul>
<li
class="DataList_top"
v-for="(item, index) in CardPartsStatisticsList"
:key="index"
>
<span class="DataList_left">{{ index + 1 }}</span>
<span class="DataList_left">{{ item.itemname }}</span>
<span class="DataList_left">{{ item.number }}</span>
</li>
</ul>
</vue-seamless-scroll>
</div>
</template>
<script>
var echarts = require("echarts");
export default {
import vueSeamlessScroll from "vue-seamless-scroll";
var echarts = require("echarts");
export default {
data() {
return {
url: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
fit: 'contain',
url:
"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
fit: "contain",
srcList: [
'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
"https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg",
"https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg"
],
CardPartsStatisticsList: [
{
itemname: "asd",
number: 1
},
{
itemname: "sdf",
number: 2
},
{
itemname: "rtryh",
number: 3
},
{
itemname: "asrtuyikd",
number: 4
},
{
itemname: "ahgjghjiksd",
number: 5
},
{
itemname: "test",
number: 6
}
]
};
},
components: {
vueSeamlessScroll
},
computed: {
classOption() {
return {
step: 0.2, // 数值越大速度滚动越快
limitMoveNum: 2, // 开始无缝滚动的数据量 this.dataList.length
hoverStop: false, // 是否开启鼠标悬停stop
direction: 1, // 0向下 1向上 2向左 3向右
openWatch: false, // 开启数据实时监控刷新dom
singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
};
}
},
mounted() {
this.chart()
this.chart();
},
methods: {
chart() {
var myChart = echarts.init(document.getElementById('demo'));
var myChart = echarts.init(document.getElementById("demo"));
var geoCoordMap = {
'新疆玛纳斯基地': [86.22, 44.30],
'九江': [116.00, 29.70],
'新乡': [116.402217, 35.311657],
' ': [79.92, 37.12],
' ': [86.85, 47.70],
'若羌县': [88.17, 39.02],
'上海': [121.4648, 31.2891],
'东莞': [113.8953, 22.901],
'东营': [118.7073, 37.5513],
'中山': [113.4229, 22.478],
'临汾': [111.4783, 36.1615],
'临沂': [118.3118, 35.2936],
'丹东': [124.541, 40.4242],
'丽水': [119.5642, 28.1854],
'乌鲁木齐': [87.9236, 43.5883],
'佛山': [112.8955, 23.1097],
'保定': [115.0488, 39.0948],
'兰州': [103.5901, 36.3043],
'包头': [110.3467, 41.4899],
'北京': [116.4551, 40.2539],
'北海': [109.314, 21.6211],
'南京': [118.8062, 31.9208],
'南宁': [108.479, 23.1152],
'南昌': [116.0046, 28.6633],
'南通': [121.1023, 32.1625],
'厦门': [118.1689, 24.6478],
'台州': [121.1353, 28.6688],
'合肥': [117.29, 32.0581],
'呼和浩特': [111.4124, 40.4901],
'咸阳': [108.4131, 34.8706],
'哈尔滨': [127.9688, 45.368],
'唐山': [118.4766, 39.6826],
'嘉兴': [120.9155, 30.6354],
'大同': [113.7854, 39.8035],
'大连': [122.2229, 39.4409],
'天津': [117.4219, 39.4189],
'太原': [112.3352, 37.9413],
'威海': [121.9482, 37.1393],
'宁波': [121.5967, 29.6466],
'宝鸡': [107.1826, 34.3433],
'宿迁': [118.5535, 33.7775],
'常州': [119.4543, 31.5582],
'广州': [113.5107, 23.2196],
'廊坊': [116.521, 39.0509],
'延安': [109.1052, 36.4252],
'张家口': [115.1477, 40.8527],
'徐州': [117.5208, 34.3268],
'德州': [116.6858, 37.2107],
'惠州': [114.6204, 23.1647],
'成都': [103.9526, 30.7617],
'扬州': [119.4653, 32.8162],
'承德': [117.5757, 41.4075],
'拉萨': [91.1865, 30.1465],
'无锡': [120.3442, 31.5527],
'日照': [119.2786, 35.5023],
'昆明': [102.9199, 25.4663],
'杭州': [119.5313, 29.8773],
'枣庄': [117.323, 34.8926],
'柳州': [109.3799, 24.9774],
'株洲': [113.5327, 27.0319],
'武汉': [114.3896, 30.6628],
'汕头': [117.1692, 23.3405],
'江门': [112.6318, 22.1484],
'沈阳': [123.1238, 42.1216],
'沧州': [116.8286, 38.2104],
'河源': [114.917, 23.9722],
'泉州': [118.3228, 25.1147],
'泰安': [117.0264, 36.0516],
'泰州': [120.0586, 32.5525],
'济南': [117.1582, 36.8701],
'济宁': [116.8286, 35.3375],
'海口': [110.3893, 19.8516],
'淄博': [118.0371, 36.6064],
'淮安': [118.927, 33.4039],
'深圳': [114.5435, 22.5439],
'清远': [112.9175, 24.3292],
'温州': [120.498, 27.8119],
'渭南': [109.7864, 35.0299],
'湖州': [119.8608, 30.7782],
'湘潭': [112.5439, 27.7075],
'滨州': [117.8174, 37.4963],
'潍坊': [119.0918, 36.524],
'烟台': [120.7397, 37.5128],
'玉溪': [101.9312, 23.8898],
'珠海': [113.7305, 22.1155],
'盐城': [120.2234, 33.5577],
'盘锦': [121.9482, 41.0449],
'石家庄': [114.4995, 38.1006],
'福州': [119.4543, 25.9222],
'秦皇岛': [119.2126, 40.0232],
'绍兴': [120.564, 29.7565],
'聊城': [115.9167, 36.4032],
'肇庆': [112.1265, 23.5822],
'舟山': [122.2559, 30.2234],
'苏州': [120.6519, 31.3989],
'莱芜': [117.6526, 36.2714],
'菏泽': [115.6201, 35.2057],
'营口': [122.4316, 40.4297],
'葫芦岛': [120.1575, 40.578],
'衡水': [115.8838, 37.7161],
'衢州': [118.6853, 28.8666],
'西宁': [101.4038, 36.8207],
'西安': [109.1162, 34.2004],
'贵阳': [106.6992, 26.7682],
'连云港': [119.1248, 34.552],
'邢台': [114.8071, 37.2821],
'邯郸': [114.4775, 36.535],
'郑州': [113.4668, 34.6234],
'鄂尔多斯': [108.9734, 39.2487],
'重庆': [107.7539, 30.1904],
'金华': [120.0037, 29.1028],
'铜川': [109.0393, 35.1947],
'银川': [106.3586, 38.1775],
'镇江': [119.4763, 31.9702],
'长春': [125.8154, 44.2584],
'长沙': [113.0823, 28.2568],
'长治': [112.8625, 36.4746],
'阳泉': [113.4778, 38.0951],
'青岛': [120.4651, 36.3373],
'韶关': [113.7964, 24.7028]
新疆玛纳斯基地: [86.22, 44.3],
九江: [116.0, 29.7],
新乡: [116.402217, 35.311657],
" ": [79.92, 37.12],
" ": [86.85, 47.7],
若羌县: [88.17, 39.02],
上海: [121.4648, 31.2891],
东莞: [113.8953, 22.901],
东营: [118.7073, 37.5513],
中山: [113.4229, 22.478],
临汾: [111.4783, 36.1615],
临沂: [118.3118, 35.2936],
丹东: [124.541, 40.4242],
丽水: [119.5642, 28.1854],
乌鲁木齐: [87.9236, 43.5883],
佛山: [112.8955, 23.1097],
保定: [115.0488, 39.0948],
兰州: [103.5901, 36.3043],
包头: [110.3467, 41.4899],
北京: [116.4551, 40.2539],
北海: [109.314, 21.6211],
南京: [118.8062, 31.9208],
南宁: [108.479, 23.1152],
南昌: [116.0046, 28.6633],
南通: [121.1023, 32.1625],
厦门: [118.1689, 24.6478],
台州: [121.1353, 28.6688],
合肥: [117.29, 32.0581],
呼和浩特: [111.4124, 40.4901],
咸阳: [108.4131, 34.8706],
哈尔滨: [127.9688, 45.368],
唐山: [118.4766, 39.6826],
嘉兴: [120.9155, 30.6354],
大同: [113.7854, 39.8035],
大连: [122.2229, 39.4409],
天津: [117.4219, 39.4189],
太原: [112.3352, 37.9413],
威海: [121.9482, 37.1393],
宁波: [121.5967, 29.6466],
宝鸡: [107.1826, 34.3433],
宿迁: [118.5535, 33.7775],
常州: [119.4543, 31.5582],
广州: [113.5107, 23.2196],
廊坊: [116.521, 39.0509],
延安: [109.1052, 36.4252],
张家口: [115.1477, 40.8527],
徐州: [117.5208, 34.3268],
德州: [116.6858, 37.2107],
惠州: [114.6204, 23.1647],
成都: [103.9526, 30.7617],
扬州: [119.4653, 32.8162],
承德: [117.5757, 41.4075],
拉萨: [91.1865, 30.1465],
无锡: [120.3442, 31.5527],
日照: [119.2786, 35.5023],
昆明: [102.9199, 25.4663],
杭州: [119.5313, 29.8773],
枣庄: [117.323, 34.8926],
柳州: [109.3799, 24.9774],
株洲: [113.5327, 27.0319],
武汉: [114.3896, 30.6628],
汕头: [117.1692, 23.3405],
江门: [112.6318, 22.1484],
沈阳: [123.1238, 42.1216],
沧州: [116.8286, 38.2104],
河源: [114.917, 23.9722],
泉州: [118.3228, 25.1147],
泰安: [117.0264, 36.0516],
泰州: [120.0586, 32.5525],
济南: [117.1582, 36.8701],
济宁: [116.8286, 35.3375],
海口: [110.3893, 19.8516],
淄博: [118.0371, 36.6064],
淮安: [118.927, 33.4039],
深圳: [114.5435, 22.5439],
清远: [112.9175, 24.3292],
温州: [120.498, 27.8119],
渭南: [109.7864, 35.0299],
湖州: [119.8608, 30.7782],
湘潭: [112.5439, 27.7075],
滨州: [117.8174, 37.4963],
潍坊: [119.0918, 36.524],
烟台: [120.7397, 37.5128],
玉溪: [101.9312, 23.8898],
珠海: [113.7305, 22.1155],
盐城: [120.2234, 33.5577],
盘锦: [121.9482, 41.0449],
石家庄: [114.4995, 38.1006],
福州: [119.4543, 25.9222],
秦皇岛: [119.2126, 40.0232],
绍兴: [120.564, 29.7565],
聊城: [115.9167, 36.4032],
肇庆: [112.1265, 23.5822],
舟山: [122.2559, 30.2234],
苏州: [120.6519, 31.3989],
莱芜: [117.6526, 36.2714],
菏泽: [115.6201, 35.2057],
营口: [122.4316, 40.4297],
葫芦岛: [120.1575, 40.578],
衡水: [115.8838, 37.7161],
衢州: [118.6853, 28.8666],
西宁: [101.4038, 36.8207],
西安: [109.1162, 34.2004],
贵阳: [106.6992, 26.7682],
连云港: [119.1248, 34.552],
邢台: [114.8071, 37.2821],
邯郸: [114.4775, 36.535],
郑州: [113.4668, 34.6234],
鄂尔多斯: [108.9734, 39.2487],
重庆: [107.7539, 30.1904],
金华: [120.0037, 29.1028],
铜川: [109.0393, 35.1947],
银川: [106.3586, 38.1775],
镇江: [119.4763, 31.9702],
长春: [125.8154, 44.2584],
长沙: [113.0823, 28.2568],
长治: [112.8625, 36.4746],
阳泉: [113.4778, 38.0951],
青岛: [120.4651, 36.3373],
韶关: [113.7964, 24.7028]
};
var BJData = [
[{
name: '新乡'
}, {
name: '新乡',
[
{
name: "新乡"
},
{
name: "新乡",
value: 200
}],
[{
name: '新乡'
}, {
name: '呼和浩特',
}
],
[
{
name: "新乡"
},
{
name: "呼和浩特",
value: 90
}],
[{
name: '新乡'
}, {
name: '哈尔滨',
}
],
[
{
name: "新乡"
},
{
name: "哈尔滨",
value: 90
}],
[{
name: '新乡'
}, {
name: '石家庄',
}
],
[
{
name: "新乡"
},
{
name: "石家庄",
value: 90
}],
[{
name: '新乡'
}, {
name: '昆明',
}
],
[
{
name: "新乡"
},
{
name: "昆明",
value: 30
}],
[{
name: '新乡'
}, {
name: '北京',
}
],
[
{
name: "新乡"
},
{
name: "北京",
value: 100
}],
[{
name: '新乡'
}, {
name: '长春',
}
],
[
{
name: "新乡"
},
{
name: "长春",
value: 40
}],
[{
name: '新乡'
}, {
name: '重庆',
}
],
[
{
name: "新乡"
},
{
name: "重庆",
value: 40
}],
[{
name: '新乡'
}, {
name: '贵阳',
}
],
[
{
name: "新乡"
},
{
name: "贵阳",
value: 50
}],
[{
name: '新乡'
}, {
name: '南宁',
}
],
[
{
name: "新乡"
},
{
name: "南宁",
value: 30
}],
[{
name: '新乡'
}, {
name: '济南',
}
],
[
{
name: "新乡"
},
{
name: "济南",
value: 10
}],
[{
name: '新乡'
}, {
name: '太原',
}
],
[
{
name: "新乡"
},
{
name: "太原",
value: 40
}],
[{
name: '新乡'
}, {
name: '西安',
}
],
[
{
name: "新乡"
},
{
name: "西安",
value: 60
}],
[{
name: '新乡'
}, {
name: '武汉',
}
],
[
{
name: "新乡"
},
{
name: "武汉",
value: 50
}],
[{
name: '新乡'
}, {
name: '合肥',
}
],
[
{
name: "新乡"
},
{
name: "合肥",
value: 40
}],
[{
name: '新乡'
}, {
name: '南京',
}
],
[
{
name: "新乡"
},
{
name: "南京",
value: 30
}],
[{
name: '新乡'
}, {
name: '沈阳',
}
],
[
{
name: "新乡"
},
{
name: "沈阳",
value: 20
}],
[{
name: '新乡'
}, {
name: '成都',
}
],
[
{
name: "新乡"
},
{
name: "成都",
value: 10
}]
}
]
];
var SHData = [
[{
name: '九江'
}, {
name: '九江',
[
{
name: "九江"
},
{
name: "九江",
value: 200
}],
}
],
[{
name: '九江'
}, {
name: '长沙',
[
{
name: "九江"
},
{
name: "长沙",
value: 95
}],
[{
name: '九江'
}, {
name: '武汉',
}
],
[
{
name: "九江"
},
{
name: "武汉",
value: 30
}],
[{
name: '九江'
}, {
name: '南昌',
}
],
[
{
name: "九江"
},
{
name: "南昌",
value: 20
}],
[{
name: '九江'
}, {
name: '合肥',
}
],
[
{
name: "九江"
},
{
name: "合肥",
value: 70
}],
[{
name: '九江'
}, {
name: '南京',
}
],
[
{
name: "九江"
},
{
name: "南京",
value: 60
}],
[{
name: '九江'
}, {
name: '福州',
}
],
[
{
name: "九江"
},
{
name: "福州",
value: 50
}],
[{
name: '九江'
}, {
name: '上海',
}
],
[
{
name: "九江"
},
{
name: "上海",
value: 100
}],
[{
name: '九江'
}, {
name: '深圳',
}
],
[
{
name: "九江"
},
{
name: "深圳",
value: 100
}],
}
]
];
var GZData = [
[{
name: '新疆玛纳斯基地'
}, {
name: '新疆玛纳斯基地',
[
{
name: "新疆玛纳斯基地"
},
{
name: "新疆玛纳斯基地",
value: 200
}],
[{
name: '新疆玛纳斯基地'
}, {
name: ' ',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: " ",
value: 90
}],
[{
name: '新疆玛纳斯基地'
}, {
name: ' ',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: " ",
value: 40
}],
[{
name: '新疆玛纳斯基地'
}, {
name: '呼和浩特',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: "呼和浩特",
value: 90
}],
[{
name: '新疆玛纳斯基地'
}, {
name: '昆明',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: "昆明",
value: 40
}],
[{
name: '新疆玛纳斯基地'
}, {
name: '成都',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: "成都",
value: 10
}],
[{
name: '新疆玛纳斯基地'
}, {
name: '兰州',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: "兰州",
value: 95
}],
[{
name: '新疆玛纳斯基地'
}, {
name: '银川',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: "银川",
value: 90
}],
[{
name: '新疆玛纳斯基地'
}, {
name: '西宁',
}
],
[
{
name: "新疆玛纳斯基地"
},
{
name: "西宁",
value: 80
}],
}
]
];
var planePath =
'path://M.6,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705';
"path://M.6,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705";
var convertData = function(data) {
var res = [];
......@@ -407,32 +585,35 @@
var fromCoord = geoCoordMap[dataItem[0].name];
var toCoord = geoCoordMap[dataItem[1].name];
if (fromCoord && toCoord) {
res.push([{
res.push([
{
coord: fromCoord
}, {
},
{
coord: toCoord
}]);
}
]);
}
}
return res;
};
var color = ['#3ed4ff', '#ffa022', '#a6c84c'];
var color = ["#3ed4ff", "#ffa022", "#a6c84c"];
var series = [];
[
['新乡', BJData],
['九江', SHData],
['新疆', GZData]
].forEach(function(item, i) {
series.push({
name: item[0] + ' Top10',
type: 'lines',
[["新乡", BJData], ["九江", SHData], ["新疆", GZData]].forEach(function(
item,
i
) {
series.push(
{
name: item[0] + " Top10",
type: "lines",
zlevel: 1,
effect: {
show: true,
period: 6,
trailLength: 0.7,
color: '#fff',
color: "#fff",
symbolSize: 3
},
lineStyle: {
......@@ -443,9 +624,10 @@
}
},
data: convertData(item[1])
}, {
name: item[0] + ' Top10',
type: 'lines',
},
{
name: item[0] + " Top10",
type: "lines",
zlevel: 2,
effect: {
show: true,
......@@ -463,19 +645,20 @@
}
},
data: convertData(item[1])
}, {
name: item[0] + ' Top10',
type: 'effectScatter',
coordinateSystem: 'geo',
},
{
name: item[0] + " Top10",
type: "effectScatter",
coordinateSystem: "geo",
zlevel: 2,
rippleEffect: {
brushType: 'stroke'
brushType: "stroke"
},
label: {
normal: {
show: true,
position: 'right',
formatter: '{b}'
position: "right",
formatter: "{b}"
}
},
symbolSize: function(val) {
......@@ -492,34 +675,35 @@
value: geoCoordMap[dataItem[1].name].concat([dataItem[1].value])
};
})
});
}
);
});
var option = {
backgroundColor: '#080a20',
backgroundColor: "#080a20",
title: {
text: '模拟迁徙',
subtext: '数据纯属虚构',
left: 'left',
text: "模拟迁徙",
subtext: "数据纯属虚构",
left: "left",
textStyle: {
color: '#fff'
color: "#fff"
}
},
tooltip: {
trigger: 'item'
trigger: "item"
},
legend: {
orient: 'vertical',
top: 'bottom',
left: 'right',
data: ['北京 Top10', '上海 Top10', '广州 Top10'],
orient: "vertical",
top: "bottom",
left: "right",
data: ["北京 Top10", "上海 Top10", "广州 Top10"],
textStyle: {
color: '#fff'
color: "#fff"
},
selectedMode: 'single'
selectedMode: "single"
},
geo: {
map: 'china',
map: "china",
label: {
emphasis: {
show: false
......@@ -528,11 +712,11 @@
roam: true,
itemStyle: {
normal: {
areaColor: '#132937',
borderColor: '#0692a4'
areaColor: "#132937",
borderColor: "#0692a4"
},
emphasis: {
areaColor: '#0b1c2d'
areaColor: "#0b1c2d"
}
}
},
......@@ -541,38 +725,100 @@
myChart.setOption(option);
},
goDemo(n) {
console.log("我的ID是：" + n)
console.log("我的ID是：" + n);
this.$router.push("chartdemo");
}
},
}
};
</script>
<style>
.time {
<style lang="scss" scoped>
.seamless-warp {
width: 400px;
height: 400px;
overflow: hidden;
li{
height: 50px;
line-height: 50px;
color: #ffffff;
display: flex;
justify-content: space-between;
align-items: center;
&:nth-child(odd){
background-color: cornflowerblue;
}
&:nth-child(even){
background-color: deepskyblue;
}
span{
width: 20%;
text-align: center;
&:nth-child(2){
width: 60%;
}
}
}
}
@mixin middle {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
@keyframes scroll {
0% {
transform: translate(0, 0);
}
100% {
transform: translate(0, -160px);
}
}
.container {
// @include middle;
width: 220px;
// height: 40px;
background: #0066ff;
// border-radius: 2em;
overflow: hidden;
.ul {
animation-name: scroll;
animation-duration: 5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
// animation: scroll 5s linear infinite; 动画属性简写
}
.li {
width: 100%;
line-height: 40px;
verticle-align: bottom;
color: #fff;
text-align: center;
}
}
.time {
font-size: 13px;
color: #999;
}
}
.bottom {
.bottom {
margin-top: 13px;
line-height: 12px;
}
}
.image {
.image {
width: 100%;
display: block;
}
}
.clearfix:before,
.clearfix:after {
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
}
.clearfix:after {
clear: both
}
.clearfix:after {
clear: both;
}
</style>
FTT.Board.VueUI/src/views/machine/processSheet.vue
View file @ 8166a3c8
......@@ -55,7 +55,8 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
<span class="el-icon-search" @click="search"></span> -->
[序号]工序
<span>[序号]工序</span>
<button @click="getSOP(0)">款式SOP</button>
</div>
<div class="process_list">
<div
......@@ -125,13 +126,59 @@
<div class="none" v-if="detailList.length == 0">暂无数据...</div>
</div>
</div>
<el-dialog :visible.sync="centerDialogVisible" width="600px" center>
<swiper ref="mySwiper" :options="swiperOptions">
<swiper-slide v-for="(item, index) in imgArr" :key="index">
<img :src="item" alt="" />
<h3>{{ index + 1 }}/{{ imgArr.length }}</h3>
</swiper-slide>
</swiper>
</el-dialog>
<el-dialog
:visible.sync="sopDialogVisible"
width="100%"
center
:title="Name"
>
<div class="tab">
<div class="tab_list" v-for="(item, index) in tabList" :key="index">
<span
@click="tabChange(index)"
:class="{ active: tabIndex == index }"
>{{ item }}</span
>
</div>
</div>
<div class="sop_main">
<!-- <hPanel :url="url" v-if="url"></hPanel> -->
<iframe
v-if="url"
:src="url"
id="mobsf"
scrolling="no"
frameborder="0"
style="width:100%;height:450px"
></iframe>
<div class="none" v-else>该款式暂无SOP</div>
</div>
</el-dialog>
</div>
</template>
<script>
import qs from "qs";
import hPanel from "@/components/view/HtmlPanel";
export default {
components: {
hPanel
},
data() {
return {
swiperOptions: {
loop: true
},
centerDialogVisible: false, //控制弹窗的显示隐藏
sopDialogVisible: false, //sop弹窗显隐
imgArr: [],
options: [],
value: "",
checkIndex: -1,
......@@ -140,7 +187,15 @@ export default {
processList: [], //工序列表
inforList: [],
detailList: [],
userName: localStorage.getItem("$state") ? JSON.parse(localStorage.getItem("$state")).name : '',
tabList: ["裁断", "针车", "成型"],
tabIndex: 0,
// url:
// "http://jhdsoft.gicp.net:9203/hyerp/Cached/Sop/fffb44ad289f7e96f05de47b4631fb82.html",
url:'',
Name: "款式SOP",
userName: localStorage.getItem("$state")
? JSON.parse(localStorage.getItem("$state")).name
: "",
TitleList: [
"型体",
"工序号",
......@@ -174,14 +229,19 @@ export default {
if (command == "a") {
this.$cookie.delCookie("access_token");
this.$cookie.delCookie("host");
localStorage.removeItem('$state')
this.$router.push('login')
localStorage.removeItem("$state");
this.$router.push("login");
}
},
check(item, index) {
this.checkIndex = index;
this.getIEPictureInfo(item);
this.getIEReportInfo(item);
},
tabChange(index) {
this.tabIndex = index;
this.getSOP(index);
},
search() {
if (!this.value) {
this.$message({
......@@ -210,6 +270,70 @@ export default {
console.log(err);
});
},
getSOP(index) {
//获取SOP
if (!this.item.StyleCode) {
this.$message({
message: "请先选择指令单",
type: "warning"
});
return;
}
this.sopDialogVisible = true;
this.tabIndex = index;
let params = {
ReportType: index ? index : 0,
StyleCode: this.item.StyleCode
};
this.$http({
method: "post",
url: this.$cookie.getCookie("host") + "/api/vMES/Sop/StyleSop",
data: params
})
.then(res => {
if (res.success) {
this.Name = res.data.Name;
this.url = res.data.Url
}else{
this.Name = '款式SOP'
this.url = ''
}
})
.catch(err => {
console.log(err);
});
},
getIEPictureInfo(item) {
let params = {
IndexNo: this.value,
WorkSectionID: item.WorkSectionID,
IEType: item.IEType,
IEID: item.IEID
};
this.$http({
method: "post",
url:
this.$cookie.getCookie("host") +
"/api/vWSM/WorkStation/GetIEPictureInfo",
data: params
})
.then(res => {
if (res.success) {
if (res.items.length == 0) {
this.$message({
message: "该工序暂无工艺图片",
type: "warning"
});
} else {
this.centerDialogVisible = true;
this.imgArr = res.items;
}
}
})
.catch(err => {
console.log(err);
});
},
getIEDailyReportInfo() {
let params = {};
this.$http
......@@ -293,6 +417,7 @@ export default {
if (res.success) {
console.log(res);
this.item = res.data;
this.checkIndex = -1
}
})
.catch(err => {
......@@ -316,6 +441,21 @@ export default {
.el-icon-arrow-down {
font-size: 12px;
}
.el-dialog {
margin-top: 10vh !important;
}
.swiper-container {
overflow: hidden !important;
}
.swiper-slide {
width: 100%;
text-align: center;
img {
// height: 500px;
// max-width: 100%;
width: 100%;
}
}
.top {
width: 100%;
height: 60px;
......@@ -370,6 +510,17 @@ export default {
color: #ffffff;
cursor: pointer;
}
button {
width: 100px;
height: 35px;
background-color: #ffffff;
font-size: 18px;
outline: none;
border: none;
border-radius: 5px;
cursor: pointer;
font-weight: 400;
}
}
.process_list {
width: 100%;
......@@ -515,4 +666,41 @@ export default {
}
}
}
.tab {
width: 100%;
height: 50px;
display: flex;
justify-content: space-between;
align-items: center;
.tab_list {
font-size: 20px;
width: 33.4%;
text-align: center;
cursor: pointer;
span {
display: inline-block;
height: 50px;
box-sizing: border-box;
border-bottom: 2px solid transparent;
&.active {
color: #409eff;
border-bottom: 2px solid #409eff;
transition: all 0.3s ease-in-out;
}
}
}
}
.sop_main {
height: 450px;
&::-webkit-scrollbar {
display: none;
}
> div {
font-size: 18px;
&::-webkit-scrollbar {
display: none;
}
}
}
</style>
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