From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw

---
 src/views/spare/modules/sparePart/SparePart2List.vue |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/spare/modules/sparePart/SparePart2List.vue b/src/views/spare/modules/sparePart/SparePart2List.vue
index 9fd59c3..2ac8d81 100644
--- a/src/views/spare/modules/sparePart/SparePart2List.vue
+++ b/src/views/spare/modules/sparePart/SparePart2List.vue
@@ -61,20 +61,30 @@
       <a-button
         @click="handleAdd"
         type="primary"
+        v-has="'sparePartList:add'"
         icon="plus"
         :hidden="disabled"
       >鏂板</a-button>
       <a-button
         type="primary"
         icon="download"
-        @click="handleExportXls('???')"
+        @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>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-button style="margin-left: 8px">
           鎵归噺鎿嶄綔
           <a-icon type="down" />
         </a-button>
-        <a-menu slot="overlay">
+        <a-menu slot="overlay" >
           <a-menu-item @click="batchDel">
             <a-icon type="delete" />鍒犻櫎
           </a-menu-item>
@@ -103,6 +113,7 @@
       >
         <a
           href="javascript:;"
+          v-has="'sparePartList:edit'"
           @click="handleEdit(record)"
         >缂栬緫</a>
         <a-divider type="vertical" />
@@ -111,11 +122,11 @@
             鏇村
             <a-icon type="down" />
           </a>
-          <a-menu slot="overlay">
+          <a-menu slot="overlay" v-has="'sparePartList:delete'">
             <!-- <a-menu-item>
               <a @click="handleEdit(record)">缂栬緫</a>
             </a-menu-item> -->
-            <a-menu-item>
+            <a-menu-item  >
               <a-popconfirm
                 title="纭畾鍒犻櫎鍚�?"
                 @confirm="() => handleDelete(record.id)"
@@ -303,7 +314,7 @@
         delete: "/spare/sparePart/delete",
         deleteBatch: "/spare/sparePart/deleteBatch",
         exportXlsUrl: '/spare/sparePart/exportXls',
-        // importExcelUrl: 'base/site/importExcel',
+        importExcelUrl: '/spare/sparePart/importExcel',
       },
       //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
       alterFlag: "",
@@ -331,6 +342,9 @@
         selectedRowKeys: this.selectedRowKeys,
       };
     },
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
   },
   methods: {
 

--
Gitblit v1.9.3