mt-fe-group/tft-fe
9
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

Merge pull request '5.25' (#21) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

瀏覽代碼 
Reviewed-on: #21
This commit is contained in:
朱菊兰
2023-05-25 15:16:56 +08:00
父節點 37188fe760 2ae3d3f3e7
當前提交 1e06c04ddd
共有 35 個文件被更改，包括 41 次插入 和 38 次删除
Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/2505.a57dc960.css vendored Normal file
查看文件

@@ -0,0 +1 @@
.main-box[data-v-483dec8e]{width:100%;padding:8px 6px 0 16px}.main-box .left-box[data-v-483dec8e],.main-box .right-box[data-v-483dec8e]{border-radius:8px;background-color:#fff;height:calc(100vh - 148px)}.main-box .left-box[data-v-483dec8e]{padding:16px 0 0;overflow:auto}.main-box .right-box[data-v-483dec8e]{padding:24px}.main-box .right-box .title[data-v-483dec8e]{display:inline-block;font-size:14px;color:#000;margin-bottom:16px}.main-box .right-box .title[data-v-483dec8e]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box .right-box .eq-msg[data-v-483dec8e]{display:flex;justify-content:space-between;margin-bottom:25px}.main-box .right-box .eq-msg li[data-v-483dec8e]{width:22%;height:48px;box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:8px;line-height:48px;padding-left:16px}.main-box .right-box .img-box[data-v-483dec8e]{text-align:center}.main-box .right-box .img-box img[data-v-483dec8e]{max-width:100%;max-height:calc(100vh - 300px)}

1
dist/css/2859.5f1c96d8.css vendored
查看文件

@@ -1 +0,0 @@
.main-box[data-v-559864b3]{width:100%;padding:8px 6px 0 16px}.main-box .left-box[data-v-559864b3],.main-box .right-box[data-v-559864b3]{border-radius:8px;background-color:#fff;height:calc(100vh - 148px)}.main-box .left-box[data-v-559864b3]{padding:16px 0 0;overflow:auto}.main-box .right-box[data-v-559864b3]{padding:24px}.main-box .right-box .title[data-v-559864b3]{display:inline-block;font-size:14px;color:#000;margin-bottom:16px}.main-box .right-box .title[data-v-559864b3]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box .right-box .eq-msg[data-v-559864b3]{display:flex;justify-content:space-between;margin-bottom:25px}.main-box .right-box .eq-msg li[data-v-559864b3]{width:22%;height:48px;box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:8px;line-height:48px;padding-left:16px}.main-box .right-box .img-box[data-v-559864b3]{text-align:center}.main-box .right-box .img-box img[data-v-559864b3]{max-width:100%;max-height:calc(100vh - 300px)}

0
dist/css/3723.c4e5dd1b.css → dist/css/5783.c4e5dd1b.css vendored
查看文件

2
dist/css/1913.db4e9e42.css → dist/css/5984.2c1d687d.css vendored
查看文件

@@ -1 +1 @@
.tableInner .el-input__inner{border:none;padding:0;height:33px}.samplingAdd .form-box[data-v-b1bb2734]{height:100%;padding:0 32px;position:relative}.samplingAdd .form-box .first-line[data-v-b1bb2734]{border-bottom:1px solid #e9e9e9;margin-bottom:23px}.samplingAdd .bottom[data-v-b1bb2734]{position:absolute;bottom:0;right:32px}.standardSetting .form-box[data-v-fbc9d82a]{height:100%;padding:0 32px;position:relative}.standardSetting .bottom[data-v-fbc9d82a]{position:absolute;bottom:0;right:32px} .tableInner .el-input__inner{border:none;padding:0;height:33px}.samplingAdd .form-box[data-v-b1bb2734]{height:100%;padding:0 32px;position:relative}.samplingAdd .form-box .first-line[data-v-b1bb2734]{border-bottom:1px solid #e9e9e9;margin-bottom:23px}.samplingAdd .bottom[data-v-b1bb2734]{position:absolute;bottom:0;right:32px}.standardSetting .form-box[data-v-4c764f8e]{height:100%;padding:0 32px;position:relative}.standardSetting .bottom[data-v-4c764f8e]{position:absolute;bottom:0;right:32px}

2
dist/css/1056.a65c814e.css → dist/css/897.c8e5eefb.css vendored
查看文件

@@ -1 +1 @@
.plan-maintenance[data-v-bf7ad0ae]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff} .plan-maintenance[data-v-d565ab3a]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}

2
dist/index.html vendored
查看文件

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.005f8b1a.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.e2f493b2.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

1
dist/js/1056.552f0362.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/1487.bf0760e7.js → dist/js/1487.032bbb6c.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/1913.1b7d0ded.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/2033.71d18a4b.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/2413.80fdfff2.js → dist/js/2413.e3256bbf.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/2505.99efed6e.js vendored Normal file
查看文件

@@ -0,0 +1 @@
"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2505],{2505:function(t,e,n){n.r(e),n.d(e,{default:function(){return l}});var a=function(){var t=this,e=t._self._c;return e("el-row",{staticClass:"main-box",attrs:{gutter:10}},[e("el-col",{attrs:{span:4}},[e("div",{staticClass:"left-box"},[e("el-tree",{ref:"deviceStatusTree",attrs:{data:t.treeData,"node-key":"id",props:t.defaultProps,"default-expand-all":"","highlight-current":""},on:{"node-click":t.clickDevice}})],1)]),e("el-col",{attrs:{span:20}},[e("div",{staticClass:"right-box"},[e("span",{staticClass:"title"},[t._v(t._s(t.equipmentName))]),e("ul",{staticClass:"eq-msg"},[e("li",[t._v("设备模式："+t._s(t.eqMessage.mode))]),e("li",[t._v("设备状态："+t._s(t.eqMessage.state))]),e("li",[t._v("设备报警："+t._s(t.eqMessage.alarmNum))]),e("li",[t._v("剩余维护时间："+t._s(t.eqMessage.remainMainTime)+"秒")])]),e("div",{staticClass:"img-box"},[t.eqMessage.imgId?e("img",{attrs:{src:t.deviceImg,alt:"设备图片"}}):e("img",{attrs:{src:n(6056),alt:"设备图片"}})])])])],1)},i=[],s=n(5591),r=n(8859);function o(t){return(0,r.Z)({url:"/monitor/eqMonitor/get",method:"post",data:t})}var u={name:"DeviceStatus",data(){return{treeData:[],defaultProps:{children:"children",label:"name"},eqMessage:{},equipmentId:"",deviceImg:"",equipmentName:""}},mounted(){this.getTree()},methods:{getTree(){(0,s.SI)().then((t=>{this.treeData=t.data,this.equipmentId=this.getId(t.data),this.setCurrent(),this.getMsg()}))},getId(t){return t[0].children?this.getId(t[0].children):t[0].id},setCurrent(){let t=this;setTimeout((function(){t.$refs.deviceStatusTree.setCurrentKey(t.equipmentId)}),500)},getMsg(){o({equipmentId:this.equipmentId}).then((t=>{console.log(t),this.eqMessage=t.data,this.equipmentName=t.data.equipmentName,this.deviceImg="http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId="+t.data.imgId}))},clickDevice(t){console.log(t),t.children||(this.equipmentId=t.id,this.equipmentName=t.name,this.getMsg())}}},m=u,c=n(1001),d=(0,c.Z)(m,a,i,!1,null,"483dec8e",null),l=d.exports},5591:function(t,e,n){n.d(e,{FH:function(){return o},Hp:function(){return u},JQ:function(){return r},SI:function(){return s},WQ:function(){return d},b6:function(){return m},iv:function(){return i},m:function(){return c}});var a=n(8859);function i(){return(0,a.Z)({url:"/common/getList",method:"post"})}function s(){return(0,a.Z)({url:"/common/getTreeData",method:"post"})}function r(t){return(0,a.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function o(t){return(0,a.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function u(t){return(0,a.Z)({url:"/common/getAlarmData",method:"post",data:t})}function m(t){return(0,a.Z)({url:"/common/getProductData",method:"post",data:t})}function c(t){return(0,a.Z)({url:"/common/getMaterialData",method:"post",data:t})}const d="/api/common/attachment/uploadFileFormData"},6056:function(t,e,n){t.exports=n.p+"img/empty.c5f8511f.png"}}]);

1
dist/js/2859.26a89213.js vendored
查看文件

@@ -1 +0,0 @@
"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2859],{2859:function(t,e,n){n.r(e),n.d(e,{default:function(){return d}});var a=function(){var t=this,e=t._self._c;return e("el-row",{staticClass:"main-box",attrs:{gutter:10}},[e("el-col",{attrs:{span:4}},[e("div",{staticClass:"left-box"},[e("el-tree",{ref:"deviceStatusTree",attrs:{data:t.treeData,"node-key":"id",props:t.defaultProps,"default-expand-all":"","highlight-current":""},on:{"node-click":t.clickDevice}})],1)]),e("el-col",{attrs:{span:20}},[e("div",{staticClass:"right-box"},[e("span",{staticClass:"title"},[t._v(t._s(t.equipmentName))]),e("ul",{staticClass:"eq-msg"},[e("li",[t._v("设备模式："+t._s(t.eqMessage.mode))]),e("li",[t._v("设备状态："+t._s(t.eqMessage.state))]),e("li",[t._v("设备报警："+t._s(t.eqMessage.alarmNum))]),e("li",[t._v("剩余维护时间："+t._s(t.eqMessage.remainMainTime)+"秒")])]),e("div",{staticClass:"img-box"},[t.eqMessage.imgId?e("img",{attrs:{src:t.deviceImg,alt:"设备图片"}}):e("img",{attrs:{src:n(6056),alt:"设备图片"}})])])])],1)},i=[],s=n(5591),r=n(8859);function o(t){return(0,r.Z)({url:"/monitor/eqMonitor/get",method:"post",data:t})}var u={name:"DeviceStatus",data(){return{treeData:[],defaultProps:{children:"children",label:"name"},eqMessage:{},equipmentId:"",deviceImg:"",equipmentName:""}},mounted(){this.getTree()},methods:{getTree(){(0,s.SI)().then((t=>{this.treeData=t.data,this.equipmentId=this.getId(t.data),this.setCurrent(),this.getMsg()}))},getId(t){return t[0].children?this.getId(t[0].children):t[0].id},setCurrent(){let t=this;setTimeout((function(){t.$refs.deviceStatusTree.setCurrentKey(1)}),500)},getMsg(){o({equipmentId:this.equipmentId}).then((t=>{console.log(t),this.eqMessage=t.data,this.deviceImg="http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId="+t.data.imgId}))},clickDevice(t){console.log(t),t.children||(this.equipmentId=t.id,this.equipmentName=t.name,this.getMsg())}}},c=u,m=n(1001),l=(0,m.Z)(c,a,i,!1,null,"559864b3",null),d=l.exports},5591:function(t,e,n){n.d(e,{FH:function(){return o},Hp:function(){return u},JQ:function(){return r},SI:function(){return s},WQ:function(){return l},b6:function(){return c},iv:function(){return i},m:function(){return m}});var a=n(8859);function i(){return(0,a.Z)({url:"/common/getList",method:"post"})}function s(){return(0,a.Z)({url:"/common/getTreeData",method:"post"})}function r(t){return(0,a.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function o(t){return(0,a.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function u(t){return(0,a.Z)({url:"/common/getAlarmData",method:"post",data:t})}function c(t){return(0,a.Z)({url:"/common/getProductData",method:"post",data:t})}function m(t){return(0,a.Z)({url:"/common/getMaterialData",method:"post",data:t})}const l="/api/common/attachment/uploadFileFormData"},6056:function(t,e,n){t.exports=n.p+"img/empty.c5f8511f.png"}}]);

1
dist/js/2949.d1630ea2.js vendored Normal file
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/2949.d593e2e8.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/2990.9f7bfdd4.js vendored Normal file
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/3723.3f05a75c.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/4048.4b8f52b3.js → dist/js/4048.f4813ceb.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/4337.5530d5ef.js → dist/js/4337.a10def0f.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/5286.5ab86fbe.js → dist/js/5286.4812cac9.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/5304.94b88658.js → dist/js/5304.57fa63b2.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/5783.c03b0c7f.js vendored Normal file
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/5984.65a39e51.js vendored Normal file
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/6729.a676c4bc.js → dist/js/6729.fd1b5476.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/698.1ef9e99e.js → dist/js/698.bdb8da01.js vendored
查看文件

File diff suppressed because one or more lines are too long

2
dist/js/8311.80ae8f55.js → dist/js/8311.74c6e8f9.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/897.6b02e069.js vendored Normal file
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/app.005f8b1a.js vendored
查看文件

File diff suppressed because one or more lines are too long

1
dist/js/app.e2f493b2.js vendored Normal file
查看文件

File diff suppressed because one or more lines are too long

12
src/api/basicConfig.js
查看文件

@@ -122,18 +122,10 @@ export function getMaterialArr(data) {
data data
}) })
} }
// 获取耗材名称ID规格和单位 // 根据耗材名称查ID、规格和单位
export function materialList(data) { export function materialList(data) {
return request({ return request({
url: '/basic/consumableConfiguration/materialAndUnit', url: '/basic/consumableConfiguration/materialList',
method: 'post',
data
})
}
export function getSpecList(data) {
return request({
url: '/basic/consumableConfiguration/specList',
method: 'post', method: 'post',
data data
}) })

10
src/views/consumablesManagement/components/inAndOutManagementAdd.vue
查看文件

@@ -178,7 +178,11 @@ import {
materialManageInsert, materialManageInsert,
materialManageDelete materialManageDelete
} from '@/api/consumablesManagement' } from '@/api/consumablesManagement'
import { sideLibraryList, getMaterialArr, getSpecList } from '@/api/basicConfig' import {
sideLibraryList,
getMaterialArr,
materialList
} from '@/api/basicConfig'
export default { export default {
name: 'inAndOutManagementAdd', name: 'inAndOutManagementAdd',
data() { data() {
@@ -286,7 +290,7 @@ export default {
this.form.unit = item.unit this.form.unit = item.unit
} }
}) })
getSpecList({ name: val }).then((res) => { materialList({ name: val }).then((res) => {
console.log(res) console.log(res)
if (res.code === 0) { if (res.code === 0) {
this.consumablesSpecList = res.data this.consumablesSpecList = res.data
@@ -356,6 +360,8 @@ export default {
this.showEdit = false this.showEdit = false
this.showOutput = false this.showOutput = false
this.batchCodeList = [] this.batchCodeList = []
this.sideLibaryIdList = []
this.consumablesSpecList = []
this.$refs.form.resetFields() this.$refs.form.resetFields()
}, },
toggleSupplier(val) { toggleSupplier(val) {

4
src/views/consumablesManagement/inAndOutRecords.vue
查看文件

@@ -24,7 +24,7 @@
<script> <script>
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { getOutInRecordRecord } from '@/api/consumablesManagement' import { getOutInRecordRecord } from '@/api/consumablesManagement'
import { sideLibraryList, materialList } from '@/api/basicConfig' import { sideLibraryList, getMaterialArr } from '@/api/basicConfig'
import moment from 'moment' import moment from 'moment'
import { publicFormatter, timeFormatter } from '@/utils' import { publicFormatter, timeFormatter } from '@/utils'
const tableProps = [ const tableProps = [
@@ -224,7 +224,7 @@ export default {
} }
}, },
getMaterialList() { getMaterialList() {
materialList().then((res) => { getMaterialArr().then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.formConfig[4].selectOptions = res.data this.formConfig[4].selectOptions = res.data
} }

7
src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue
查看文件

@@ -172,12 +172,17 @@ const tableBtn = [
type: 'edit', type: 'edit',
btnName: '编辑', btnName: '编辑',
showParam: { showParam: {
type: '&', type: '|',
data: [ data: [
{ {
type: 'unequal', type: 'unequal',
name: 'status', name: 'status',
value: '未完成' value: '未完成'
},
{
type: 'unequal',
name: 'status',
value: '已超时'
} }
] ]
} }

3
src/views/qualityManagement/components/standardSetting.vue
查看文件

@@ -88,8 +88,7 @@ import {
const tableProps = [ const tableProps = [
{ {
prop: 'detectItem', prop: 'detectItem',
label: '检验项目', label: '检验项目'
subcomponent: inputArea
}, },
{ {
prop: 'detectPoint', prop: 'detectPoint',

3
src/views/siteMonitoring/deviceStatus.vue
查看文件

@@ -71,13 +71,14 @@ export default {
setCurrent() { setCurrent() {
let _this = this let _this = this
setTimeout(function () { setTimeout(function () {
_this.$refs.deviceStatusTree.setCurrentKey(1) _this.$refs.deviceStatusTree.setCurrentKey(_this.equipmentId)
}, 500) }, 500)
}, },
getMsg() { getMsg() {
eqMonitorGet({ equipmentId: this.equipmentId }).then((res) => { eqMonitorGet({ equipmentId: this.equipmentId }).then((res) => {
console.log(res) console.log(res)
this.eqMessage = res.data this.eqMessage = res.data
this.equipmentName = res.data.equipmentName
this.deviceImg = process.env.VUE_APP_VIEW_PIC + res.data.imgId this.deviceImg = process.env.VUE_APP_VIEW_PIC + res.data.imgId
}) })
}, },