diff --git a/src/App.vue b/src/App.vue index aa81bb77..add3aeae 100644 --- a/src/App.vue +++ b/src/App.vue @@ -119,4 +119,15 @@ export default { #table1.el-table th.el-table__cell.is-leaf { background: rgba(0, 0, 0, 0); } - + +.el-calendar-table .el-calendar-day { + height: 43px !important; +} + +.el-calendar { + border-radius: 15px; +} + +.el-calendar>.el-calendar__body { + padding: 0 20px 20px; +} diff --git a/src/api/model/inm.js b/src/api/model/inm.js index 3f619ff4..0bd7190d 100644 --- a/src/api/model/inm.js +++ b/src/api/model/inm.js @@ -130,5 +130,13 @@ export default { `${config.API_URL}/inm/mioitem/${id}/`); } }, + test: { + name: "检验", + req: async function(id,data){ + return await http.post( + `${config.API_URL}/inm/mioitem/${id}/test/`, + data); + } + }, } } \ No newline at end of file diff --git a/src/api/model/qm.js b/src/api/model/qm.js index a2d1dad1..fbd8a112 100644 --- a/src/api/model/qm.js +++ b/src/api/model/qm.js @@ -79,5 +79,47 @@ export default { } } }, + ptest: { + list: { + name: "检验列表", + req: async function(data){ + return await http.get( + `${config.API_URL}/qm/ptest/`, + data + ); + } + }, + item: { + name: "检验", + req: async function(id){ + return await http.get( + `${config.API_URL}/qm/ptest/${id}/` + ); + } + }, + update: { + name: "更新检验", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/qm/ptest/${id}/`, + data); + } + }, + create: { + name: "创建检验", + req: async function(data){ + return await http.post( + `${config.API_URL}/qm/ptest/`, + data); + } + }, + delete: { + name: "删除检验", + req: async function(id){ + return await http.delete( + `${config.API_URL}/qm/ptest/${id}/`); + } + } + }, } diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue index 1bfaebc8..25c4ae4c 100644 --- a/src/views/home/widgets/index_photon.vue +++ b/src/views/home/widgets/index_photon.vue @@ -18,29 +18,29 @@
-
预制棒总产量
+
预制棒合格数

6700

-

同比上周 8.63%▲

+

同比前天 8.63%▲

-
管料产量
+
预制管合格数

6700

-

同比上周 8.63%▲

+

同比前天 8.63%▲

-
芯料产量
+
AVG合格数

6700

-

同比上周 8.63%▼

+

同比前天 8.63%▼

-
在制任务
+
预制棒管交付数

6700

-

+

同比前天 8.63%▲

-
交付产品
+
AVG交付数

6700

-

+

同比前天 8.63%▲

@@ -49,20 +49,29 @@
-
在制任务
-

189762670

+
本月累积交付数
+
+
+
预制棒
+

6700

+
+
+
预制棒
+

6700

+
+
-
预制棒总产量
+
预制棒合格率

80%

-
管料产量
+
预制管合格率

80%

同比上周 8.63%

@@ -70,8 +79,8 @@
-
芯料产量
-

70%

+
AVG合格率
+

80%

同比上周 8.63%

@@ -79,27 +88,46 @@
- -
+ +
-
月度趋势
+
本月生产合格趋势
...
-
本月完成情况
-

45.82%

-

同比上周 8.63%▲ 月同比6.47%

-
+
本月计划完成度
+

99%

+ +
+ +
+
+
+
库存情况
+
+
+ + + + + + +
+
+
+ + + -
-
+
+ +
预警提示
-
+

延期任务数量上月同比增加 10.23%

@@ -134,7 +162,7 @@
-
+
生产设备
@@ -150,38 +178,20 @@
- - - +
-
生产设备
+
日历
-
- +
+ +
@@ -208,7 +218,8 @@ import * as echarts from 'echarts'; {index:2,number: 'GZKJ-02',name: '2号单坩埚熔化炉',state: '完好'}, {index:3,number: 'GZKJ-03',name: '3号单坩埚熔化炉',state: '禁用'}, {index:4,number: 'GZKJ-04',name: '4号单坩埚熔化炉',state: '检修'}, - ] + ], + calendarValue:'' } }, mounted() { @@ -220,6 +231,7 @@ import * as echarts from 'echarts'; that.year_s = year; that.month_s = month; that.initChart(); + this.calendarValue = new Date(); }, methods: { // 动态绑定Class @@ -257,17 +269,18 @@ import * as echarts from 'echarts'; var myChart = echarts.init(dom); let option = { grid: { // 图表距离边框的距离，可用百分比和数字（px）配置 - top: '10%', - left: '3%', - right: '5%', + top: '5%', + left: '1%', + right: '1%', bottom: '5%', containLabel: true }, xAxis: { type: 'category', axisLabel: { - show: false, // X 轴标签文字旋转角度 - }, + // show: false, // X 轴标签文字旋转角度 + }, + data:['1号','2号','3号','4号','5号','6号','7号','8号','9号','10号'] }, yAxis: { type: 'value', @@ -276,8 +289,12 @@ import * as echarts from 'echarts'; }, }, series: [{ - data: [10,9,8,11,12,10,9,10], - type: 'bar' + data: [10,9,8,11,12,10,9,10,8,9,10], + type: 'bar', + barMaxWidth:50, + itemStyle:{ + normal:{color:'rgb(20, 141, 255)'} + } }] }; myChart.setOption(option, true); @@ -381,7 +398,4 @@ import * as echarts from 'echarts'; box-sizing: border-box; background: #ffffff; } - .bottomItem{ - - } diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index d44558fd..e4bc2ccb 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -42,7 +42,10 @@ @@ -93,6 +96,7 @@ export default { 'other_in': '其他入库', 'other_out': '其他出库', }, + mioitemId:'' }; }, mounted() { @@ -145,6 +149,7 @@ export default { }, table_check(row){ this.dialog.check = true; + this.mioitemId = row.id; this.$nextTick(() => { this.$refs.checkDialog.open("add"); }); diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index 89e62ca0..8a954820 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -15,22 +15,6 @@ label-width="100px" > - - - - - - - - - + @@ -59,77 +43,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -145,24 +115,17 @@ + + diff --git a/src/views/qm/first.vue b/src/views/qm/first.vue index c5063c85..84fb7742 100644 --- a/src/views/qm/first.vue +++ b/src/views/qm/first.vue @@ -26,70 +26,117 @@ :params="query" > - + - + + - + + + - + + - + - + + + + + - + + + + diff --git a/src/views/qm/product.vue b/src/views/qm/product.vue index c5063c85..a51ea1d3 100644 --- a/src/views/qm/product.vue +++ b/src/views/qm/product.vue @@ -26,40 +26,21 @@ :params="query" > - + - + - + - + - + - + + - - - - - - - @@ -78,8 +59,8 @@ }, selection: [], state_: { - 10: '', - 20: '', + 'R': '不合格', + 'S': '合格', }, }; },