From b3cde9ac501fc7008bf660661dee0405e4bba786 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期一, 11 九月 2023 14:00:51 +0800 Subject: [PATCH] 数据报表界面层级的展示,浏览器适配,设备信息不展示坐标信息 --- src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 4 +++- src/views/mdc/base/MdcplancloseList.vue | 8 ++++---- src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue | 24 ++++++++++++------------ src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 4 +++- src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 4 +++- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/views/mdc/base/MdcplancloseList.vue b/src/views/mdc/base/MdcplancloseList.vue index 2305fcd..120f807 100644 --- a/src/views/mdc/base/MdcplancloseList.vue +++ b/src/views/mdc/base/MdcplancloseList.vue @@ -33,11 +33,11 @@ <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> <div class="table-operator"> <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button> - <a-button type="primary" icon="download" @click="importTemplate('璁″垝鍋滄満妯℃澘')">瀵煎叆妯℃澘</a-button> + <!--<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> + <!--<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"> diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue index eb338f9..e3506f2 100644 --- a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue +++ b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue @@ -238,18 +238,18 @@ </a-descriptions> - <a-descriptions - title="鍧愭爣淇℃伅" - v-show="xyzAliasesList != null" - v-if="driverType != 'PLC'" - :column="4" - > - <a-descriptions-item - v-for="(item,id) in xyzAliasesList " - :key="item.id" - :label="item.title" - >{{item.value}}</a-descriptions-item> - </a-descriptions> + <!--<a-descriptions--> + <!--title="鍧愭爣淇℃伅"--> + <!--v-show="xyzAliasesList != null"--> + <!--v-if="driverType != 'PLC'"--> + <!--:column="4"--> + <!-->--> + <!--<a-descriptions-item--> + <!--v-for="(item,id) in xyzAliasesList "--> + <!--:key="item.id"--> + <!--:label="item.title"--> + <!-->{{item.value}}</a-descriptions-item>--> + <!--</a-descriptions>--> <a-descriptions title="鐗堟湰淇℃伅 for lsv2" diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue index e67634a..15e6758 100644 --- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue +++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue @@ -402,8 +402,10 @@ z-index: 1; } .table tbody tr .wenzi{ + /*writing-mode: vertical-lr;*/ + /*text-orientation: upright;*/ + transform: rotate(360deg); writing-mode: vertical-lr; - text-orientation: upright; letter-spacing: 2px; } .table tbody tr .kaitou{ diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue index f8cf1a8..a42a1c8 100644 --- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue +++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue @@ -432,8 +432,10 @@ z-index: 1; } .table tbody tr .wenzi{ + /*writing-mode: vertical-lr;*/ + /*text-orientation: upright;*/ + transform: rotate(360deg); writing-mode: vertical-lr; - text-orientation: upright; letter-spacing: 2px; } .table tbody tr .kaitou{ diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue index d1b619d..19f2705 100644 --- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue +++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue @@ -473,8 +473,10 @@ z-index: 1; } .table tbody tr .wenzi{ + /*writing-mode: vertical-lr;*/ + /*text-orientation: upright;*/ + transform: rotate(360deg); writing-mode: vertical-lr; - text-orientation: upright; letter-spacing: 2px; } .table tbody tr .kaitou{ -- Gitblit v1.9.3