Skip to content

Z
zhongtong-avi-web
Commit 04d8a011 authored by 李志鸣's avatar 李志鸣
Browse files
Options

fix(冲突): 解决提交冲突

parents 13115ee0 b59f5bfc
Hide whitespace changes
Inline Side-by-side
Showing with 376 additions and 1 deletion
config/index.js
View file @ 04d8a011
......@@ -16,7 +16,8 @@ module.exports = {
// target: 'http://10.100.172.150:9108', // 设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.43.244:8888', // 东伟服务器地址
// target: 'http://192.168.43.153:8080', // 训浩服务器
target: 'http://10.100.172.30:8082', // 本地服务器
// target: 'http://10.100.172.23:8082', // 本地服务器
target: 'http://10.100.172.30:8082', // 本地服务器http://10.100.172.30:8082/
changeOrigin: true,
pathRewrite: {
'^/host': ''//这里理解成用‘/host’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
......
src/lang/zh/route.js
View file @ 04d8a011
......@@ -32,6 +32,7 @@ export default {
Pickling: '酸洗-磷化线槽液日常检测报告',
ElectrophoresisTank: '电泳槽液日常检测报告',
Pretreatment: '前处理槽液日常检测报告',
TrendchartOfTankParameters: '槽液参数趋势图',
// 烘干室温度
DryingRoomChart: '烘干室温度',
DryingRoomChartIndex: '烘干室温度',
......
src/router/modules/laboratory.js
View file @ 04d8a011
......@@ -22,6 +22,12 @@ export default {
component: () => import('@/views/Laboratory/Pretreatment/list'),
name: 'Pretreatment',
meta: { title: 'Pretreatment', icon: 'template', noCache: false, mark: '/laboratory/pretreatment/list' }
},
{
path: 'trendchartOfTankParameters',
component: () => import('@/views/Laboratory/Pretreatment/trendchartOfTankParameters'),
name: 'TrendchartOfTankParameters',
meta: { title: 'TrendchartOfTankParameters', icon: 'template', noCache: false, mark: '/laboratory/pretreatment/trendchartOfTankParameters' }
}
]
}
src/views/Laboratory/Pretreatment/components/ChartsLine.vue 0 → 100644
View file @ 04d8a011
<template>
<div class="chart-pack">
<div :id="sendData.id" class="chart">
</div>
</div>
</template>
<script>
import Echarts from 'echarts'
export default {
props: {
sendData: {
type: Object,
default: {}
}
},
data () {
return {
sampleCharts: ''
}
},
watch: {
sendData: {
handler (newVal, oldVal) {
this.renderEcharts();
},
deep: true
}
},
mounted () {
if (this.sendData.hasOwnProperty('id')) {
this.$nextTick(() => {
this.renderEcharts();
})
}
},
methods: {
renderEcharts () {
let domItem = document.getElementById(`${this.sendData.id}`);
this.sampleCharts = Echarts.init(domItem);
let data = this.sendData.value;
let top = this.sendData.top;
let down = this.sendData.down;
// this.sampleCharts.clear();
// echarts.dispose(domItem)
// let echart = echarts.init(domItem)
var charts = {
// unit: '户数',
names: ['进给轴倍率', '主轴负载']
// lineX:new Date(this.createTime).getTime(),
};
let opt = {
// title: {
// text: '折线图堆叠',
// textAlign: 'auto'
// },
tooltip: {
trigger: 'axis'
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
name: '日期',
type: 'category',
boundaryGap: false,
data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
nameTextStyle: {
// fontWeight: 'bold',
fontSize: 18,
color: 'red'
}
},
yAxis: {
type: 'value',
name: 'T/℃',
nameTextStyle: {
// fontWeight: 'bold',
fontSize: 18,
color: 'red'
}
},
series: [
{
name: '邮件营销',
type: 'line',
stack: '总量',
data: data,
markLine: {
label: {
show: true,
position: 'end'
},
itemStyle: {
normal: {
lineStyle: {
type: 'dashed',
color: 'red'
},
label: { show: true, position: 'end' }
}
},
silent: true,
data: [
{
yAxis: top
},
{
yAxis: down
}
]
}
}
]
};
this.sampleCharts.setOption(opt);
}
}
}
</script>
<style lang="scss" scoped>
.chart-pack {
height: 100%;
width: 100%;
.chart {
width: 100%;
height: 100%;
}
}
</style>
\ No newline at end of file
src/views/Laboratory/Pretreatment/trendchartOfTankParameters.vue 0 → 100644
View file @ 04d8a011
<template>
<div class="page-pack">
<div class="title-pack clear-float pl-15 pr-15">
<div class="float-left">
<span class="page-title-text">电泳槽液日常检测报告</span>
</div>
<div class="float-right page-refresh">
<span @click="doRefreshClick" class="pointer">
<svg-icon icon-class="refresh"></svg-icon>
<span class="ml-10">刷新</span>
</span>
</div>
</div>
<div class="tool-pack clear-float pl-15 pr-15">
<div
class="card-content-pack"
>
<div class="content">
<!-- 搜索栏 -->
<el-form
:inline="true"
class="demo-form-inline"
>
<el-form-item
class="timeForm"
label="统计时间"
>
<!-- format="23232323" -->
<el-date-picker
v-model="searchData.chooseMonDate"
type="month"
placeholder="选择月"
@change="yearMonthChange"
/>
</el-form-item>
<el-form-item
class="timeForm"
label="槽液类型"
>
<el-select v-model="searchData.normalBathSolution" @change="bathSolutionChange" placeholder="请选择槽液类型">
<el-option
v-for="item in searchData.bathSolution"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item
class="timeForm"
label="选择参数"
>
<el-select multiple v-model="searchData.normalArguments" :disabled="argumentSelecteStatus" placeholder="请选择参数">
<el-option
v-for="item in searchData.arguments"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="form-btn">
<el-button
size="small"
type="primary"
icon="el-icon-search"
@click="doSearchMonClick"
>搜索</el-button>
</el-form-item>
<el-form-item class="form-btn">
<el-button
size="small"
class="bt-class"
@click="resetMonClick"
>重置</el-button>
</el-form-item>
<el-form-item class="form-btn">
<el-button
size="small"
@click="exportHandle"
>
导出
</el-button>
</el-form-item>
</el-form>
<!-- 图表 -->
<!-- v-for="(item, index) in searchData.bathSolution" :key="index" -->
<div class="many_charts">
<div class="charts" v-for="(item, index) in searchData.bathSolution" :key="index" >
<div class="charts_title">{{'磷化槽液参数（FA、TA、AC、T、F-）变化趋势'}}</div>
<div class="charts_container">
<ChartsLine :sendData="item"></ChartsLine>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import ChartsLine from './components/ChartsLine'
export default {
name: 'TrendchartOfTankParameters',
components: {
ChartsLine
},
data () {
return {
// 搜索栏数据
searchData: {
// 当前显示的时间
chooseMonDate: '',
// 槽液类型
bathSolution: [
{
id: 1,
label: '电泳槽液',
value: [12, 78, 56, 90, 67, 56, 34],
top: 100,
down: 10
},
{
id: 2,
label: '前处理槽液',
value: [98, 109, 87, 90, 69, 76, 45],
top: 110,
down: 30
}
],
// 默认显示的槽液类型
normalBathSolution: '',
// 参数
arguments: [],
// 默认显示的参数
normalArguments: ''
},
// 图表相关数据
chartsAbout: {
chartsTitle: [],
chartsData: []
},
// 参数下拉框禁用状态
argumentSelecteStatus: true
}
},
mounted () {
this.getNormalChartsData()
this.getBathSolutionData()
this.getArgumentData()
this.getNowYearMonth()
},
methods: {
// 获取图表默认数据
getNormalChartsData () {},
// 获取槽液类型数据
getBathSolutionData () {},
// 获取参数数据
getArgumentData () {},
// 刷新
doRefreshClick () {},
// 获取当前月份
getNowYearMonth () {
let nowYeraMonth = new Date();
console.log(nowYeraMonth.getMonth() + 1);
console.log(nowYeraMonth.getFullYear());
this.searchData.chooseMonDate = (nowYeraMonth.getFullYear()).toString() + '-' + (nowYeraMonth.getMonth() + 1).toString()
console.log(' this.searchData.chooseMonDate', this.searchData.chooseMonDate)
},
// 选择时间
yearMonthChange (val) {
console.log(this.$moment(val).format('YYYY-MM'))
},
// 槽液类型选择内容改变
bathSolutionChange (val) {
console.log(val)
this.argumentSelecteStatus = false
},
// 搜索
doSearchMonClick () {},
// 重置
resetMonClick () {},
// 导出
exportHandle () {}
}
}
</script>
<style lang="scss" scoped>
.page-pack {
position: relative;
min-height: 100%;
width: 100%;
border: 1px solid #d2d3d5;
background-color: #fff;
overflow-y: auto;
.title-pack {
height: 38px;
line-height: 38px;
border-bottom: 1px solid #d2d3d5;
}
.tool-pack {
padding-top: 16px;
padding-bottom: 16px;
.tool-tag {
height: 32px;
line-height: 32px;
font-size: 14px;
}
}
.charts {
padding: 10px;
text-align: center;
.charts_title {
font-size: 18px;
font-weight: 600;
}
.charts_container {
height: 600px
}
}
}
</style>
\ No newline at end of file
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