This commit is contained in:
朱文强 2021-11-24 09:50:26 +08:00
parent 247dfdc318
commit c58b017794
4 changed files with 8 additions and 8 deletions

View File

@ -34,7 +34,7 @@ const mainRoutes = {
// 1. isTab: 是否通过tab展示内容, true: 是, false: 否 // 1. isTab: 是否通过tab展示内容, true: 是, false: 否
// 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否 // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
// 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理! // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
{ path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } }, { path: '/home', component: _import('common/bigScreen'), name: 'home', meta: { title: '首页' } },
{ path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } }, { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
{ path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } }, { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
{ path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } } { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }

View File

@ -1,12 +1,12 @@
<template> <template>
<div class='mod-demo-echarts' :style="`height: ${winHeight}px`"> <div class='mod-demo-echarts' :style="`height: ${winHeight}px`">
<div :style="`font-size: ${60 * beilv}px`" style="margin-left:30%;color:white;margin-bottom:10px"><img :height="`${60 * beilv}px`" src="../../assets/img/title.png">&nbsp;奔一电气立体库展示屏</div> <div :style="`font-size: ${60 * beilv}px`" style="margin-left:30%;color:white;margin-bottom:10px"><img :height="`${60 * beilv}px`" src="../../assets/img/logo.png">&nbsp;云洁科技展示屏</div>
<el-card class="titleClass"> <!-- <el-card class="titleClass">
<el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='success' color="#E9EAEF" effect="dark">一二层空余库位:{{firstPointList.notOccupy12}}</el-tag> <el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='success' color="#E9EAEF" effect="dark">一二层空余库位:{{firstPointList.notOccupy12}}</el-tag>
<el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='success' color="#E9EAEF" effect="dark">三四五六层空余库位:{{firstPointList.notOccupy3456}}</el-tag> <el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='success' color="#E9EAEF" effect="dark">三四五六层空余库位:{{firstPointList.notOccupy3456}}</el-tag>
<el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='success' color="#E9EAEF" effect="dark">七八层空余库位:{{firstPointList.notOccupy78}}</el-tag> <el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='success' color="#E9EAEF" effect="dark">七八层空余库位:{{firstPointList.notOccupy78}}</el-tag>
<el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='warning' color="#E9EAEF" effect="dark">当前任务编码:{{sTaskInfo.taskDetCode}}&emsp;类型:{{sTaskInfo.taskType === 0 ? '出库' : sTaskInfo.taskType === 1 ?'入库' : '无'}}&emsp;</el-tag> <el-tag class="tagClass" :style="`font-size: ${30 * beilv}px`" type='warning' color="#E9EAEF" effect="dark">当前任务编码:{{sTaskInfo.taskDetCode}}&emsp;类型:{{sTaskInfo.taskType === 0 ? '出库' : sTaskInfo.taskType === 1 ?'入库' : '无'}}&emsp;</el-tag>
</el-card> </el-card> -->
<hr /> <hr />
<el-row> <el-row>
<el-col :span='11' :offset='1'> <el-col :span='11' :offset='1'>
@ -281,7 +281,7 @@ export default {
var option = { var option = {
backgroundColor: '#0079BA', backgroundColor: '#0079BA',
title: { title: {
text: '大系列库位数量情况(外圈总量,内圈库存)', text: '库位数量情况(外圈总量,内圈库存)',
left: 'center', left: 'center',
top: 0, top: 0,
textStyle: { textStyle: {
@ -567,7 +567,7 @@ export default {
top: 27 * this.beilv top: 27 * this.beilv
}, },
title: { title: {
text: '成品小系列库位数量情况', text: '成品库位数量情况',
left: 'center', left: 'center',
top: 0, top: 0,
textStyle: { textStyle: {

View File

@ -144,7 +144,7 @@ export default {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/generator/mtcctaskruninfo/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/generator/mtcctaskruninfo/${!this.dataForm.id ? 'saveExample' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,

View File

@ -290,7 +290,7 @@ export default {
}, },
addList (row) { addList (row) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/generator/mtcctaskruninfo/runTask/${row.id}`), url: this.$http.adornUrl(`/generator/mtcctaskruninfo/runTaskInfo/${row.id}`),
method: 'post' method: 'post'
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {