顶部提示0时隐藏，工控网任务页面

yangys

2025-09-25 e4c84d44e70e09ec6d69716bd6c722a953f980da

顶部提示0时隐藏，工控网任务页面

 src/page/index/top/top-menu.vue

@@ -1,20 +1,18 @@
<template>
  <el-menu class="top-menu" :default-active="activeIndex" mode="horizontal" text-color="#333">
    <el-menu-item index="0" @click="openHome(itemHome)">
    <el-menu-item index="0"  @click="openHome(itemHome)">
      <template #title>
        <i :class="itemHome.source" style="padding-right: 5px"></i>
        <span>{{ itemHome.name }}</span>
      </template>
    </el-menu-item>

    <el-menu-item index="0" @click="openTodo(itemHome)">
    <el-menu-item index="1"  @click="openTodo(itemHome)">
      
      <template #title>
           
               
           <el-dropdown>
            <span class="el-dropdown-link">
                 <el-badge ref="topbadge" :value="remindCount" :max="99" :offset="[10, 0]" :class="{'blink-badge':this.remindCount>0}">
                 <el-badge ref="topbadge" v-if="this.remindCount>0" :value="remindCount" :max="99" :offset="[10, 0]" :class="{'blink-badge':this.remindCount>0}">
                    <el-tooltip
                    class="box-item"
                    effect="dark"
@@ -26,27 +24,14 @@
                  </el-badge>
              </span>
              <template #dropdown>
                <el-dropdown-menu>

                  <el-dropdown-item v-for="item in remindItems" @click.native="handleRemindClick(item)">{{item.text}}</el-dropdown-item>

                </el-dropdown-menu>
                <el-dropdown-menu  v-if="this.remindCount>0">
                    <el-dropdown-item v-for="item in remindItems" @click.native="handleRemindClick(item)">{{item.text}}</el-dropdown-item>
                  </el-dropdown-menu>
              </template>
             
            </el-dropdown>
       
      </template>
      <!--
      <el-dropdown>
        <template #dropdown>
          <el-dropdown-menu>
            <el-dropdown-item>Action 1</el-dropdown-item>
            <el-dropdown-item>Action 2</el-dropdown-item>
          </el-dropdown-menu>
        </template>
      </el-dropdown>
    -->


    </el-menu-item>

    <template v-for="(item, index) in items" :key="index">
@@ -130,8 +115,9 @@
      }
    },
    openTodo() {
      if(this.remindCount>0){
        this.$router.push({ path: '/flow/todoindex' });
        //this.box = false;
      } 
    },
    
    getCount() {

 src/views/dataex/mdmprogramimp.vue

@@ -12,7 +12,7 @@
        <div style="display: flex;">
          <el-button type="primary" size="default" icon="el-icon-upload" @click="importData">导入</el-button>
          <el-button type="warning" size="default" icon="el-icon-delete" @click="clearList">清空</el-button>
          <el-button type="primary" size="default" icon="el-icon-check" plain @click="handleWarehouse" style="margin-left: 12px;">下传</el-button>
          <el-button type="primary" size="default" icon="el-icon-check" :disabled="selection.length==0" plain @click="handleWarehouse" style="margin-left: 12px;">下传</el-button>
        </div>
      </template>
    </avue-crud>

 src/views/dataex/programonmachineimp.vue

@@ -15,7 +15,7 @@
                <el-button type="primary" size="default" icon="el-icon-circle-plus" @click="importData">导入</el-button>
            </template>
        </avue-crud>
        <el-dialog title="导入现场编制记录" append-to-body v-model="excelBox" width="305px">
        <el-dialog title="导入现场编制记录" append-to-body v-model="excelBox" width="350px">
          <avue-form :option="formOption" v-model="form" :upload-after="uploadAfter">
          </avue-form>
    </el-dialog>

 src/views/tasks/machinebacktask.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,285 @@
<template>
  <basic-container>
    <avue-crud
      :addBtn="false"
      :option="option"
      :table-loading="loading"
      :data="data"
      ref="crud"
      v-model:search="search"
      v-model:page="mypage"
      @search-change="searchChange"
      @search-reset="searchReset"
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
      @selection-change="selectionChange"
      @on-load="onLoad"
    >
      <template #menu-left>
        <!-- el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">导出</el-button> 
        <el-button type="primary" v-if="this.search.dirType!='REC'" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="receiveBtn">接收已选</el-button>
-->
      </template>
      <!--
      <template #menu="scope">
        <el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-delete" @click.stop="rejectBtn(scope.row, scope.index)">拒绝</el-button>
        <el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-add" @click.stop="acceptBtn(scope.row, scope.index)">接收</el-button>
      </template>
      -->
    </avue-crud>
  </basic-container>
</template>

<script>
import { ElMessage } from 'element-plus';
import { exportBlob } from '@/api/common';
import { downloadXls ,getQueryString} from '@/utils/util';

import { getToken } from '@/utils/auth';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
export default {
  data() {
    return {
      selection: [],
      search: {
        status: 1, //默认未完成
        machineCode: "",
      },
      loading: true,
      treeData: [],
      
      mypage: {
        size: 10,
        current: 1,
        total: 0,
      },
      option: {
        //size:'small',
        index: true,
        //selection: true,
        //selectionWidth:30,
        addBtn: false,
        editBtn: false,
        delBtn: false,
        labelWidth: 120,
        emptyBtn: false,
        searchLabelWidth: "80",
        searchSpan: 4,
        menu:false,
        width:'100%',
        column: [
            {
            label: '程序名称',
            prop: 'programName',
            search:true,
            searchSpan:6,
            showOverflowTooltip:true,
          },
          {
            label: '机床编号',
            prop: 'machineCode',
            search:true,
            searchSpan:6,
            showOverflowTooltip:true,
          },
          {
            label: '临时更改单',
            prop: 'deviation',
          },
          /*{
            label: '临时更改单序号',
            prop: 'deviationSerial',
          },*/
          {
            label: '程序段数',
            prop: 'segCount',
            render: ({ row,value }) => {
              return row.segCount == 0 ?'未定':row.segCount;
            }
          },
          
          {
            label: '任务状态',
            prop: 'status',
            search:true,
            searchType:'select',
            searchSpan:6,
            dicData:[
              {
                label:'未完成',
                value:1
              },
              {
                label:'已完成',
                value:2
              }
            ],
            render: ({ row,value }) => {
              var txt = '未知';
              switch(row.status){
                case 1:
                  txt = '未完成';
                  break;
                case 2:
                  txt = '已完成';
                  break;
              }
              return txt;
            }
          },
          {
            label: '下发时间',
            prop: 'createTime',
          },
        ],
      },
      data: [],
    };
  },
  methods: {
    selectionChange(selection) {
      this.selection = selection;
    },

    receiveAll() {
      //接收符合条件的所有数据
      this.$confirm('确定要接收符合条件的所有文件吗?', {  //同接收接口相同
        confirmButtonText: '是',
        cancelButtonText: '否',
        type: 'warning',
      }).then(() => {
        //调用接口
        this.loading = true;
        axios({
          url: '/blade-mdm/machinefile/file/temp-accept-all',
          method: 'post',
          params: {}
        }).then(
          res => {
            this.loading = false;
            this.onLoad();
          }
        );
      })
    },

    receiveBtn() {
      if(this.selection.length == 0) {
        ElMessage({message: '请选择数据',type: 'error'})
      }
      var ids = [];
      this.selection.forEach(item=> {
        ids.push(item.id);
      })
      this.$confirm('确定要接收吗?', {  //同接收接口相同
        confirmButtonText: '是',
        cancelButtonText: '否',
        type: 'warning',
      }).then(() => {
        //调用接口
        this.loading = true;
        axios({
          url: '/blade-mdm/machinefile/collect/temp-accept',
          method: 'post',
          params: {ids: ids.join(',')},
        }).then(
          res => {
            this.loading = false;
            this.onLoad();
          }
        );
      })
    },
    
    searchReset() {
      //this.onLoad(this.mypage);
    },
    searchChange(params, done) {
      this.mypage.current = 1;
      this.onLoad();
      done();
    },
    currentChange(current) {
      this.mypage.current = current;
      this.onLoad();
    },
    sizeChange(size) {
      this.mypage.size = size;
      this.onLoad();
    },
    refreshChange() {
      
    },
    onLoad() {
      this.loading = true;
      var obj = {
        programName: this.search.programName,
        current: this.mypage.current,
        size: this.mypage.size,
        machineCode: this.search.machineCode,
        status:this.search.status
      }
      //console.log('myupage',this.mypage)
      axios({
        url: '/blade-mdm/gkw/machinebacktask/page',
        method: 'get',
        params: obj,
      }).then(
        res => {
          var screenHeight = window.innerHeight;
          this.option.maxHeight = (screenHeight - 390) + 'px';
          const data = res.data.data;
          this.mypage.total = data.total;
          this.data = data.records;
          this.loading = false;
        },
        error => {
            
        }
      );

    },
    
  },
  mounted() {
    
  }
};
</script>
<style lang="scss">
.gongkongMain {
  display: flex;
  padding: 0px;
  margin: 0px 7px 10px 7px;
  background-color: #fff;
  border-top: 1px solid #ccc;
  > div {
    padding: 12px;
  }
}
.gongkongMain > div:nth-child(1) {
  width:17%;
  border-right: 1px solid #ccc;
}
.gongkongMain div:nth-child(2) {
  flex: 1;
}
.paginationTree {
  margin-top: 12px;
  display: flex;
  justify-content: flex-end;
}
/*
.Avue-crud{
  :deep(.el-table) {
    .el-table__body-wrapper,
    .el-table__fixed-body-wrapper {
      max-height:calc(100vh - 630px)!important;
      overflow-y: auto;
    }
  }
}
*/
</style>

 src/views/tasks/machinereturnfileop.vue

@@ -10,7 +10,7 @@
            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
            <template #menu-left>
                <el-button type="primary" :disabled="this.selectedList.length==0" plain @click="exportWebSite">导出回传涉密网</el-button>
                <el-button type="primary" :disabled="this.selectedList.length==0" @click="exportWebSite">导出回传涉密网</el-button>
                <!--<el-button type="primary" plain @click="reassign">挂载车床程序库</el-button>-->
                <el-button type="primary" :disabled="this.selectedList.length==0" plain @click="exportExcel">导出到EXCEL</el-button>
            </template>
@@ -77,6 +77,18 @@
                        search:true,
                        type:'select',
                        searchSpan:4,
                        render: ({ row,value }) => {
                            var txt = '未知';
                            switch(row.status){
                                case 1:
                                    txt = '未导出';
                                    break;
                                case 2:
                                    txt = '已导出';
                                    break;
                            }
                            return txt;
                        },
                        dicData:[
                            {
                                label: '未导出',
@@ -98,14 +110,14 @@
                        render: ({ row,value }) => {
                            var txt = '未知';
                            switch(row.programStatus){
                                case 1:
                                case 'SQ':
                                txt = '试切';
                                break;
                                case 2:
                                case 'GH':
                                txt = '固化';
                                break;
                                case 3:
                                txt = '偏离';
                                case 'LG':
                                txt = '临时更改单';
                                break;
                                default:
                                txt = '未知';

 src/views/tasks/machinereturnfiles.vue

@@ -70,7 +70,7 @@
        total: 0,
      },
      option: {
        size:'mini',
        size:'small',
        index: true,
        selection: true,
        selectionWidth:30,

 src/views/wel/gongkong.vue

@@ -39,12 +39,13 @@
        <el-table-column prop="name" label="名称"/>
            <el-table-column prop="fileModifyTime" label="创建日期"  width="160"/>
        <el-table-column prop="fileModifyTime" label="修改日期"   width="160"/>
        <el-table-column prop="fileSizeDisplay" label="大小" width="80"/>
        <el-table-column prop="fileSizeDisplay" label="大小" width="100"/>
        <el-table-column fixed="right" label="操作" min-width="110">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="fileView(scope.row)">查看</el-button>
            <el-button link type="primary" size="small" @click="fileEdit(scope.row)">编辑</el-button>
            <el-button type="primary" text size="small" @click.stop="viewHistory(scope.row, scope.index)">修改记录</el-button>
            <el-button link type="primary" v-if="scope.row.dirType!='PROGRAM'" size="small" @click="fileEdit(scope.row)">编辑</el-button>
            <el-button type="primary" v-if="scope.row.dirType!='PROGRAM'" text size="small" @click.stop="viewHistory(scope.row, scope.index)">修改记录</el-button>
            <el-button type="primary" v-if="scope.row.dirType=='REC'" text size="small" @click.stop="changeName(scope.row)">改名</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -80,12 +81,20 @@
            <code-diff :old-string="this.content1" :new-string="this.content2" output-format="side-by-side" :hideStat="true" :filename="codeDiffFileName1" :newFilename="codeDiffFileName2"/>
        </div>
    </el-drawer>

    <el-dialog title="修改文件名" width="400" append-to-body v-model="changeNameModel">
       <avue-form :option="changeNameOption" v-model="changeNameForm" @submit="changeNameSubmit">
        
       </avue-form>
     
    </el-dialog>
</template>
<script>
import {
  getFileChangeList
} from '@/api/wel/changehis';
import { pageHeaderEmits } from 'element-plus';
import qs from 'qs';
export default {
  name: 'OrganizationTree',
  components: {},
@@ -96,6 +105,19 @@
      filterData: [], // è¿‡æ»¤åŽçš„数据
      activeNode: null,

      changeNameModel:false,
      changeNameForm : {},
      changeNameOption:{
        labelWidth:80,
        size:'mini',
        column:[
          {
            span:22,
            label:'文件名',
            prop:"name"
          }
        ]
      },
      defaultKeys: [],
      fileOptionTitle: "",
      fileContent: "",
@@ -209,7 +231,11 @@
    },
    fileView(row) {
      this.fileOptionTitle = "查看";
      this.getFileContent(row);
      if(row.dirType != 'PROGRAM'){
        this.getFileContent(row);
      }else{
        this.getProgramDirFileContent(row);
      }
    },
    fileEdit(row) {
      this.fileOptionTitle = "编辑";
@@ -217,12 +243,31 @@
      this.getFileContent(row);
    },
    viewHistory(row){
      console.log(row);
      this.viewHisModel = true;
      this.queryHis.machineFileId = row.id;
      this.onLoadHis();
    },

    changeName(row){
      //alert(row.id)
      this.changeNameForm.id = row.id;
      this.changeNameForm.name = row.name;
      this.changeNameModel = true;
    },
    changeNameSubmit(form,done){
      axios.post('/blade-mdm/gkw/node/change-file-name',qs.stringify(form)).then(res=>{
          if (res.data.code == 200) {
            this.$message.success('操作成功!');
            this.changeNameModel = false;
          } else {
              this.$message({ type: 'error', message: res.data.msg });
          }
      }).catch(error => {
          this.$message.error(res.data.msg );
      });
     
       done();
    },
    searchChangeHis(params, done) {
      let data = {}
      console.log(params)
@@ -252,7 +297,7 @@
    },
    hisCompare(row){
        //文件比对
        this.loading = true;
      this.loading = true;
      axios({
        url: '/blade-mdm/gkw/node/his-compare',
        method: 'get',
@@ -282,6 +327,20 @@
        }
      );
    },
    getProgramDirFileContent(row) {
      this.loading = true;
      axios({
        url: '/blade-mdm/ossfile/file-content',
        method: 'get',
        params: {ossFileName:row.ossName},
      }).then(
        res => {
          this.loading = false;
          this.fileDialogVisible = true;
          this.fileContent = res.data.data;
        }
      );
    },
    onQuery() {
      this.size = 10;
      this.searchTable(this.TreeNode);

 src/views/wel/shemi.vue

@@ -43,7 +43,7 @@
       
        <template #name="{ row }">
          <span>{{ row.name }}</span>
          <el-tag v-if="row.nodeType == 60" size="mini" effect="plain">v{{ row.versionNumber }}</el-tag>
          <el-tag v-if="row.nodeType == 60" style="margin-left:5px" size="mini" effect="plain">v{{ row.versionNumber }}</el-tag>
          <el-button icon="el-icon-download" @click="handleDownload(row)" class="treebtn" v-if="row.nodeType == 70" :size="size" text title="下载"></el-button>
          <el-button class="treebtn" :size="size" text v-if="permission.replace_button && row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
            icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="替换" title="替换"></el-button>
@@ -102,7 +102,7 @@
      </template> -->
        <template #name="{ row }">
          <span>{{ row.name }}</span>
          <el-tag v-if="row.nodeType == 60" size="mini" effect="plain">v{{ row.versionNumber }}</el-tag>
          <el-tag v-if="row.nodeType == 60" style="margin-left:5px" size="mini" effect="plain">v{{ row.versionNumber }}</el-tag>
          <el-button icon="el-icon-download" @click="handleDownload(row)" class="treebtn" v-if="row.nodeType == 70" :size="size" text title="下载"></el-button>
          <!-- æ›¿æ¢  v-if="permission.auto_dispatch"-->
          <el-button class="treebtn" :size="size" text v-if="permission.replace_button && row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"