mdmweb.git - Gitblit

	index.html	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/favicon.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/img/logo.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/img/logo123.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/initiallong.b9495273.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/common.js	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/flowmgr/programexport.js	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/tool/code.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/config/website.js	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/lang/zh.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/flow/components/TodolistLeft.vue	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/flowmgr/programexport.vue	195 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/tasks/machinereturnfileop.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/wel/index.vue	102 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 index.html

@@ -1,3 +1,11 @@
<!--
 * @Author: æå(å¼åç») lzhe@yxqiche.com
 * @Date: 2025-05-28 12:03:55
 * @LastEditors: æå(å¼åç») lzhe@yxqiche.com
 * @LastEditTime: 2025-07-07 17:36:28
 * @FilePath: /dev-optimize-0710-lzhe/Users/test/MDM/mdmweb/index.html
 * @Description: è¿æ¯é»è®¤è®¾ç½®,è¯·è®¾ç½®`customMade`, æå¼koroFileHeaderæ¥çéç½® è¿è¡è®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<!DOCTYPE html>
<html lang='en'>

@@ -18,19 +26,16 @@
  <link rel='stylesheet' href='/iconfont/common/iconfont.css'>
  <link rel='stylesheet' href='/css/loading.css'>
  <link rel='stylesheet' href='/css/saber.css'>
  <title>BladeXå¾®æå¡å¼åå¹³å°</title>
  <title>MDMç®¡çå¹³å°</title>
</head>

<body>
<div id='app'>
  <div id='loader-wrapper'>
    <div class='loader-box'>
      <span>BladeX</span>
      <span>å¾®</span>
      <span>æ</span>
      <span>å¡</span>
      <span>å¼</span>
      <span>å</span>
      <span>MDM</span>
      <span>ç®¡</span>
      <span>ç</span>
      <span>å¹³</span>
      <span>å°</span>
    </div>

 public/favicon.png



 public/img/logo.png



 public/img/logo123.png


 public/initiallong.b9495273.png


 src/api/common.js

@@ -1,3 +1,9 @@
/*
 * @Date: 2025-05-27 23:44:41
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-07-07 22:47:09
 * @FilePath: /mdmweb/src/api/common.js
 */
import request from '@/axios';

/**
@@ -13,3 +19,12 @@
    responseType: 'blob',
  });
};
export const exportBlobPost = (url, params,data) => {
  return request({
    url: url,
    params: params,
    data,
    method: 'post',
    responseType: 'blob',
  });
};

 src/api/flowmgr/programexport.js

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,18 @@
/*
 * @Date: 2025-06-12 22:38:05
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-07-07 21:49:01
 * @FilePath: /mdmweb/src/api/flowmgr/programexport.js
 */
import request from '@/axios';
export const getList = (current, size, params) => {
  return request({
    url: '/blade-mdm/program/exchange/export-dnc-page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    },
  })
};

 src/api/tool/code.js

@@ -18,7 +18,7 @@
    method: 'post',
    params: {
      ids,
      system: 'saber',
      system: 'MDM',
    },
  });
};

 src/config/website.js

@@ -1,11 +1,19 @@
/*
 * @Author: æå(å¼åç») lzhe@yxqiche.com
 * @Date: 2025-06-11 10:04:08
 * @LastEditors: æå(å¼åç») lzhe@yxqiche.com
 * @LastEditTime: 2025-07-07 17:46:08
 * @FilePath: /dev-optimize-0710-lzhe/Users/test/MDM/mdmweb/src/config/website.js
 * @Description: è¿æ¯é»è®¤è®¾ç½®,è¯·è®¾ç½®`customMade`, æå¼koroFileHeaderæ¥çéç½® è¿è¡è®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
/**
 * å¨å±éç½®æä»¶
 */
export default {
  title: 'Saber',
  title: 'MDM',
  logo: 'X',
  key: 'saber', //éç½®ä¸»é®,ç®åç¨äºåå¨
  indexTitle: 'BladeX å¾®æå¡å¹³å°',
  indexTitle: 'MDMç®¡çå¹³å°',
  clientId: 'saber3', // å®¢æ·ç«¯id
  clientSecret: 'saber3_secret', // å®¢æ·ç«¯å¯é¥
  tenantMode: false, // æ¯å¦å¼å¯ç§æ·æ¨¡å¼
@@ -50,7 +58,7 @@
  //æ°´å°éç½®
  watermark: {
    mode: false,
    text: 'BladeX',
    text: 'MDM',
  },
  //oauth2éç½®
  oauth2: {

 src/lang/zh.js

@@ -1,5 +1,5 @@
export default {
  title: 'BladeXå¾®æå¡å¹³å°',
  title: 'MDMç®¡çå¹³å°',
  confirmTip: 'æç¤º',
  logoutTip: 'éåºç³»ç», æ¯å¦ç»§ç»?',
  submitText: 'ç¡®å®',
@@ -79,7 +79,7 @@
  },
  login: {
    title: 'ç»å½ ',
    info: 'BladeX å¾®æå¡å¹³å°',
    info: 'MDMç®¡çå¹³å°',
    tenantId: 'è¯·è¾å¥ç§æ·ID',
    name: 'è¯·è¾å¥å§å',
    username: 'è¯·è¾å¥è´¦å·',

 src/views/flow/components/TodolistLeft.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2025-07-01 20:45:15
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-07-01 23:50:05
 * @LastEditTime: 2025-07-07 20:00:11
 * @FilePath: /mdmweb/src/views/flow/components/TodolistLeft.vue
-->
<template>
@@ -9,12 +9,15 @@
        <div class="tool" v-show="row.taskDefinitionKey === 'programmingTask'">
            <el-button type="primary" @click="addApp">æ·»å ç¨åº</el-button>
        </div>
        <el-table :data="tableData" border @row-click="showContent">
            <el-table-column prop="code" label="ç¼å·">
        <el-table :data="tableData" border @row-click="showContent" max-height="200">
            <el-table-column prop="machineCode" label="å å·¥æºåº">
            </el-table-column>
            <el-table-column prop="name" label="ç¨åºåç§°">
            </el-table-column>
            <el-table-column prop="name" label="å·¥åºåç§°">
            <el-table-column fixed="right" label="æä½" width="100">
            <template #default="scope" v-show="row.taskDefinitionKey === 'programmingTask'">
                <el-button type="text" size="small" @click.stop="del(scope.$index,scope.row)">å é¤</el-button>
            </template>
            </el-table-column>
        </el-table>
        <h4>ç¨åºåå®¹</h4>
@@ -75,17 +78,17 @@
                dialogClickModal: false,
                column: [
                    {
                        label: 'machineCode',
                        prop: 'è®¾å¤ç¼å·',
                        label: 'å å·¥æºåº',
                        prop: 'machineCode',
                    },
                    {
                        label: 'ç¨åºåç§°',
                        prop: 'name',
                    },
                    {
                        label: 'å·¥åºåç§°',
                        prop: 'processName',
                    },
                    // {
                    //     label: 'å·¥åºåç§°',
                    //     prop: 'processName',
                    // },
                ],
            },
        }
@@ -140,6 +143,10 @@
                    this.appContent = 'ç¨åºåå®¹å è½½å¤±è´¥'
                }
            })
        },
        del (index,row) {
            this.tableData = this.tableData.filter(item => item.id !== row.id);
            this.$emit('selection-change',this.tableData)   
        }
    },
}
@@ -156,7 +163,9 @@
}
.app-content {
    background-color: #fffee1;
    padding: 10px;
    padding: 10px 30px;
    min-height: 100px;
    overflow: auto;
    max-height: 400px;
}
</style>

 src/views/flowmgr/programexport.vue

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,195 @@
<!--
 * @Date: 2025-06-20 20:48:17
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-07-07 23:00:25
 * @FilePath: /mdmweb/src/views/flowmgr/programexport.vue
-->
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange">
            <template #menu-left>
                <!-- <el-button type="primary" plain @click="exportWebSite">å¯¼åºåä¼ æ¶å¯ç½</el-button> -->
                <!-- <el-button type="primary" plain @click="reassign">æè½½è½¦åºç¨åºåº</el-button> -->
                <el-button type="primary" plain @click="exportExcel">å¯¼åº</el-button>
            </template>
            <template #menu="scope">
                <!-- <el-button type="primary" text size="default"
                    @click.stop="handleAction(scope.row, scope.index)">å¤çæè§
                </el-button> -->
            </template>
        </avue-crud>
    </basic-container>
</template>

<script>
    import { getList } from '@/api/flowmgr/programexport.js';
    import NProgress from 'nprogress';
    import { exportBlobPost } from '@/api/common';
    import { getToken } from '@/utils/auth';
    import { downloadFile } from '@/utils/util';
    export default {
    name: 'programexport',
    data() {
        return {
            // Define your data properties here
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            form: {},
            query: {},
            loading: true,
            data: [],
            selection: [],
            option: {
                addBtn: false,
                editBtn: false,
                delBtn: false,
                viewBtn: true,
                columnBtn: false,
                tip: false,
                // simplePage: true,
                searchShow: true,
                searchMenuSpan: 6,
                dialogWidth: '60%',
                // tree: true,
                border: true,
                index: true,
                selection: true,
                // viewBtn: true,
                menuWidth: 200,
                menu: false,
                dialogClickModal: false,
                column: [
                    {
                        label: 'å¾å·',
                        prop: 'partNo',
                    },
                    {
                        label: 'å¾å·çæ¬¡',
                        prop: 'partNoEdition',
                    },
                    {
                        label: 'å·¥åºåç§°',
                        prop: 'processName',
                    },
                    {
                        label: 'ç¨åºåç§°',
                        prop: 'name',
                        search: true,
                    },
                    {
                        label: 'éè¿æ¶é´',
                        prop: 'createTime',
                    },
                    {
                        label: 'å®ææ¶é´',
                        prop: 'passTime',
                        search: true,
                        hide: true,
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                        searchRange: true,
                        searchSpan: 8,
                    },
                ],
            }
        };
    },
    methods: {
        selectionChange(list) {
            this.selection = list;
        },
        // Define your methods here
        currentChange(currentPage) {
            this.page.currentPage = currentPage;
            // this.onLoad();
        },
        sizeChange(pageSize) {
            this.page.pageSize = pageSize;
        },
        refreshChange() {
            this.onLoad(this.page, this.query);
        },
        searchChange(params, done) {
            let data = {}
            this.query = params;
            this.page.currentPage = 1;
            console.log('searchChange', params);
            params.passTimeBegin = params?.passTime?.[0] || '';
            params.passTimeEnd = params?.passTime?.[1] || '';
            console.log(params);
            data = {
                createTimeBegin: params.passTimeBegin,
                createTimeEnd: params.passTimeEnd,
                name: params.name || ''
            }
            this.query = data
            this.onLoad(this.page, data);
            done();
        },
        searchReset() {
            this.query = {};
            this.onLoad(this.page);
        },
        /** * é¡µé¢å è½½æ¶è·åæ°æ®
         */
        onLoad(page, params = {}) {
            console.log('onLoad', page, params);
            const query = {
                ...this.query,
                // category: params.category ? flowCategory(params.category) : null,
                mode: this.mode,
            };
            try {
                delete query.confirmTime; // å é¤ä¸å¿è¦çæ¥è¯¢æ¡ä»¶
            } catch (error) {
                console.error('æ¥ææ ¼å¼åéè¯¯', error);
            }

            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
                const data = res.data.data;
                this.page.total = data.total;
                this.data = data.records;
                this.loading = false;
            }, () => {
                this.data = [];
                this.loading = false;
            }).catch(err => {
                this.data = [];
                this.loading = false;
            });
        },
        exportExcel() {
            this.$confirm('æ¯å¦å¯¼åº?', 'æç¤º', {
                confirmButtonText: 'ç¡®å®',
                cancelButtonText: 'åæ¶',
                type: 'warning',
            }).then(() => {
                console.log(this.selection)
                NProgress.start();
                exportBlobPost(
                    `/blade-mdm/program/exchange/export-dnc`,
                    {},
                    {ids: this.selection.map(item => item.id)},
                ).then(res => {
                    console.log(res);
                    downloadFile(res.data, `å¯¼åºDNC${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
                    NProgress.done();
                });
            });
        },
    },
    mounted() {

    }
}
</script>

<style lang="scss" scoped>

</style>

 src/views/tasks/machinereturnfileop.vue

@@ -76,7 +76,7 @@

                    {
                        label: 'ç¨åºç¼å·',
                        prop: 'programName',
                        prop: 'code',
                    },
                    {
                        label: 'åä¼ æºåº',
@@ -85,14 +85,14 @@

                    {
                        label: 'æä»¶åç§°',
                        prop: '',
                        formatter: (val, value, label) => {
                            return `${val?.variables?.machineCode}`;
                        },
                        prop: 'name'
                    },
                    {
                        label: 'æä»¶åºåç¶æ',
                        prop: 'machineCode',
                        prop: 'isCured',
                        formatter: (val, value, label) => {
                            return `${val==0?'æªåºå':"å·²åºå"}`;
                        },
                    },
                    {
                        label: 'æä»¶å°è¾¾æ¶é´',
@@ -100,11 +100,7 @@
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                    },
                    {
                        label: 'æä»¶æ°æ®åºç¼å·',
                        prop: '',
                    },
                    }
                ],
            }
        }

 src/views/wel/index.vue

@@ -25,26 +25,24 @@
        <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 == 60 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="ä¸å" title="ä¸å"></el-button>
      </template>
    </avue-crud>
    <el-dialog :title="modalTitle" append-to-body v-model="modalBox">
      <avue-form :option="modalOption" v-model="modalForm" @submit="modalSubmit" @reset-change="modalCancel"/>
    </el-dialog>
    <el-dialog title="ä¸ä¼ æä»¶" append-to-body v-model="uploadmodalBox">
      <avue-form :option="uploadmodalOption" v-model="uploadmodalForm" @submit="uploadmodalSubmit" @reset-change="uploadmodalCancel" :upload-before="uploadBefore" :upload-after="uploadAfter">
        <template #filelist>
          <div v-for="item in fileList" v-if="fileList.length > 0">
      <avue-form :option="uploadmodalOption" v-model="uploadmodalForm" @submit="uploadmodalSubmit" @reset-change="uploadmodalCancel" :upload-before="uploadBefore" :upload-after="uploadAfter"></avue-form>
    </el-dialog>
    <avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;" v-if="isShowTabs"></avue-tabs>
      <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'">
          <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>
          </div>
        </template>
      </avue-form>
    </el-dialog>

    <avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;"></avue-tabs>
      <avue-form v-if="tabsType === 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
      <span v-else-if="tabsType === 'tab2'">çæ¬ä¿¡æ¯</span>
      <span v-else-if="tabsType === 'tab3'">æä»¶åå®¹</span>
      </template>
  </basic-container>
</template>

@@ -53,6 +51,9 @@
export default {
  data() {
    return {
      isSM: false,  //æ¯å¦æ¯æ¶å¯ç½ ï¼å·¥æ§ç½5ä¸ªï¼æ¶å¯ç½4ä¸ª
      isShowTabs: true,
      nodeTypeList: [],
      fileList: [],
      tabsType: "tab1",
      tabsOption: {},
@@ -88,7 +89,7 @@
        column: [
          {
            label: 'èç¹ç±»å',
            prop: 'nodeType',
            prop: 'nodeTypeName',
            disabled: true,
            placeholder: " "
          },
@@ -121,13 +122,6 @@
            prop: 'updateTime',
            disabled: true,
            placeholder: " "
          },
          {
            label: 'èç¹å¨è·¯å¾',
            prop: '',
            disabled: true,
            placeholder: " ",
            span: 24
          }
        ]
      },
@@ -166,11 +160,6 @@
            hide: true
          },
          {
            label: 'å¨è·¯å¾',
            prop: 'abc',
            span: 24
          },
          {
            label: 'å¤æ³¨',
            prop: 'remark',
            type: "textarea",
@@ -204,7 +193,7 @@
          {
            label: 'ç®å½',
            prop: 'name',
            width: '300'
            width: '360'
          },
          {
            label: 'çæ¬',
@@ -274,20 +263,11 @@
            label: 'éæ©æä»¶',
            prop: 'uploadFile',
            type: 'upload',
            data: {nodeId: this.tabsForm.id}, 
            data: {nodeId: this.id}, 
            action: "",
            showFileList: false,
            span: 24,
            action: "/blade-mdm/program/ncfile/upload"
          },
          {
            label: 'æä»¶åè¡¨',
            prop: 'filelist'
          },
          {
            label: 'å¨è·¯å¾',
            prop: 'abc',
            span: 24
          },
          {
            label: 'å¤æ³¨',
@@ -305,6 +285,12 @@
    }
  },
  methods: {
    downsend(row) {

    },
    uploadAfter() {
      this.getFile(this.id);
    },
    upgrade(row) {  //åçº§
      this.loading = true;
      var obj = {id: row.id}
@@ -327,7 +313,8 @@
        params: obj,
      }).then(
        resp => {
          this.getFile(this.uploadmodalForm.id);
          this.loading = false;
          this.getFile(this.id);
        }
      );
    },
@@ -335,28 +322,35 @@
      done();
      //nodeId: this.tabsForm.id
    },
    uploadAfter(res,done,loading,column) {
      this.getFile(column.data.nodeId);
    },
    rowClick(row) {
      this.tabsForm = row;
      this.id = row.id;
      this.isShowTabs = false;
      this.nodeTypeList.forEach(item=> {
        if(item.dictKey == row.nodeType) {
          this.tabsForm.nodeTypeName = item.dictValue;
        }
      })
      if(this.tabsForm.nodeType < 60) {
        this.tabsOption = this.tabsOption1;
      }else {
        this.tabsOption = this.tabsOption2;
        //è·åæä»¶list
        this.getFile(row.id);
      }
      this.$nextTick(()=> {
        this.tabsType = 'tab1';
        this.isShowTabs = true;
      })
    },
    tabsHandleChange(tabs) {
      this.tabsType = tabs.prop;
    },
    showUpload(row) {
      this.uploadmodalForm = row;
      //è·åæä»¶list
      this.getFile(row.id);
      this.uploadmodalBox = true;
    },
    getFile(id) {
      this.loading = true;
      var obj = {nodeId: id}
      axios({
        url: '/blade-mdm/program/ncfile/list-by-node',
@@ -369,7 +363,8 @@
      );
    },
    uploadmodalSubmit(row,done) {
      
      this.uploadmodalBox = false;
      done();
    },
    rowDel(row, index, done) {
      done(row);
@@ -503,6 +498,11 @@
        res => {
          this.data = res.data.data;
          this.tabsForm = res.data.data[0];  //èç¹ä¿¡æ¯
          this.nodeTypeList.forEach(item=> {
            if(item.dictKey == this.data[0].nodeType) {
              this.tabsForm.nodeTypeName = item.dictValue;
            }
          })
          this.loading = false;
        }
      );
@@ -510,6 +510,18 @@
  },
  mounted() {
    this.tabsOption = this.tabsOption1;
    //è·ånodetype
    axios({url: '/blade-system/dict-biz/dictionary?code=nc_node_type',method: 'get'}).then(res => {
        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") {
          this.isSM = true;
        }
      }
    );
    //æ¥çåå®¹
    // this.loading = true;
    // var obj = {id: "1940982493963415554"}
@@ -535,4 +547,8 @@
  margin-left: 12px;
  cursor: pointer;
}
.fileListStyle {
  margin-left: 10px;
  margin-top: 12px;
}
</style>

			@@ -1,3 +1,11 @@
			<!--
			* @Author: æå(å¼åç») lzhe@yxqiche.com
			* @Date: 2025-05-28 12:03:55
			* @LastEditors: æå(å¼åç») lzhe@yxqiche.com
			* @LastEditTime: 2025-07-07 17:36:28
			* @FilePath: /dev-optimize-0710-lzhe/Users/test/MDM/mdmweb/index.html
			* @Description: è¿æ¯é»è®¤è®¾ç½®,è¯·è®¾ç½®`customMade`, æå¼koroFileHeaderæ¥çéç½® è¿è¡è®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
			-->
			<!DOCTYPE html>
			<html lang='en'>

			@@ -18,19 +26,16 @@
			<link rel='stylesheet' href='/iconfont/common/iconfont.css'>
			<link rel='stylesheet' href='/css/loading.css'>
			<link rel='stylesheet' href='/css/saber.css'>
			<title>BladeXå¾®æå¡å¼åå¹³å°</title>
			<title>MDMç®¡çå¹³å°</title>
			</head>

			<body>
			<div id='app'>
			<div id='loader-wrapper'>
			<div class='loader-box'>
			<span>BladeX</span>
			<span>å¾®</span>
			<span>æ</span>
			<span>å¡</span>
			<span>å¼</span>
			<span>å</span>
			<span>MDM</span>
			<span>ç®¡</span>
			<span>ç</span>
			<span>å¹³</span>
			<span>å°</span>
			</div>

			@@ -1,3 +1,9 @@
			/*
			* @Date: 2025-05-27 23:44:41
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-07 22:47:09
			* @FilePath: /mdmweb/src/api/common.js
			*/
			import request from '@/axios';

			/**
			@@ -13,3 +19,12 @@
			responseType: 'blob',
			});
			};
			export const exportBlobPost = (url, params,data) => {
			return request({
			url: url,
			params: params,
			data,
			method: 'post',
			responseType: 'blob',
			});
			};

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,18 @@
			/*
			* @Date: 2025-06-12 22:38:05
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-07 21:49:01
			* @FilePath: /mdmweb/src/api/flowmgr/programexport.js
			*/
			import request from '@/axios';
			export const getList = (current, size, params) => {
			return request({
			url: '/blade-mdm/program/exchange/export-dnc-page',
			method: 'get',
			params: {
			...params,
			current,
			size,
			},
			})
			};

			@@ -18,7 +18,7 @@
			method: 'post',
			params: {
			ids,
			system: 'saber',
			system: 'MDM',
			},
			});
			};

			@@ -1,11 +1,19 @@
			/*
			* @Author: æå(å¼åç») lzhe@yxqiche.com
			* @Date: 2025-06-11 10:04:08
			* @LastEditors: æå(å¼åç») lzhe@yxqiche.com
			* @LastEditTime: 2025-07-07 17:46:08
			* @FilePath: /dev-optimize-0710-lzhe/Users/test/MDM/mdmweb/src/config/website.js
			* @Description: è¿æ¯é»è®¤è®¾ç½®,è¯·è®¾ç½®`customMade`, æå¼koroFileHeaderæ¥çéç½® è¿è¡è®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
			*/
			/**
			* å¨å±éç½®æä»¶
			*/
			export default {
			title: 'Saber',
			title: 'MDM',
			logo: 'X',
			key: 'saber', //éç½®ä¸»é®,ç®åç¨äºåå¨
			indexTitle: 'BladeX å¾®æå¡å¹³å°',
			indexTitle: 'MDMç®¡çå¹³å°',
			clientId: 'saber3', // å®¢æ·ç«¯id
			clientSecret: 'saber3_secret', // å®¢æ·ç«¯å¯é¥
			tenantMode: false, // æ¯å¦å¼å¯ç§æ·æ¨¡å¼
			@@ -50,7 +58,7 @@
			//æ°´å°éç½®
			watermark: {
			mode: false,
			text: 'BladeX',
			text: 'MDM',
			},
			//oauth2éç½®
			oauth2: {

			@@ -1,5 +1,5 @@
			export default {
			title: 'BladeXå¾®æå¡å¹³å°',
			title: 'MDMç®¡çå¹³å°',
			confirmTip: 'æç¤º',
			logoutTip: 'éåºç³»ç», æ¯å¦ç»§ç»?',
			submitText: 'ç¡®å®',
			@@ -79,7 +79,7 @@
			},
			login: {
			title: 'ç»å½ ',
			info: 'BladeX å¾®æå¡å¹³å°',
			info: 'MDMç®¡çå¹³å°',
			tenantId: 'è¯·è¾å¥ç§æ·ID',
			name: 'è¯·è¾å¥å§å',
			username: 'è¯·è¾å¥è´¦å·',

			@@ -1,7 +1,7 @@
			<!--
			* @Date: 2025-07-01 20:45:15
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-01 23:50:05
			* @LastEditTime: 2025-07-07 20:00:11
			* @FilePath: /mdmweb/src/views/flow/components/TodolistLeft.vue
			-->
			<template>
			@@ -9,12 +9,15 @@
			<div class="tool" v-show="row.taskDefinitionKey === 'programmingTask'">
			<el-button type="primary" @click="addApp">æ·»å ç¨åº</el-button>
			</div>
			<el-table :data="tableData" border @row-click="showContent">
			<el-table-column prop="code" label="ç¼å·">
			<el-table :data="tableData" border @row-click="showContent" max-height="200">
			<el-table-column prop="machineCode" label="å å·¥æºåº">
			</el-table-column>
			<el-table-column prop="name" label="ç¨åºåç§°">
			</el-table-column>
			<el-table-column prop="name" label="å·¥åºåç§°">
			<el-table-column fixed="right" label="æä½" width="100">
			<template #default="scope" v-show="row.taskDefinitionKey === 'programmingTask'">
			<el-button type="text" size="small" @click.stop="del(scope.$index,scope.row)">å é¤</el-button>
			</template>
			</el-table-column>
			</el-table>
			<h4>ç¨åºåå®¹</h4>
			@@ -75,17 +78,17 @@
			dialogClickModal: false,
			column: [
			{
			label: 'machineCode',
			prop: 'è®¾å¤ç¼å·',
			label: 'å å·¥æºåº',
			prop: 'machineCode',
			},
			{
			label: 'ç¨åºåç§°',
			prop: 'name',
			},
			{
			label: 'å·¥åºåç§°',
			prop: 'processName',
			},
			// {
			// label: 'å·¥åºåç§°',
			// prop: 'processName',
			// },
			],
			},
			}
			@@ -140,6 +143,10 @@
			this.appContent = 'ç¨åºåå®¹å è½½å¤±è´¥'
			}
			})
			},
			del (index,row) {
			this.tableData = this.tableData.filter(item => item.id !== row.id);
			this.$emit('selection-change',this.tableData)
			}
			},
			}
			@@ -156,7 +163,9 @@
			}
			.app-content {
			background-color: #fffee1;
			padding: 10px;
			padding: 10px 30px;
			min-height: 100px;
			overflow: auto;
			max-height: 400px;
			}
			</style>

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,195 @@
			<!--
			* @Date: 2025-06-20 20:48:17
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-07 23:00:25
			* @FilePath: /mdmweb/src/views/flowmgr/programexport.vue
			-->
			<template>
			<basic-container>
			<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
			@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange">
			<template #menu-left>
			<!-- <el-button type="primary" plain @click="exportWebSite">å¯¼åºåä¼ æ¶å¯ç½</el-button> -->
			<!-- <el-button type="primary" plain @click="reassign">æè½½è½¦åºç¨åºåº</el-button> -->
			<el-button type="primary" plain @click="exportExcel">å¯¼åº</el-button>
			</template>
			<template #menu="scope">
			<!-- <el-button type="primary" text size="default"
			@click.stop="handleAction(scope.row, scope.index)">å¤çæè§
			</el-button> -->
			</template>
			</avue-crud>
			</basic-container>
			</template>

			<script>
			import { getList } from '@/api/flowmgr/programexport.js';
			import NProgress from 'nprogress';
			import { exportBlobPost } from '@/api/common';
			import { getToken } from '@/utils/auth';
			import { downloadFile } from '@/utils/util';
			export default {
			name: 'programexport',
			data() {
			return {
			// Define your data properties here
			page: {
			pageSize: 10,
			currentPage: 1,
			total: 0,
			},
			form: {},
			query: {},
			loading: true,
			data: [],
			selection: [],
			option: {
			addBtn: false,
			editBtn: false,
			delBtn: false,
			viewBtn: true,
			columnBtn: false,
			tip: false,
			// simplePage: true,
			searchShow: true,
			searchMenuSpan: 6,
			dialogWidth: '60%',
			// tree: true,
			border: true,
			index: true,
			selection: true,
			// viewBtn: true,
			menuWidth: 200,
			menu: false,
			dialogClickModal: false,
			column: [
			{
			label: 'å¾å·',
			prop: 'partNo',
			},
			{
			label: 'å¾å·çæ¬¡',
			prop: 'partNoEdition',
			},
			{
			label: 'å·¥åºåç§°',
			prop: 'processName',
			},
			{
			label: 'ç¨åºåç§°',
			prop: 'name',
			search: true,
			},
			{
			label: 'éè¿æ¶é´',
			prop: 'createTime',
			},
			{
			label: 'å®ææ¶é´',
			prop: 'passTime',
			search: true,
			hide: true,
			type: 'datetime',
			format: 'YYYY-MM-DD HH:mm:ss',
			valueFormat: 'YYYY-MM-DD HH:mm:ss',
			searchRange: true,
			searchSpan: 8,
			},
			],
			}
			};
			},
			methods: {
			selectionChange(list) {
			this.selection = list;
			},
			// Define your methods here
			currentChange(currentPage) {
			this.page.currentPage = currentPage;
			// this.onLoad();
			},
			sizeChange(pageSize) {
			this.page.pageSize = pageSize;
			},
			refreshChange() {
			this.onLoad(this.page, this.query);
			},
			searchChange(params, done) {
			let data = {}
			this.query = params;
			this.page.currentPage = 1;
			console.log('searchChange', params);
			params.passTimeBegin = params?.passTime?.[0] \|\| '';
			params.passTimeEnd = params?.passTime?.[1] \|\| '';
			console.log(params);
			data = {
			createTimeBegin: params.passTimeBegin,
			createTimeEnd: params.passTimeEnd,
			name: params.name \|\| ''
			}
			this.query = data
			this.onLoad(this.page, data);
			done();
			},
			searchReset() {
			this.query = {};
			this.onLoad(this.page);
			},
			/** * é¡µé¢å è½½æ¶è·åæ°æ®
			*/
			onLoad(page, params = {}) {
			console.log('onLoad', page, params);
			const query = {
			...this.query,
			// category: params.category ? flowCategory(params.category) : null,
			mode: this.mode,
			};
			try {
			delete query.confirmTime; // å é¤ä¸å¿è¦çæ¥è¯¢æ¡ä»¶
			} catch (error) {
			console.error('æ¥ææ ¼å¼åéè¯¯', error);
			}

			this.loading = true;
			getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
			const data = res.data.data;
			this.page.total = data.total;
			this.data = data.records;
			this.loading = false;
			}, () => {
			this.data = [];
			this.loading = false;
			}).catch(err => {
			this.data = [];
			this.loading = false;
			});
			},
			exportExcel() {
			this.$confirm('æ¯å¦å¯¼åº?', 'æç¤º', {
			confirmButtonText: 'ç¡®å®',
			cancelButtonText: 'åæ¶',
			type: 'warning',
			}).then(() => {
			console.log(this.selection)
			NProgress.start();
			exportBlobPost(
			`/blade-mdm/program/exchange/export-dnc`,
			{},
			{ids: this.selection.map(item => item.id)},
			).then(res => {
			console.log(res);
			downloadFile(res.data, `å¯¼åºDNC${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
			NProgress.done();
			});
			});
			},
			},
			mounted() {

			}
			}
			</script>

			<style lang="scss" scoped>

			</style>

			@@ -76,7 +76,7 @@

			{
			label: 'ç¨åºç¼å·',
			prop: 'programName',
			prop: 'code',
			},
			{
			label: 'åä¼ æºåº',
			@@ -85,14 +85,14 @@

			{
			label: 'æä»¶åç§°',
			prop: '',
			formatter: (val, value, label) => {
			return `${val?.variables?.machineCode}`;
			},
			prop: 'name'
			},
			{
			label: 'æä»¶åºåç¶æ',
			prop: 'machineCode',
			prop: 'isCured',
			formatter: (val, value, label) => {
			return `${val==0?'æªåºå':"å·²åºå"}`;
			},
			},
			{
			label: 'æä»¶å°è¾¾æ¶é´',
			@@ -100,11 +100,7 @@
			type: 'datetime',
			format: 'YYYY-MM-DD HH:mm:ss',
			valueFormat: 'YYYY-MM-DD HH:mm:ss',
			},
			{
			label: 'æä»¶æ°æ®åºç¼å·',
			prop: '',
			},
			}
			],
			}
			}

			@@ -25,26 +25,24 @@
			<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 == 60 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="ä¸å" title="ä¸å"></el-button>
			</template>
			</avue-crud>
			<el-dialog :title="modalTitle" append-to-body v-model="modalBox">
			<avue-form :option="modalOption" v-model="modalForm" @submit="modalSubmit" @reset-change="modalCancel"/>
			</el-dialog>
			<el-dialog title="ä¸ä¼ æä»¶" append-to-body v-model="uploadmodalBox">
			<avue-form :option="uploadmodalOption" v-model="uploadmodalForm" @submit="uploadmodalSubmit" @reset-change="uploadmodalCancel" :upload-before="uploadBefore" :upload-after="uploadAfter">
			<template #filelist>
			<div v-for="item in fileList" v-if="fileList.length > 0">
			<avue-form :option="uploadmodalOption" v-model="uploadmodalForm" @submit="uploadmodalSubmit" @reset-change="uploadmodalCancel" :upload-before="uploadBefore" :upload-after="uploadAfter"></avue-form>
			</el-dialog>
			<avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;" v-if="isShowTabs"></avue-tabs>
			<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'">
			<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>
			</div>
			</template>
			</avue-form>
			</el-dialog>

			<avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;"></avue-tabs>
			<avue-form v-if="tabsType === 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
			<span v-else-if="tabsType === 'tab2'">çæ¬ä¿¡æ¯</span>
			<span v-else-if="tabsType === 'tab3'">æä»¶åå®¹</span>
			</template>
			</basic-container>
			</template>

			@@ -53,6 +51,9 @@
			export default {
			data() {
			return {
			isSM: false, //æ¯å¦æ¯æ¶å¯ç½ ï¼å·¥æ§ç½5ä¸ªï¼æ¶å¯ç½4ä¸ª
			isShowTabs: true,
			nodeTypeList: [],
			fileList: [],
			tabsType: "tab1",
			tabsOption: {},
			@@ -88,7 +89,7 @@
			column: [
			{
			label: 'èç¹ç±»å',
			prop: 'nodeType',
			prop: 'nodeTypeName',
			disabled: true,
			placeholder: " "
			},
			@@ -121,13 +122,6 @@
			prop: 'updateTime',
			disabled: true,
			placeholder: " "
			},
			{
			label: 'èç¹å¨è·¯å¾',
			prop: '',
			disabled: true,
			placeholder: " ",
			span: 24
			}
			]
			},
			@@ -166,11 +160,6 @@
			hide: true
			},
			{
			label: 'å¨è·¯å¾',
			prop: 'abc',
			span: 24
			},
			{
			label: 'å¤æ³¨',
			prop: 'remark',
			type: "textarea",
			@@ -204,7 +193,7 @@
			{
			label: 'ç®å½',
			prop: 'name',
			width: '300'
			width: '360'
			},
			{
			label: 'çæ¬',
			@@ -274,20 +263,11 @@
			label: 'éæ©æä»¶',
			prop: 'uploadFile',
			type: 'upload',
			data: {nodeId: this.tabsForm.id},
			data: {nodeId: this.id},
			action: "",
			showFileList: false,
			span: 24,
			action: "/blade-mdm/program/ncfile/upload"
			},
			{
			label: 'æä»¶åè¡¨',
			prop: 'filelist'
			},
			{
			label: 'å¨è·¯å¾',
			prop: 'abc',
			span: 24
			},
			{
			label: 'å¤æ³¨',
			@@ -305,6 +285,12 @@
			}
			},
			methods: {
			downsend(row) {

			},
			uploadAfter() {
			this.getFile(this.id);
			},
			upgrade(row) { //åçº§
			this.loading = true;
			var obj = {id: row.id}
			@@ -327,7 +313,8 @@
			params: obj,
			}).then(
			resp => {
			this.getFile(this.uploadmodalForm.id);
			this.loading = false;
			this.getFile(this.id);
			}
			);
			},
			@@ -335,28 +322,35 @@
			done();
			//nodeId: this.tabsForm.id
			},
			uploadAfter(res,done,loading,column) {
			this.getFile(column.data.nodeId);
			},
			rowClick(row) {
			this.tabsForm = row;
			this.id = row.id;
			this.isShowTabs = false;
			this.nodeTypeList.forEach(item=> {
			if(item.dictKey == row.nodeType) {
			this.tabsForm.nodeTypeName = item.dictValue;
			}
			})
			if(this.tabsForm.nodeType < 60) {
			this.tabsOption = this.tabsOption1;
			}else {
			this.tabsOption = this.tabsOption2;
			//è·åæä»¶list
			this.getFile(row.id);
			}
			this.$nextTick(()=> {
			this.tabsType = 'tab1';
			this.isShowTabs = true;
			})
			},
			tabsHandleChange(tabs) {
			this.tabsType = tabs.prop;
			},
			showUpload(row) {
			this.uploadmodalForm = row;
			//è·åæä»¶list
			this.getFile(row.id);
			this.uploadmodalBox = true;
			},
			getFile(id) {
			this.loading = true;
			var obj = {nodeId: id}
			axios({
			url: '/blade-mdm/program/ncfile/list-by-node',
			@@ -369,7 +363,8 @@
			);
			},
			uploadmodalSubmit(row,done) {

			this.uploadmodalBox = false;
			done();
			},
			rowDel(row, index, done) {
			done(row);
			@@ -503,6 +498,11 @@
			res => {
			this.data = res.data.data;
			this.tabsForm = res.data.data[0]; //èç¹ä¿¡æ¯
			this.nodeTypeList.forEach(item=> {
			if(item.dictKey == this.data[0].nodeType) {
			this.tabsForm.nodeTypeName = item.dictValue;
			}
			})
			this.loading = false;
			}
			);
			@@ -510,6 +510,18 @@
			},
			mounted() {
			this.tabsOption = this.tabsOption1;
			//è·ånodetype
			axios({url: '/blade-system/dict-biz/dictionary?code=nc_node_type',method: 'get'}).then(res => {
			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") {
			this.isSM = true;
			}
			}
			);
			//æ¥çåå®¹
			// this.loading = true;
			// var obj = {id: "1940982493963415554"}
			@@ -535,4 +547,8 @@
			margin-left: 12px;
			cursor: pointer;
			}
			.fileListStyle {
			margin-left: 10px;
			margin-top: 12px;
			}
			</style>