From 134377316d7e2ee5913649101ac063746f9bb69e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 26 十二月 2023 14:49:31 +0800
Subject: [PATCH] 1.车间综合 100%
---
vue.config.js | 4
src/views/kb/all.vue | 279 +++++++++++++++++++---------------
src/utils/myEcharts.js | 196 ++++++++++++++++++-----
3 files changed, 307 insertions(+), 172 deletions(-)
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index 6964f24..94c7eb2 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -101,19 +101,19 @@
data: salvProValue
},
- {
- name: '鑳屾櫙',
- type: 'bar',
- barWidth: 15,
- barGap: '-100%',
- data: Value,
- itemStyle: {
- normal: {
- color: `rgba(${color[1]},0.8)`,
- barBorderRadius: 30
- }
+ {
+ name: '鑳屾櫙',
+ type: 'bar',
+ barWidth: 15,
+ barGap: '-100%',
+ data: Value,
+ itemStyle: {
+ normal: {
+ color: `rgba(${color[1]},0.8)`,
+ barBorderRadius: 30
}
}
+ }
]
}
@@ -358,9 +358,9 @@
// const titlename = ['澶栬鍒掍激', '琛ㄩ潰娌规薄', '灏哄', '棰滆壊', '澶у皬']
// const data = val.map(i => i.cont)
// const titlename = val.map(i => i.name)
- const data = dataArr.filter((item, index) => index < 5)
+ const data = dataArr.filter((item, index) => index < 10)
- const titlename = titlenameArr.filter((item, index) => index < 5)
+ const titlename = titlenameArr.filter((item, index) => index < 10)
const length = titlename.length
if (titlename.length < 5) {
@@ -373,7 +373,10 @@
// const myColor = ['#FF0000', '#FF5511', '#FF8800', '#FFBB00', '#FFFF00']
// const myColor = ['#0000FF']
// const myColor = ['#7af5f5', '#00FFFF', '#00FFFF', '#00FFFF', '#00FFFF']
- const myColor = ['rgba(122,245,245,1)', 'rgba(122,245,245,0.95)', 'rgba(122,245,245,0.9)', 'rgba(122,245,245,0.85)', 'rgba(122,245,245,0.8)']
+ const myColor = [
+ 'rgba(122,245,245,1)', 'rgba(122,245,245,0.95)', 'rgba(122,245,245,0.9)', 'rgba(122,245,245,0.85)', 'rgba(122,245,245,0.8)',
+ 'rgba(122,245,245,0.75)', 'rgba(122,245,245,0.7)', 'rgba(122,245,245,0.65)', 'rgba(122,245,245,0.6)', 'rgba(122,245,245,0.55)'
+ ]
const option = {
animation: false,
backgroundColor: 'transparent',
@@ -1040,10 +1043,10 @@
offset: 0,
color: 'rgba(0,154,120,1)'
},
- {
- offset: 1,
- color: 'rgba(0,0,0, 0)'
- }
+ {
+ offset: 1,
+ color: 'rgba(0,0,0, 0)'
+ }
], false),
shadowColor: 'rgba(53,142,215, 0.9)', // 闃村奖棰滆壊
shadowBlur: 20 // shadowBlur璁惧浘褰㈤槾褰辩殑妯＄硦澶у皬銆傞厤鍚坰hadowColor,shadowOffsetX/Y, 璁剧疆鍥惧舰鐨勯槾褰辨晥鏋溿��
@@ -1868,17 +1871,17 @@
var color = ['#00ffff', '#ff5b00', '#006ced', '#ffe000', '#ffa800', '#ff3000']
for (var i = 0; i < scaleData.length; i++) {
data.push({
- value: scaleData[i].value,
- name: scaleData[i].name,
- itemStyle: {
- normal: {
- borderWidth: 5,
- shadowBlur: 20,
- borderColor: color[i],
- shadowColor: color[i]
- }
+ value: scaleData[i].value,
+ name: scaleData[i].name,
+ itemStyle: {
+ normal: {
+ borderWidth: 5,
+ shadowBlur: 20,
+ borderColor: color[i],
+ shadowColor: color[i]
}
}
+ }
)
}
var seriesObj = [{
@@ -1964,17 +1967,17 @@
var color = ['#00ffff', '#ff3000', '#ffe000', '#ffa800', '#ff5b00']
for (var i = 0; i < scaleData.length; i++) {
data.push({
- value: scaleData[i].value,
- name: scaleData[i].name,
- itemStyle: {
- normal: {
- borderWidth: 5,
- shadowBlur: 20,
- borderColor: color[i],
- shadowColor: [i]
- }
+ value: scaleData[i].value,
+ name: scaleData[i].name,
+ itemStyle: {
+ normal: {
+ borderWidth: 5,
+ shadowBlur: 20,
+ borderColor: color[i],
+ shadowColor: [i]
}
}
+ }
)
}
var seriesObj = [{
@@ -2960,12 +2963,12 @@
return option
}
-export function all02(data) {
+export function all02(data, title) {
return {
backgroundColor: 'transparent',
// tooltip: {},
title: {
- text: '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺',
+ text: title,
left: '50%',
top: '0%',
textAlign: 'center',
@@ -3094,10 +3097,10 @@
offset: 0,
color: 'rgba(0,154,120,1)'
},
- {
- offset: 1,
- color: 'rgba(0,0,0, 0)'
- }
+ {
+ offset: 1,
+ color: 'rgba(0,0,0, 0)'
+ }
], false),
shadowColor: 'rgba(53,142,215, 0.9)', // 闃村奖棰滆壊
shadowBlur: 20 // shadowBlur璁惧浘褰㈤槾褰辩殑妯＄硦澶у皬銆傞厤鍚坰hadowColor,shadowOffsetX/Y, 璁剧疆鍥惧舰鐨勯槾褰辨晥鏋溿��
@@ -3127,10 +3130,10 @@
offset: 0,
color: 'rgba(0,154,120,1)'
},
- {
- offset: 1,
- color: 'rgba(0,0,0, 0)'
- }
+ {
+ offset: 1,
+ color: 'rgba(0,0,0, 0)'
+ }
], false),
shadowColor: 'rgba(53,142,215, 0.9)', // 闃村奖棰滆壊
shadowBlur: 20 // shadowBlur璁惧浘褰㈤槾褰辩殑妯＄硦澶у皬銆傞厤鍚坰hadowColor,shadowOffsetX/Y, 璁剧疆鍥惧舰鐨勯槾褰辨晥鏋溿��
@@ -3162,3 +3165,104 @@
]
}
}
+
+export function all03(ydata, data) {
+ const option = {
+ backgroundColor: 'transparent',
+ // tooltip: {
+ // formatter: '{b} ({c})'
+ // },
+ title: {
+ text: '鍚勮溅闂村綋鏈堝畬宸ユ暟閲�',
+ left: '50%',
+ top: '0%',
+ textAlign: 'center',
+ textStyle: {
+ // color: '#fff',
+ color: '#00ffff',
+ fontSize: '20',
+ fontWeight: 'bolder'
+ }
+ },
+ grid: {
+ left: '8%',
+ right: '8%',
+ bottom: '10%',
+ top: '15%',
+ containLabel: true
+ },
+ xAxis: [{
+ // gridIndex: 0,
+ axisTick: {
+ show: false
+ },
+ axisLabel: {
+ show: false
+ },
+ splitLine: {
+ show: false
+ },
+ axisLine: {
+ show: false
+ }
+
+ }],
+ yAxis: [{
+ gridIndex: 0,
+ interval: 0,
+ // data: yAxisData.reverse(),
+ data: ydata.reverse(),
+ axisTick: {
+ show: false
+ },
+ axisLabel: {
+ show: true,
+ textStyle: {
+ fontSize: 18,
+ color: colorX
+ }
+ },
+ splitLine: {
+ show: false
+ },
+ axisLine: {
+ show: false
+ }
+
+ }],
+ series: [
+ {
+ type: 'bar',
+ xAxisIndex: 0,
+ yAxisIndex: 0,
+ barWidth: '45%',
+ itemStyle: {
+ normal: {
+ barBorderRadius: 15,
+ color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+ offset: 0,
+ color: 'rgba(0,255,205,.6)'
+ }, {
+ offset: 0.8,
+
+ color: 'rgba(41,134,207,1)'
+ }], false)
+ }
+ },
+ label: {
+ normal: {
+ show: true,
+ position: 'right',
+ textStyle: {
+ color: colorX
+ },
+ fontSize: 18
+ }
+ },
+ data: data.map(i => i.quantity).reverse()
+ }
+
+ ]
+ }
+ return option
+}
diff --git a/src/views/kb/all.vue b/src/views/kb/all.vue
index c492744..e1e54bc 100644
--- a/src/views/kb/all.vue
+++ b/src/views/kb/all.vue
@@ -27,26 +27,29 @@
<svg-icon icon-class="blcs" class="svg_class" />
閲囪喘璁㈠崟(鏈�/瀛�)
</div>
- <div class="lineContent horn" style="height: 450px;display: flex;flex-direction: column;justify-content: space-between">
- <div style="height: 180px;padding: 10px;display: flex;justify-content: space-evenly">
+ <div
+ class="lineContent horn"
+ style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
+ >
+ <div style="height: 180px;padding: 10px;display: flex;justify-content: space-between">
- <div v-for="i in LeftTopData01" :key="i.wkshp_code" class="flex_c_s">
- <div class="all_block01 flex_c_s">
- <div class="flex_c_c all_block02">{{ i.wkshp_name }}</div>
+ <div v-for="i in LeftTopData01" :key="i.Quarter" class="flex_c_s">
+ <div class="all_block03 flex_c_s">
+ <div class="flex_c_c all_block04">{{ i.Quarter }}</div>
<div class="" style="display: flex;justify-content:space-between">
- <div class="all_block02 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
- <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.plan_qty }}</div>
+ <div class="all_block04 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
+ <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.quantity }}</div>
</div>
<div class="" style="display: flex;justify-content:space-between">
- <div class="all_block02 flex_c_c" style="width: 49% ">瀹屽伐鏁�</div>
- <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.good_qty }}</div>
+ <div class="all_block04 flex_c_c" style="width: 49% ">鍏ュ簱鏁�</div>
+ <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.ouquantity }}</div>
</div>
</div>
</div>
</div>
<div style="height: 260px;">
- <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />
+ <div id="all02_1" class="flex_c_c" style="width: 100%;height:100%;" />
</div>
</div>
</div>
@@ -55,7 +58,10 @@
<svg-icon icon-class="cggz" class="svg_class" />
閿�鍞鍗�(鏈�/瀛�)
</div>
- <div class="lineContent horn" style="height: 450px;display: flex;flex-direction: column;justify-content: space-between">
+ <div
+ class="lineContent horn"
+ style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
+ >
<div style="height: 180px;padding: 10px;display: flex;justify-content: space-between">
<div v-for="i in RightTopData01" :key="i.Quarter" class="flex_c_s">
@@ -86,10 +92,13 @@
<svg-icon icon-class="cxjg" class="svg_class" />
鐢熶骇璁㈠崟(褰撴湀)
</div>
- <div class="lineContent horn" style="height: 380px;display: flex;flex-direction: column;justify-content: space-between">
+ <div
+ class="lineContent horn"
+ style="height: 380px;display: flex;flex-direction: column;justify-content: space-between"
+ >
<div style="height: 180px;padding: 10px;display: flex;justify-content:space-evenly">
- <div v-for="i in LeftTopData01" :key="i.wkshp_code" class="flex_c_s">
+ <div v-for="i in LeftBottomData01" :key="i.wkshp_code" class="flex_c_s">
<div class="all_block01 flex_c_s">
<div class="flex_c_c all_block02">{{ i.wkshp_name }}</div>
<div class="" style="display: flex;justify-content:space-between">
@@ -105,7 +114,7 @@
</div>
<div style="height: 260px;">
- <!-- <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />-->
+ <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />
</div>
</div>
</div>
@@ -143,11 +152,9 @@
<script>
import './kbCommon.css'
-import { loadEcharts, all01, all02, cjzl03 } from '@/utils/myEcharts'
+import { loadEcharts, all02, all03 } from '@/utils/myEcharts'
import {
- QCBadCenterLeftWeek,
- WorkShopCompreLeftTop, WorkShopCompreRightBottom, WorkShopCompreRightTop
-
+ WorkShopCompreLeftBottom, WorkShopCompreLeftTop, WorkShopCompreRightBottom, WorkShopCompreRightTop
} from '@/api/kanbanManager'
export default {
@@ -164,8 +171,10 @@
RightTopData01: [],
RightTopData02: [],
- cjzl03_xData: [],
- cjzl03_yData: [],
+
+ LeftBottomData01: [],
+ LeftBottomData02: [],
+
RightBottom: {}
}
@@ -185,9 +194,9 @@
async getAllApi() {
// const { data: res } = await ShopSearch()
const res = [
- { org_code: 'CJ001', org_name: '绮惧伐杞﹂棿' },
- { org_code: '001', org_name: '瑁呴厤杞﹂棿' },
- { org_code: '002', org_name: '鍖呰杞﹂棿' }
+ { org_code: '501', org_name: '绮惧伐杞﹂棿' },
+ { org_code: '502', org_name: '瑁呴厤杞﹂棿' },
+ { org_code: '503', org_name: '鐢垫満杞﹂棿' }
]
this.wkshopArr = res
const temp = this.wkshopArr.map(i => i.org_code)
@@ -199,76 +208,45 @@
})
// 宸︿笂 閲囪喘璁㈠崟
- const res2 = await WorkShopCompreLeftTop({ wkshopcode: temp.join(',') })
- for (const res2Key in res2.data.LeftTop) {
- const data = {
- good_qty: 0,
- plan_qty: 0,
- wkshp_code: '',
- wkshp_name: ''
- }
- if (temp.includes(res2Key)) {
- data.good_qty = res2.data.LeftTop[res2Key][0].good_qty
- data.plan_qty = res2.data.LeftTop[res2Key][0].plan_qty
- data.wkshp_code = res2.data.LeftTop[res2Key][0].wkshp_code
- data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
- this.LeftTopData01.push(data)
- }
- }
- for (const res2Key in res2.data.LeftBottom) {
- const data = {
- quantity: 0,
- wkshp_code: '',
- wkshp_name: ''
- }
- if (temp.includes(res2Key)) {
- data.quantity = res2.data.LeftBottom[res2Key][0].quantity
- data.plan_qty = res2.data.LeftBottom[res2Key][0].plan_qty
- data.wkshp_code = res2.data.LeftBottom[res2Key][0].wkshp_code
- data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
- this.LeftTopData02.push(data)
- }
- }
- loadEcharts('all01', all01(this.legendData, this.LeftTopData02))
-
- setInterval(() => {
- WorkShopCompreLeftTop({ wkshopcode: temp.join(',') }).then(res2 => {
- this.LeftTopData01 = []
- this.LeftTopData02 = []
- for (const res2Key in res2.data.LeftTop) {
- const data = {
- good_qty: 0,
- plan_qty: 0,
- wkshp_code: '',
- wkshp_name: ''
- }
- if (temp.includes(res2Key)) {
- data.good_qty = res2.data.LeftTop[res2Key][0].good_qty
- data.plan_qty = res2.data.LeftTop[res2Key][0].plan_qty
- data.wkshp_code = res2.data.LeftTop[res2Key][0].wkshp_code
- data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
- this.LeftTopData01.push(data)
- }
- }
- for (const res2Key in res2.data.LeftBottom) {
- const data = {
- quantity: 0,
- wkshp_code: '',
- wkshp_name: ''
- }
- if (temp.includes(res2Key)) {
- data.quantity = res2.data.LeftBottom[res2Key][0].quantity
- data.plan_qty = res2.data.LeftBottom[res2Key][0].plan_qty
- data.wkshp_code = res2.data.LeftBottom[res2Key][0].wkshp_code
- data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
- this.LeftTopData02.push(data)
- }
- }
- loadEcharts('all01', all01(this.legendData, this.LeftTopData02))
+ const res2 = await WorkShopCompreLeftBottom()
+ res2.data.BottomLeftTop.forEach(i => {
+ this.LeftTopData01.push({
+ Quarter: i.Quarter,
+ quantity: i.quantity,
+ ouquantity: i.ouquantity
})
- }, 1000 * 30)
+ })
+ res2.data.BottomLeftBottom.forEach(i => {
+ this.LeftTopData02.push({
+ Month: i.Month + '鏈�',
+ quantity: i.quantity,
+ ouquantity: i.ouquantity
+ })
+ })
+ loadEcharts('all02_1', all02(this.LeftTopData02, '姣忔湀閲囪喘鏁伴噺/鍏ュ簱鏁伴噺'))
+ setInterval(() => {
+ this.LeftTopData01 = []
+ this.LeftTopData02 = []
+ WorkShopCompreLeftBottom().then(res2 => {
+ res2.data.BottomLeftTop.forEach(i => {
+ this.LeftTopData01.push({
+ Quarter: i.Quarter,
+ quantity: i.quantity,
+ ouquantity: i.ouquantity
+ })
+ })
+ res2.data.BottomLeftBottom.forEach(i => {
+ this.LeftTopData02.push({
+ Month: i.Month + '鏈�',
+ quantity: i.quantity,
+ ouquantity: i.ouquantity
+ })
+ })
+ loadEcharts('all02_1', all02(this.LeftTopData02, '姣忔湀閲囪喘鏁伴噺/鍏ュ簱鏁伴噺'))
+ })
+ }, 1000 * 35)
- // 宸︿笂 閿�鍞鍗�
+ // 鍙充笂 閿�鍞鍗�
const res3 = await WorkShopCompreRightTop()
res3.data.RightTop.forEach(i => {
this.RightTopData01.push({
@@ -284,7 +262,7 @@
ouquantity: i.ouquantity
})
})
- loadEcharts('all02', all02(this.RightTopData02))
+ loadEcharts('all02', all02(this.RightTopData02, '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺'))
setInterval(() => {
WorkShopCompreRightTop().then(res3 => {
this.RightTopData01 = []
@@ -303,33 +281,80 @@
ouquantity: i.ouquantity
})
})
- loadEcharts('all02', all02(this.RightTopData02))
+ loadEcharts('all02', all02(this.RightTopData02, '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺'))
})
}, 1000 * 40)
- // const res4 = await QCBadCenterLeftWeek({ wkshopcode: temp.join(',') })
- // this.cjzl03_xData = res4.data[temp[0]].map(i => i.click_date)
- // for (const res4Key in res4.data) {
- // if (temp.includes(res4Key)) {
- // const bb = res4.data[res4Key].map(i => i.count)
- // this.cjzl03_yData.push(bb)
- // }
- // }
- // loadEcharts('cjzl03', cjzl03(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
- // setInterval(() => {
- // QCBadCenterLeftWeek({ wkshopcode: temp.join(',') }).then(res4 => {
- // this.cjzl03_yData = []
- //
- // this.cjzl03_xData = res4.data[temp[0]].map(i => i.click_date)
- // for (const res4Key in res4.data) {
- // if (temp.includes(res4Key)) {
- // const bb = res4.data[res4Key].map(i => i.count)
- // this.cjzl03_yData.push(bb)
- // }
- // }
- // loadEcharts('cjzl03', cjzl03(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
- // })
- // }, 1000 * 50)
+ // 宸︿笅 鐢熶骇璁㈠崟
+ const res4 = await WorkShopCompreLeftTop({ wkshopcode: temp.join(',') })
+ for (const res4Key in res4.data.LeftTop) {
+ const data = {
+ good_qty: 0,
+ plan_qty: 0,
+ wkshp_code: '',
+ wkshp_name: ''
+ }
+ if (temp.includes(res4Key)) {
+ data.good_qty = res4.data.LeftTop[res4Key][0].good_qty
+ data.plan_qty = res4.data.LeftTop[res4Key][0].plan_qty
+ data.wkshp_code = res4.data.LeftTop[res4Key][0].wkshp_code
+ data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+ this.LeftBottomData01.push(data)
+ }
+ }
+ for (const res4Key in res4.data.LeftBottom) {
+ const data = {
+ quantity: 0,
+ wkshp_code: '',
+ wkshp_name: ''
+ }
+ if (temp.includes(res4Key)) {
+ data.quantity = res4.data.LeftBottom[res4Key][0].quantity
+ data.plan_qty = res4.data.LeftBottom[res4Key][0].plan_qty
+ data.wkshp_code = res4.data.LeftBottom[res4Key][0].wkshp_code
+ data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+ this.LeftBottomData02.push(data)
+ }
+ }
+ loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
+
+ setInterval(() => {
+ WorkShopCompreLeftTop({ wkshopcode: temp.join(',') }).then(res2 => {
+ this.LeftBottomData01 = []
+ this.LeftBottomData02 = []
+ for (const res4Key in res4.data.LeftTop) {
+ const data = {
+ good_qty: 0,
+ plan_qty: 0,
+ wkshp_code: '',
+ wkshp_name: ''
+ }
+ if (temp.includes(res4Key)) {
+ data.good_qty = res2.data.LeftTop[res4Key][0].good_qty
+ data.plan_qty = res2.data.LeftTop[res4Key][0].plan_qty
+ data.wkshp_code = res2.data.LeftTop[res4Key][0].wkshp_code
+ data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+ this.LeftBottomData01.push(data)
+ }
+ }
+ for (const res4Key in res2.data.LeftBottom) {
+ const data = {
+ quantity: 0,
+ wkshp_code: '',
+ wkshp_name: ''
+ }
+ if (temp.includes(res4Key)) {
+ data.quantity = res2.data.LeftBottom[res4Key][0].quantity
+ data.plan_qty = res2.data.LeftBottom[res4Key][0].plan_qty
+ data.wkshp_code = res2.data.LeftBottom[res4Key][0].wkshp_code
+ data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+ this.LeftBottomData02.push(data)
+ }
+ }
+ loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
+ })
+ }, 1000 * 30)
+
// 鍙充笅 浠撳簱搴撳瓨
const res5 = await WorkShopCompreRightBottom()
this.RightBottom = res5.data
@@ -430,21 +455,23 @@
background-color: transparent;
}
-.all_block01{
- width:187px;
+.all_block01 {
+ width: 187px;
height: 180px;
}
-.all_block02{
+
+.all_block02 {
width: 100%;
height: 49px;
background: rgba(9, 216, 242, 0.1);
}
-.all_block03{
- width:199px;
+.all_block03 {
+ width: 199px;
height: 180px;
}
-.all_block04{
+
+.all_block04 {
width: 100%;
height: 49px;
background: rgba(9, 216, 242, 0.1);
@@ -476,16 +503,19 @@
animation: upDown 3s ease-in-out infinite;
left: 60px;
}
-.all_block06{
+
+.all_block06 {
position: absolute;
animation: upDown2 3s ease-in-out infinite;
left: 290px;
}
-.all_block07{
+
+.all_block07 {
position: absolute;
animation: upDown 3s ease-in-out infinite;
left: 520px;
}
+
@keyframes upDown {
0% {
top: 50px;
@@ -497,6 +527,7 @@
top: 50px;
}
}
+
@keyframes upDown2 {
0% {
top: 100px;
diff --git a/vue.config.js b/vue.config.js
index 2196d9b..c92ff60 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -39,8 +39,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8029', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- // target: 'http://192.168.110.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�
+ // target: 'http://121.196.36.24:8029', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ target: 'http://192.168.0.111:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3