mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

'1'

Browse Source
This commit is contained in:
gtz 2023-11-17 08:46:35 +08:00
parent bc3959412d
commit 88615a52a4
6 changed files with 66 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -21,6 +21,10 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

5
.env.prod
View File

@ -12,7 +12,10 @@ ENV = 'production'
VUE_APP_TITLE = MES系统
# 芋道管理系统/生产环境
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
VUE_APP_BASE_API = '/prod-api'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
# 根据服务器或域名修改

BIN
dist.zip
View File

Binary file not shown.

65
src/views/extend/processFlowView/components/ProcessBomList.vue
View File

@ -16,7 +16,7 @@
right: 20px;
display: flex;
">
<el-button type="primary" plain :disabled="currentDet == null" class="btn-create" icon="el-icon-plus">
<el-button type="primary" plain :disabled="currentDet == null" class="btn-create" icon="el-icon-plus" @click="handleEqBtn">
分配设备
</el-button>
<el-input icon="el-icon-search" placeholder="搜索" v-model="searchText" style="margin-left: 20px">
@ -34,6 +34,18 @@
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 新增&编辑 -->
<base-dialog
:dialogTitle="eqTitle"
:dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='70%'
>
123
</base-dialog>
</section>
</template>
@ -58,9 +70,9 @@ export default {
// width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// },
{ prop: 'name', label: '设备名称' },
{ prop: 'code', label: '物料BOM' },
{ prop: 'remark', label: '参数BOM' },
{ prop: 'equipmentId', label: '设备名称' },
{ prop: 'materialName', label: '物料BOM' },
{ prop: 'valueName', label: '参数BOM' },
],
list: [],
total: 0,
@ -69,7 +81,10 @@ export default {
pageNo: 1,
pageSize: 10,
},
searchText: ''
searchText: '',
eqTitle: '分配设备',
centervisible: false,
pageUrl: '/extend/process-flow-det-equipment/page'
};
},
watch: {
@ -109,19 +124,39 @@ export default {
})
},
getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
console.log('get list')
async getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
const { code, data } = await this.recv({ pageNn: 1, pageSize: 100, flowDetId: detId });
if (code == 0) {
if (data) {
this.list = data.list
}
return { cells: [] };
}
return Promise.reject(this.infoUrl + ' 接口出错!');
},
},
getList() {
this.list = [
{ name: '1', code: 'bomg-1', remark: 'Tochter' },
{ name: '2', code: 'bomg-2', remark: 'Bruder' },
{ name: '3', code: 'bomg-3', remark: 'Kalt' },
]
},
// getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
// console.log('get list')
// },
// getList() {
// this.list = [
// { name: '1', code: 'bomg-1', remark: 'Tochter' },
// { name: '2', code: 'bomg-2', remark: 'Bruder' },
// { name: '3', code: 'bomg-3', remark: 'Kalt' },
// ]
// },
clearList() {
this.list = [];
},
handleEqBtn() {
this.centervisible = true
},
handleConfirm() {
this.centervisible = false
},
handleCancel() {
this.centervisible = false
}
},
};

14
src/views/extend/processFlowView/components/ProcessDetail.vue
View File

@ -167,7 +167,7 @@ export default {
modifiers: ['ctrl', 'meta']
}
});
console.log(json)
graph.fromJSON(json)
this.graph = graph;
this.$nextTick(() => {
@ -195,12 +195,12 @@ export default {
node.attr('container/stroke', '#0b58ff');
const { detId, detName, detDesc, processId, sectionId, sectionName } = node.attrs;
this.currentDet = {}
this.$set(this.currentDet, 'detId', detId.text)
this.$set(this.currentDet, 'sectionId', sectionId.text)
this.$set(this.currentDet, 'detName', detName.text)
this.$set(this.currentDet, 'detDesc', detDesc.text)
this.$set(this.currentDet, 'flowId', processId.text)
this.$set(this.currentDet, 'sectionName', sectionName.text)
this.$set(this.currentDet, 'detId', detId?.text)
this.$set(this.currentDet, 'sectionId', sectionId?.text)
this.$set(this.currentDet, 'detName', detName?.text)
this.$set(this.currentDet, 'detDesc', detDesc?.text)
this.$set(this.currentDet, 'flowId', processId?.text)
this.$set(this.currentDet, 'sectionName', sectionName?.text)
this.currentNode = node
});
this.graph.on('edge:click', ({ e, x, y, edge, view }) => {

2
src/views/report/jmreport/index.vue
View File

@ -20,7 +20,7 @@ export default {
data() {
return {
url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(),
url: process.env.VUE_APP_JIMU_API + "/jmreport/list?token=" + getAccessToken(),
};
},
};