gj_mes
/
gj-erp-kban-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://www.sanduolantoyoga.com/gj_mes/gj-erp-kban-vue

Browse Source
main
biubiubiu 7 months ago
parent 704fe8673d 6aa7f273fb
commit a06a479190
12 changed files with 95 additions and 38 deletions
Show Stats Download Patch File Download Diff File

5
.env.development
Unescape View File

@ -0,0 +1,5 @@
# just a flag
ENV = development
# base api
VUE_APP_BASE_API = 'http://127.0.0.1:9080/'

5
.env.production
Unescape View File

@ -0,0 +1,5 @@
# just a flag
ENV = 'production'
#铁舾生产环境服务器
VUE_APP_BASE_API = 'http://192.127.0.22:8081/'

5
package.json
Unescape View File

@ -3,8 +3,9 @@
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"dev": "vue-cli-service serve --mode development",
"serve": "vue-cli-service serve --mode server",
"build": "vue-cli-service build --mode production",
"lint": "vue-cli-service lint"
},
"dependencies": {

2
public/index.html
Unescape View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>大数据分析系统</title>
<title>钢加综合数据看板</title>
</head>
<body>
<noscript>

6
src/components/AmphiPosition/index.vue
Unescape View File

@ -2,7 +2,7 @@
<!-- 垮位分析 -->
<div class="amphiPosition-container">
<!-- 筛选 -->
<div class="formData-box">
<!-- <div class="formData-box">
<el-form ref="form" :model="formData" label-width="90px">
<el-form-item label="请选择年份" size="mini">
<el-select v-model="formData.year" placeholder="">
@ -12,7 +12,7 @@
</el-form-item>
</el-form>
<div class="query-btn" @click="queryBtn">确定</div>
</div>
</div>-->
<div class="amphiPosition-box">
<div class="left-box">
<div class="border-out">
@ -746,7 +746,7 @@ export default {
<style scoped lang="scss">
.amphiPosition-container {
margin-top: 10px;
margin-top: 50px;
padding-left: 5px;
padding-right: 5px;
.amphiPosition-box {

16
src/components/ForwardDemand/index.vue
Unescape View File

@ -2,7 +2,7 @@
<!-- 前方需求分析 -->
<div class="forwardDemand-container">
<!-- 筛选 -->
<div class="formData-box">
<!-- <div class="formData-box">
<el-form ref="form" :model="formData" label-width="90px">
<el-form-item label="请选择年份" size="mini">
<el-select v-model="formData.year">
@ -11,13 +11,13 @@
</el-select>
</el-form-item>
</el-form>
<div class="query-btn" @click="queryBtn">确定</div>
</div>
<div class="query-btn" @click="queryBtn">检索</div>
</div>-->
<div class="forwardDemand-box">
<div class="left-box">
<div class="border-out">
<div class="border-inner">
<div class="left-top-title">需求计划分析</div>
<div class="left-top-title">需求计划情况</div>
<!-- 表格 -->
<div class="left-top-box">
<el-row class="sum-border">
@ -156,6 +156,8 @@ export default {
nf: this.formData.year,
}).then((res) => {
this.tableList = res.data.detail;
res.data.xq=res.data.xq?parseInt(res.data.xq).toFixed(0):'0'
this.xqzlSum=res.data.xq
this.rowObj = res.data;
this.$nextTick(() => {
const elementHeight = this.$refs.refHeight;
@ -174,7 +176,7 @@ export default {
let dataJhzlY = [];
let dataWczlY = [];
let dataXqzlY = [];
this.xqzlSum = 0;
// this.xqzlSum = 0;
this.jhzlSum = 0;
this.wczlSum = 0;
res.data.forEach((item) => {
@ -182,7 +184,7 @@ export default {
dataJhzlY.push(item.jhzl);
dataWczlY.push(item.wczl);
dataXqzlY.push(item.xqzl);
this.xqzlSum += item.xqzl;
// this.xqzlSum += item.xqzl;
this.jhzlSum += item.jhzl;
this.wczlSum += item.wczl;
});
@ -438,7 +440,7 @@ export default {
<style scoped lang="scss">
.forwardDemand-container {
margin-top: 10px;
margin-top: 50px;
padding-left: 5px;
padding-right: 5px;
.forwardDemand-box {

54
src/components/Integration/index.vue
Unescape View File

@ -12,7 +12,7 @@
</el-select>
</el-form-item>
</el-form>
<div class="query-btn" @click="queryBtn">确定</div>
<div class="query-btn" @click="queryBtn">检索</div>
</div>
<div class="integration-box">
<div class="border-out">
@ -27,8 +27,12 @@
>
<div class="pop-left">
<dv-border-box-12 class="datav-border">
<div class="status-text">设备状态： 使用</div>
<div class="">加高套料图号： GHDLGFT</div>
<div class="status-text">设备状态： {{item.status==='00'?'停机':'开机'}}</div>
<div class="status-text">船号： {{item.dcCh}}</div>
<div class="status-text">批次： {{item.dcPl}}</div>
<div class="status-text">套料图号： {{item.tzbh}}</div>
<div class="status-text">开始时间： {{item.beginAt}}</div>
<div class="">结束时间： {{item.overAt}}</div>
</dv-border-box-12>
</div>
<img :src="item.img" alt="" />
@ -43,8 +47,12 @@
<div class="pop-left">
<!-- <dv-border-box-8 style="width: 200px;height: 100px;">dv-border-box-8</dv-border-box-8> -->
<dv-border-box-12 class="datav-border">
<div class="status-text">设备状态： 使用</div>
<div class="">加工套料图号： GHDLGFT</div>
<div class="status-text">设备状态： {{item.status==='00'?'停机':'开机'}}</div>
<div class="status-text">船号： {{item.dcCh}}</div>
<div class="status-text">批次： {{item.dcPl}}</div>
<div class="status-text">套料图号： {{item.tzbh}}</div>
<div class="status-text">开始时间： {{item.beginAt}}</div>
<div class="">结束时间： {{item.overAt}}</div>
</dv-border-box-12>
</div>
<img :src="item.img" alt="" />
@ -67,23 +75,59 @@ export default {
},
deviceLeftList: [
{
status:'00',
dcCh:'',
dcPl:'',
tzbh:'',
beginAt:'',
overAt:'',
img: require("@/assets/image/xc1.png"),
},
{
status:'01',
dcCh:'G175K-12',
dcPl:'119',
tzbh:'B119N4PX011',
beginAt:'2024/11/27 7:27',
overAt:'',
img: require("@/assets/image/xc1.png"),
},
],
deviceRightList: [
{
status:'01',
dcCh:'G175K-12',
dcPl:'119',
tzbh:'B119N4PX007',
beginAt:'2024/11/27 7:27',
overAt:'',
img: require("@/assets/image/xc2.png"),
},
{
status:'01',
dcCh:"G175K-12",
dcPl:'119',
tzbh:'B119N4PX016',
beginAt:'2024/11/27 7:27',
overAt:'',
img: require("@/assets/image/xc2.png"),
},
{
status:'01',
dcCh:"G175K-12",
dcPl:'119',
tzbh:'B119N4PX021',
beginAt:'2024/11/27 7:27',
overAt:'',
img: require("@/assets/image/xc2.png"),
},
{
status:'00',
dcCh:"G175K-12",
dcPl:'119',
tzbh:'B119N4PX020',
beginAt:'2024/11/27 7:27',
overAt:'2024/11/27 8:15',
img: require("@/assets/image/xc2.png"),
},
],

8
src/components/LineTableAnalysis/index.vue
Unescape View File

@ -11,7 +11,7 @@
</el-select>
</el-form-item>
</el-form>
<div class="query-btn" @click="queryBtn">确定</div>
<div class="query-btn" @click="queryBtn">检索</div>
</div>
<div class="lineTableAnalysis-box">
<div class="left-box">
@ -19,7 +19,7 @@
<div class="border-inner">
<!-- 线标分析-折线图 -->
<div class="left-top-box">
<div class="left-top-title">线表分析</div>
<div class="left-top-title">线表情况</div>
<div id="TableLine" class="TableLine"></div>
</div>
</div>
@ -28,7 +28,7 @@
<div class="border-inner">
<!-- 线标分析 -柱状图 -->
<div class="left-bottom-box">
<div class="left-bottom-title">线表分析</div>
<div class="left-bottom-title">线表与月度计划</div>
<div id="TableBar" class="TableBar"></div>
</div>
</div>
@ -90,7 +90,7 @@ export default {
}).then((res) => {
const ydjhList = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
res.data.ydjh.forEach((item) => {
ydjhList[item.mon - 1] = item.zl;
ydjhList[item.mon - 1] = item.zl?.toFixed(0);
});
this.xbjhList = res.data.xbjh;
this.ydjhList = ydjhList;

14
src/components/MonthPlan/index.vue
Unescape View File

@ -147,18 +147,18 @@ export default {
zrcTable() {
zrcTable().then((res) => {
this.tableSumObj = res.data;
var bgData = [res.data.xqzl, res.data.xqzl, res.data.xqzl, res.data.xqzl];
var zlData = [ res.data.xqzl,res.data.dhzl, res.data.jhzl, res.data.wczl];
var bgData = [res.data.xqzl||0, res.data.xqzl||0, res.data.xqzl||0, res.data.xqzl||0];
var zlData = [res.data.xqzl||0,res.data.dhzl||0, res.data.jhzl||0, res.data.wczl||0];
this.DrawingBar(bgData,zlData);
// this.ForwardDemandBar();
// this.MonthlyPlanBar();
// this.finishBar();
this.drawingPie(res.data.ltsl, res.data.tzsl);
this.planFinishPie(res.data.jhzl, res.data.wczl);
this.forwardDemandPie(res.data.xqzl, res.data.dhzl);
this.monthlyPlanPie(res.data.xqzl, res.data.jhzl);
this.finishPie(res.data.xqzl, res.data.wczl);
this.drawingPie(res.data.ltsl||0, res.data.tzsl||0);
this.planFinishPie(res.data.jhzl||0, res.data.wczl||0);
this.forwardDemandPie(res.data.xqzl||0, res.data.dhzl||0);
this.monthlyPlanPie(res.data.xqzl||0, res.data.jhzl||0);
this.finishPie(res.data.xqzl||0, res.data.wczl||0);
});
},
DrawingBar(bgData,zlData) {

4
src/components/ViewPDF/index.vue
Unescape View File

@ -26,7 +26,7 @@
>
</el-option>
</el-select>
<div class="query-btn" @click="queryBtn">确定</div>
<div class="query-btn" @click="queryBtn">检索</div>
</div>
<div class="viewpdf-box">
<div class="border-out">
@ -120,7 +120,7 @@ export default {
},
pdfChange(item) {
this.pdfUrl = pdf.createLoadingTask(
`http://kban.runpengsoft.com/upload/${this.formData.dcCh}/${this.formData.dcPl}/PDF/${item}.pdf`
`${process.env.VUE_APP_BASE_API}/upload/${this.formData.dcCh}/${this.formData.dcPl}/PDF/${item}.pdf`
);
this.pdfUrl.promise
.then((pdf) => {

2
src/utils/request.js
Unescape View File

@ -1,6 +1,6 @@
import axios from "axios";
const service = axios.create({
baseURL: "http://kban.runpengsoft.com",
baseURL: process.env.VUE_APP_BASE_API,
timeout: 600000, //600000
withCredentials: false,
});

10
src/views/home/index.vue
Unescape View File

@ -104,25 +104,25 @@ export default {
},
{
id: 2,
name: "线表分析",
name: "线表情况",
},
{
id: 3,
name: "前方需求分析",
name: "前方需求情况",
},
], //左侧tabs
headerRightList: [
{
id: 4,
name: "月度计划分析",
name: "月度计划情况",
},
{
id: 5,
name: "跨位分析",
name: "跨位情况",
},
{
id: 6,
name: "小池集成",
name: "设备运行情况",
},
{
id: 7,

Write Preview
Loading…
Cancel
Save