From e205cad00ed14b91f7c7395146941ade750982bb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 17 一月 2024 15:29:13 +0800
Subject: [PATCH] 1、扭矩配置页面更名为参数配置，增加字段“进给参数” 2、设备监控页面设备表增加状态异常说明字段以及操作列状态反馈功能（具备鉴权功能） 3、设备加工工件报表页面取消分页器及日期字段 4、设备日志页面增加扭矩及进给参数工作曲线 5、设备运行参数报警页面新增至mdc模块数据报表菜单下并完成所有布局及功能实现 6、优化车间看板页面代码，手动设置拖拽区域高度以试图解决进入页面后无法随意拖拽问题（未在现场调试），全屏模式下无法使用功能，从全屏模式切换至普通模式下刷新页面以及优化设备详情弹窗样式
---
src/views/mdc/base/MdcplancloseList.vue | 67 +++++++++++++--------------------
1 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/src/views/mdc/base/MdcplancloseList.vue b/src/views/mdc/base/MdcplancloseList.vue
index d75aa2d..a90b63a 100644
--- a/src/views/mdc/base/MdcplancloseList.vue
+++ b/src/views/mdc/base/MdcplancloseList.vue
@@ -10,9 +10,6 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <!--<a-form-item label="鏃堕棿绫诲瀷">-->
- <!--<a-input placeholder="璇疯緭鍏ユ椂闂寸被鍨�" v-model="queryParam.planCloseTimeType"></a-input>-->
-
<a-form-item label="鏃堕棿绫诲瀷">
<a-select v-model="queryParam.planCloseTimeType" placeholder="璇烽�夋嫨鏃堕棿绫诲瀷">
<a-select-option value="">璇烽�夋嫨</a-select-option>
@@ -21,17 +18,11 @@
<a-select-option value="鏈�">鏈�</a-select-option>
</a-select>
</a-form-item>
-
- <!--</a-form-item>-->
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
- <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
- <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
- <!--</a>-->
</span>
</a-col>
</a-row>
@@ -42,10 +33,11 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <!--<a-button type="primary" icon="download" @click="handleExportXls('mdcPlanClose')">瀵煎嚭</a-button>-->
- <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
- <!--<a-button type="primary" icon="import">瀵煎叆</a-button>-->
- <!--</a-upload>-->
+ <a-button type="primary" icon="download" @click="importTemplate('璁″垝鍋滄満妯℃澘')">瀵煎叆妯℃澘</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('璁″垝鍋滄満绠＄悊')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload>
<!-- 楂樼骇鏌ヨ鍖哄煙 -->
<!--<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -66,7 +58,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
+ :scroll="{x:'max-content',y:465}"
bordered
rowKey="id"
:columns="columns"
@@ -76,26 +68,6 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
-
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
- </template>
- <template slot="imgSlot" slot-scope="text,record">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
- </template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
- 涓嬭浇
- </a-button>
- </template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -154,29 +126,33 @@
{
title:'绫诲瀷',
align:"center",
- dataIndex: 'planCloseType'
+ dataIndex: 'planCloseType',
+ width:500
},
{
title:'鏃堕棿绫诲瀷',
align:"center",
- dataIndex: 'planCloseTimeType'
+ dataIndex: 'planCloseTimeType',
+ width:350
},
{
title:'鏃堕暱锛堝垎閽燂級',
align:"center",
- dataIndex: 'planCloseTimeLong'
+ dataIndex: 'planCloseTimeLong',
+ width:350
},
{
title:'澶囨敞',
align:"center",
- dataIndex: 'remark'
+ dataIndex: 'remark',
+ width:380
},
{
title: '鎿嶄綔',
dataIndex: 'action',
align:"center",
fixed:"right",
- width:147,
+ width:150,
scopedSlots: { customRender: 'action' }
}
],
@@ -184,8 +160,8 @@
list: "/mdc/mdcPlanClose/list",
delete: "/mdc/mdcPlanClose/delete",
deleteBatch: "/mdc/mdcPlanClose/deleteBatch",
- exportXlsUrl: "/plan/mdcplanclose/exportXls",
- importExcelUrl: "plan/mdcplanclose/importExcel",
+ exportXlsUrl: "/mdc/mdcPlanClose/exportXls",
+ importExcelUrl: "mdc/mdcPlanClose/importExcel",
},
dictOptions:{},
@@ -201,6 +177,15 @@
},
},
methods: {
+ importTemplate(fileName){
+ var a = document.createElement("a");
+ a.href = "/static/璁″垝鍋滄満绠＄悊.xls";
+ a.download = "璁″垝鍋滄満绠＄悊.xls";
+ a.style.display = "none";
+ document.body.appendChild(a);
+ a.click();
+ a.remove();
+ },
initDictConfig(){
},
getSuperFieldList(){
--
Gitblit v1.9.3