From 42395f9f2bd77d6db78a9466db2733f4bcf3e811 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期二, 08 七月 2025 23:35:19 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/wel/index.vue | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 2823324..a8d26d4 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -27,7 +27,7 @@
<el-button :size="size" text icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
<el-button :size="size" text v-if="row.nodeType < 60" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
<el-button :size="size" text v-if="row.nodeType == 60" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button>
- <el-button :size="size" text v-if="row.nodeType == 60" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩骇" title="鍗囩骇"></el-button>
+ <el-button :size="size" text v-if="row.nodeType == 70" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩骇" title="鍗囩骇"></el-button>
<el-button :size="size" text v-if="row.nodeType == 60 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button>
</template>
</avue-crud>
@@ -42,7 +42,7 @@
<avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
<span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
<template v-else-if="tabsType == 'tab3'">
- 鏂囦欢鍐呭
+ {{fileContent}}
<!-- <div v-for="item in fileList" v-if="fileList.length > 0" class="fileListStyle">
<span>{{item.name}}</span>
<span class="delFile" @click="delFile(item)">X</span>
@@ -56,6 +56,7 @@
export default {
data() {
return {
+ fileContent: "",
isSM: false, //鏄惁鏄秹瀵嗙綉 锛屽伐鎺х綉5涓紝娑夊瘑缃�4涓�
isShowTabs: true,
nodeTypeList: [],
@@ -153,7 +154,16 @@
},
{
label: '璁惧锛堟満搴婏級',
- prop: 'abc'
+ prop: 'machineCode',
+ type: 'select',
+ dicUrl: '/blade-mdm/machine/page',
+ props: {
+ label: 'machineGroupName',
+ value: 'machineGroupCode',
+ },
+ dicFormatter(res) {
+ return res.data.records;
+ }
},
{
label: '鑺傜偣鍚嶇О',
@@ -161,7 +171,7 @@
},
{
label: '鑺傜偣鎻忚堪',
- prop: 'abc',
+ prop: 'description',
hide: true
},
{
@@ -218,7 +228,7 @@
},
{
label: '璁惧',
- prop: 'abc'
+ prop: 'machineCode'
},
{
label: '鍥哄寲鐘舵��',
@@ -263,6 +273,41 @@
value: 'dictKey',
},
disabled: true
+ },
+ {
+ label: '璁惧缂栧彿',
+ prop: 'machineCode',
+ type: 'select',
+ dicUrl: '/blade-mdm/machine/page',
+ props: {
+ label: 'machineGroupName',
+ value: 'machineGroupCode',
+ },
+ dicFormatter(res) {
+ return res.data.records;
+ }
+ },
+ {
+ label: '闆剁粍浠跺彿/鍥惧彿',
+ prop: 'drawingNo'
+ },
+ {
+ label: '宸ュ簭',
+ prop: 'processName'
+ },
+ {
+ label: '宸ュ簭鐗堟湰',
+ prop: 'processEdition'
+ },
+ {
+ label: '鑺傜偣鍒嗙被',
+ prop: 'category',
+ type: 'select',
+ dicUrl: '/blade-system/dict-biz/dictionary?code=node_file_type',
+ props: {
+ label: 'dictValue',
+ value: 'dictKey',
+ }
},
{
label: '閫夋嫨鏂囦欢',
@@ -358,13 +403,13 @@
getFile(id) { //鏌ョ湅鏂囦欢鍐呭
this.loading = true;
axios({
- url: '/blade-mdm/program/ncfile/content',
+ url: '/blade-mdm/program/ncfile/content-by-nodeid',
method: 'get',
- params: {id},
+ params: {nodeId:id},
}).then(
res => {
- this.loading = true;
- console.log(res.data,123)
+ this.loading = false;
+ this.fileContent = res.data.data;
}
);
},
@@ -575,9 +620,9 @@
this.nodeTypeList = res.data.data;
}
);
- //鍒ゆ柇鐗堟湰 0:娑夊瘑缃戯紝1:宸ユ帶缃戯紱//宸ユ帶缃�5涓紝娑夊瘑缃�4涓�
- axios({url: '/blade-system/param/detail?paramKey=networkType',method: 'get'}).then(res => {
- if(res.data.data.paramValue === "0") {
+ //鍒ゆ柇鐗堟湰 0:娑夊瘑缃戯紝1:宸ユ帶缃戯紱//宸ユ帶缃�5涓紝娑夊瘑缃�4涓�
+ axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
+ if(res.data.data === "0") {
this.isSM = true;
}
}
--
Gitblit v1.9.3