yangys
2025-08-28 7bcc72a7fce7c0636b91b2d156e3d4962efb76a7
界面优化
已修改5个文件
11 ■■■■■ 文件已修改
.gitignore 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/components/TodolistLeft.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/donelist.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowmgr/programexport.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wel/shemi.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -1,7 +1,7 @@
.DS_Store
node_modules
/dist
dist.zip
/tests/e2e/videos/
/tests/e2e/screenshots/
src/views/flow/components/TodolistLeft.vue
@@ -12,6 +12,7 @@
            </el-button>
        </div>
         <el-text type="danger"  v-if="row.variables.curedLocked === 'Y'">固化程序已加锁,请谨慎使用</el-text>
         <el-text type="danger"  v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">已固化程序工序版次不一致,派工版次:{{row.variables.processEdition}},已固化版次:{{row.variables.curedProcessEdition}}</el-text>
        <el-table :data="tableData" border @row-click="showContent" max-height="200" highlight-current-row>
            <!-- <el-table-column prop="machineCode" label="加工机床">
            </el-table-column> -->
@@ -42,6 +43,7 @@
                </template>
            </el-table-column>
        </el-table>
        <!--
        <el-collapse>
            <el-collapse-item :title="`固化旧版本: 零组件号: ${row.variables.drawingNo} 工序号: ${row.variables.processNo } 工序版次: ${ row.variables.processEdition }`" name="1">
                <el-table :data="fileData" border @row-click="showContent" max-height="200" highlight-current-row>
@@ -62,7 +64,7 @@
                </el-table>
            </el-collapse-item>
        </el-collapse>
        -->
        <h4>程序内容</h4>
        <div v-html="appContent" class="app-content">
        </div>
src/views/flow/donelist.vue
@@ -292,6 +292,7 @@
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                        sortable:true,
                        search: false,
                        searchRange: true,
                        searchSpan: 8,
src/views/flowmgr/programexport.vue
@@ -28,7 +28,7 @@
                    <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>
                        <el-button type="primary" :disabled="this.selection.length==0" plain @click="exportExcel">导出</el-button>
                    </template>
                    <template #menu="scope">
                        <!-- <el-button type="primary" text size="default"
src/views/wel/shemi.vue
@@ -460,7 +460,7 @@
            label: '锁定状态',
            prop: 'isLocked',
            formatter: (val, value, label) => {
                if(val.nodeType == '60' || val.nodeType == '70'){
                if(val.nodeType == '60'){
                    if(value==1){
                        return '已锁定';
                    }else{