From 3e7d1c54e2d157c92d270facde45741ba507fd74 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 12 五月 2025 16:29:45 +0800
Subject: [PATCH] 1、全局删除设备类型以及设备级别展示字段 2、设备详情弹窗删除有效轴数和最大轴数展示字段 3、限制设备日志工作曲线弹窗采集周期最小值为100
---
src/views/mdc/base/EquipmentList.vue | 14 -
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 15 -
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 56 ------
src/views/mdc/base/DeviceBaseInfo.vue | 5
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 56 ------
src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue | 158 -----------------
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 5
src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue | 2
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 69 -------
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue | 102 -----------
10 files changed, 7 insertions(+), 475 deletions(-)
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index 0394307..4b0e728 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -91,11 +91,6 @@
color: '#FF0000'
},
{
- label: '寮傚父',
- value: 33,
- color: '#FFA200'
- },
- {
label: '鎬绘暟',
value: 99,
color: '#fff'
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index c3eddcd..3d34ad3 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -27,20 +27,6 @@
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧绾у埆">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
- <a-form-item label="璁惧绉嶇被">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
<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-col>
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
index 3e1b58a..980a5c5 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
@@ -84,15 +84,10 @@
<a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName}}</a-descriptions-item>
<a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIp}}</a-descriptions-item>
<a-descriptions-item label="绔彛鍙�">{{resultData.dataPort}}</a-descriptions-item>
- <!-- <a-descriptions-item label="绯荤粺鐗堟湰鍙�">{{resultData.systemVersion}}</a-descriptions-item>-->
<a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType}}</a-descriptions-item>
<a-descriptions-item label="璁惧鍨嬪彿">{{resultData.equipmentModel}}</a-descriptions-item>
<a-descriptions-item label="璁惧绫诲瀷">{{resultData.equipmentType}}</a-descriptions-item>
- <!-- <a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower}}</a-descriptions-item>-->
- <a-descriptions-item label="鏈夋晥杞存暟">{{resultData.validAxis}}</a-descriptions-item>
- <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.maxAxis}}</a-descriptions-item>
<a-descriptions-item label="澶囨敞">{{resultData.remark}}</a-descriptions-item>
-
</a-descriptions>
<!---鏁版嵁婧愯皟鏁� 鍔ㄦ�佸睍绀� 杩愯鏁版嵁---->
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 07795c1..06eedd3 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -1,84 +1,8 @@
<template>
<a-card :bordered="false" style="display: flex;flex-direction: column">
-
- <!-- 鏌ヨ鍖哄煙 -->
- <!--<div class="table-page-search-wrapper">-->
- <!--<a-form layout="inline" @keyup.enter.native="searchQuery">-->
- <!--<a-row :gutter="24">-->
- <!--<a-col :md="7" :sm="7">-->
- <!--<a-form-item label="璁惧鍚嶇О">-->
- <!--<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParam.equipmentName"></a-input>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="7" :sm="7">-->
- <!--<a-form-item label="鐘舵��">-->
- <!--<a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">-->
- <!--<a-select-option value="">璇烽�夋嫨</a-select-option>-->
- <!--<a-select-option value="0">鍏虫満</a-select-option>-->
- <!--<a-select-option value="2">寰呮満</a-select-option>-->
- <!--<a-select-option value="3">杩愯</a-select-option>-->
- <!--<a-select-option value="22">鎶ヨ</a-select-option>-->
- <!--</a-select>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="3" :sm="3">-->
- <!--<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
- <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
- <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
- <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
- <!--</a>-->
- <!--</span>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<template v-if="toggleSearchStatus">-->
- <!--<a-col :md="12" :sm="12">-->
- <!--<a-form-item label="閲囬泦鏃堕棿">-->
- <!--<a-range-picker @change="dateParamChange" v-model="dates"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</template>-->
-
- <!--</a-row>-->
- <!--</a-form>-->
- <!--</div>-->
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <!--<div class="table-operator" style="border-top: 5px">-->
- <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
- <!--<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>-->
- <!--</div>-->
-
<div class="equipmentList" id="DeviceList">
- <!--<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
- <!--<i class="anticon anticon-info-circle ant-alert-icon"></i>宸查�夋嫨 <a style="font-weight: 600">{{-->
- <!--selectedRowKeys.length }}</a>椤� -->
- <!--<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>-->
- <!--</div>-->
-
<a-table ref="table" bordered size="middle" rowKey="equipmentId" :columns="columns" :dataSource="dataSource"
- :pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}">
- <template slot="equipmentId" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="equipmentName" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="oporationDict" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="equipmentStatus" slot-scope="text">
- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
- </template>
- <template slot="collecttime" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="action" slot-scope="text, record">
- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
- <a>鐘舵�佸弽棣�</a>
- </a-popconfirm>
- </template>
- </a-table>
-
+ :pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}"/>
</div>
</a-card>
</template>
@@ -92,36 +16,23 @@
data() {
return {
loading:false,
- url: {
-
- },
columns: [
{
- title: '璁惧ID',
+ title: '璁惧缂栧彿',
align: "center",
dataIndex: 'equipmentId',
- scopedSlots: {customRender: 'equipmentId'},
width:210
},
{
title: '璁惧鍚嶇О',
align: "center",
dataIndex: 'equipmentName',
- scopedSlots: {customRender: 'equipmentName'},
width:300
},
{
title: '鐘舵��',
align: "center",
dataIndex: 'oporationDict',
- scopedSlots: {customRender: 'oporationDict'},
- width:200
- },
- {
- title: '璁惧寮傚父',
- align: "center",
- dataIndex: 'equipmentStatus',
- scopedSlots: {customRender: 'equipmentStatus'},
width:200
},
{
@@ -130,16 +41,7 @@
dataIndex: 'collecttime',
defaultSortOrder:'descend',
sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
- scopedSlots: {customRender: 'collecttime'},
width:350
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
- align: "center",
- width: 150,
- fixed:'right'
}
],
scrollY:465,
diff --git a/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue b/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue
index 864753c..a80086b 100644
--- a/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue
+++ b/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue
@@ -18,7 +18,7 @@
</a-col>
<a-col :span="6">
<a-form-item label="閲囨牱鍛ㄦ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input-number v-model="queryParams.period"/>
+ <a-input-number v-model="queryParams.period" :min="100"/>
</a-form-item>
</a-col>
</a-row>
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index a460738..01384b6 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -129,20 +129,6 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧绾у埆" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="model.deviceLevel" :disabled="disableSubmit" allow-clear/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-model-item label="璁惧绉嶇被" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="model.deviceCategory" :disabled="disableSubmit"
- allow-clear/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
<a-form-model-item label="鎺掑簭" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
v-model="model.sortNo" style="width: 100%"/>
@@ -376,6 +362,7 @@
this.model.driveType = val.drivetype
this.model.controlSystem = val.controlsystem
this.model.saveTableName = val.savetablename
+ this.model.systemType = val.controlsystem
}
},
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
index 8f038ea..92abd30 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -85,143 +85,11 @@
<a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName|formatDescriptionsItem}}</a-descriptions-item>
<a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIP|formatDescriptionsItem}}</a-descriptions-item>
<a-descriptions-item label="绔彛鍙�">{{resultData.dataPort|formatDescriptionsItem}}</a-descriptions-item>
- <a-descriptions-item label="绯荤粺鐗堟湰鍙�">{{resultData.systemVersion|formatDescriptionsItem}}</a-descriptions-item>
<a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType|formatDescriptionsItem}}</a-descriptions-item>
<a-descriptions-item label="璁惧鍨嬪彿">{{resultData.equipmentModel|formatDescriptionsItem}}</a-descriptions-item>
<a-descriptions-item label="璁惧绫诲瀷">{{resultData.deviceType|formatDescriptionsItem}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower|formatDescriptionsItem}}</a-descriptions-item>
- <a-descriptions-item label="鏈夋晥杞存暟">{{resultData.validAxis|formatDescriptionsItem}}</a-descriptions-item>
- <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.maxAxis|formatDescriptionsItem}}</a-descriptions-item>
<a-descriptions-item label="澶囨敞">{{resultData.remark|formatDescriptionsItem}}</a-descriptions-item>
</a-descriptions>
-
- <!-- <a-descriptions
- title="杩愯鏁版嵁"
- v-if="driverType != 'LSV2' && driverType != 'ZUOLAN' "
- :column="4"
- >
- <a-descriptions-item label="涓昏酱鍊嶇巼(%)">{{resultData.spindlebeilv}}</a-descriptions-item>
- <a-descriptions-item label="杩涚粰鍊嶇巼(%)">{{resultData.feedbeilv}}</a-descriptions-item>
- <a-descriptions-item label="涓昏酱璐熻嵎(%)">{{resultData.spindleload}}</a-descriptions-item>
- <a-descriptions-item label="涓昏酱杞��(rpm)">{{resultData.spindlespeed}}</a-descriptions-item>
- <a-descriptions-item label="杩涚粰閫熷害(mm/min)">{{resultData.feedrate}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="杩愯鏁版嵁 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="涓昏酱鍊嶇巼(%)">{{resultData.spindlebeilv}}</a-descriptions-item>
- <a-descriptions-item label="璁惧姝ｅ父杩愯鏃堕棿">{{resultData.equipmentNormalTime}}</a-descriptions-item>
- <a-descriptions-item label="蹇�熻繘缁欏�嶇巼(%)">{{resultData.rapidfeed}}</a-descriptions-item>
- <a-descriptions-item label="NC姝ｅ父杩愯鏃堕棿">{{resultData.nCNormalTime}}</a-descriptions-item>
- <a-descriptions-item label="杩涚粰鍊嶇巼(%)">{{resultData.feedbeilv}}</a-descriptions-item>
- <a-descriptions-item label="璁惧杩愯鏃堕棿">{{resultData.equipmentTime}}</a-descriptions-item>
- <a-descriptions-item label="褰撳墠鍒�鍏峰彿">{{resultData.toolNum}}</a-descriptions-item>
- </a-descriptions> -->
-
- <!-- <a-descriptions
- title="绋嬪簭淇℃伅"
- v-if="driverType != 'LSV2' && driverType != 'ZUOLAN' "
- :column="4"
- >
- <a-descriptions-item label="搴忓垪鍙�">{{resultData.sequencenumber}}</a-descriptions-item>
- <a-descriptions-item
- label="褰撳墠鎵ц浠ｇ爜"
- :span="2"
- >{{resultData.executingcode}}</a-descriptions-item>
- <a-descriptions-item label="宸ヤ欢鍚嶇О">{{resultData.productName}}</a-descriptions-item>
- </a-descriptions> -->
-
- <!-- <a-descriptions
- title="绋嬪簭淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="褰撳墠绋嬪簭">{{resultData.program}}</a-descriptions-item>
- <a-descriptions-item label="绋嬪簭鎵ц鐐�">{{resultData.programPosition}}</a-descriptions-item>
- <a-descriptions-item label="鎿嶄綔妯″紡">{{resultData.operationType}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅缂栧彿涓�">{{resultData.firstErrorNum}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅涓�">{{resultData.firstError}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅">{{resultData.errorinfo}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅缂栧彿浜�">{{resultData.secondErrorNum}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅浜�">{{resultData.secondError}}</a-descriptions-item>
- </a-descriptions> -->
-
- <!--<a-descriptions
- title="杞寸洃鎺ф暟鎹� fro SIEMENS840DSL"
- v-if="driverType == 'SIEMENS840DSL'"
- :column="4"
- >
- <a-descriptions-item label="X杞存俯搴�">{{resultData.temperatureX}}</a-descriptions-item>
- <a-descriptions-item label="Y杞存俯搴�">{{resultData.temperatureY}}</a-descriptions-item>
- <a-descriptions-item label="Z杞存俯搴�">{{resultData.temperatureZ}}</a-descriptions-item>
- <a-descriptions-item label="A杞存俯搴�">{{resultData.temperatureA}}</a-descriptions-item>
- <a-descriptions-item label="B杞存俯搴�">{{resultData.temperatureB}}</a-descriptions-item>
- <a-descriptions-item label="X杞寸數娴�">{{resultData.equipmentCurrentX}}</a-descriptions-item>
- <a-descriptions-item label="Y杞寸數娴�">{{resultData.equipmentCurrentY}}</a-descriptions-item>
- <a-descriptions-item label="Z杞寸數娴�">{{resultData.equipmentCurrentZ}}</a-descriptions-item>
- <a-descriptions-item label="A杞寸數娴�">{{resultData.equipmentCurrentA}}</a-descriptions-item>
- <a-descriptions-item label="B杞寸數娴�">{{resultData.equipmentCurrentB}}</a-descriptions-item>
- <a-descriptions-item label="X杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorX}}</a-descriptions-item>
- <a-descriptions-item label="Y杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorY}}</a-descriptions-item>
- <a-descriptions-item label="Z杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorZ}}</a-descriptions-item>
- <a-descriptions-item label="A杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorA}}</a-descriptions-item>
- <a-descriptions-item label="B杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorB}}</a-descriptions-item>
- </a-descriptions>
--->
- <!-- <a-descriptions
- title="鍧愭爣淇℃伅 "
- v-if="driverType == 'FANUC'"
- :column="3"
- >
- <a-descriptions-item label="缁濆鍧愭爣X">{{resultData.xabsolute}}</a-descriptions-item>
- <a-descriptions-item label="缁濆鍧愭爣Y">{{resultData.yabsolute}}</a-descriptions-item>
- <a-descriptions-item label="缁濆鍧愭爣Z">{{resultData.zabsolute}}</a-descriptions-item>
- <a-descriptions-item label="鏈哄簥鍧愭爣X">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="鏈哄簥鍧愭爣Y">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="鏈哄簥鍧愭爣Z">{{resultData.zmachine}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="鍧愭爣淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="X鍧愭爣">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="Y鍧愭爣">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="Z鍧愭爣">{{resultData.zmachine}}</a-descriptions-item>
- <a-descriptions-item label="A鍧愭爣">{{resultData.amachine}}</a-descriptions-item>
- <a-descriptions-item label="B鍧愭爣">{{resultData.bmachine}}</a-descriptions-item>
- <a-descriptions-item label="C鍧愭爣">{{resultData.cmachine}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="鍧愭爣淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="X鍧愭爣">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="Y鍧愭爣">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="Z鍧愭爣">{{resultData.zmachine}}</a-descriptions-item>
- <a-descriptions-item label="A鍧愭爣">{{resultData.amachine}}</a-descriptions-item>
- <a-descriptions-item label="B鍧愭爣">{{resultData.bmachine}}</a-descriptions-item>
- <a-descriptions-item label="C鍧愭爣">{{resultData.cmachine}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="鍧愭爣淇℃伅"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="X鍧愭爣">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="Y鍧愭爣">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="Z鍧愭爣">{{resultData.zmachine}}</a-descriptions-item>
- <a-descriptions-item label="A鍧愭爣">{{resultData.amachine}}</a-descriptions-item>
- <a-descriptions-item label="B鍧愭爣">{{resultData.bmachine}}</a-descriptions-item>
- <a-descriptions-item label="C鍧愭爣">{{resultData.cmachine}}</a-descriptions-item>
- </a-descriptions> -->
<!---鏁版嵁婧愯皟鏁� 鍔ㄦ�佸睍绀� 杩愯鏁版嵁---->
<a-descriptions
@@ -247,32 +115,6 @@
</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"-->
- <!--v-if="driverType == 'LSV2'"-->
- <!--:column="4"-->
- <!--class="lsv2Data"-->
- <!-->-->
- <!--<a-descriptions-item label="NC鐗堟湰">{{resultData.ncversion}}</a-descriptions-item>-->
- <!--<a-descriptions-item label="TNC鐗堟湰">{{resultData.tncversion}}</a-descriptions-item>-->
- <!--<a-descriptions-item label="OPT鐗堟湰">{{resultData.optversion}}</a-descriptions-item>-->
- <!--<a-descriptions-item label="PLC鐗堟湰">{{resultData.plcversion}}</a-descriptions-item>-->
- <!--</a-descriptions>-->
-
</td>
</tr>
</table>
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 8253a9b..71275b7 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -37,41 +37,9 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4">
+ <a-col :md="6" :sm="6">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates" :allowClear="false"/>
- </a-form-item>
- </a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绾у埆">
- <a-select
- :value="queryParams.deviceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绾у埆"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceLevel')"
- >
- <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="4" :sm="4" :xs="4">
- <a-form-item label="璁惧绉嶇被">
- <a-select
- :value="queryParams.deviceCategory"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
- >
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
</a-form-item>
</a-col>
</a-row>
@@ -205,14 +173,10 @@
dates: [],
equipmentTypeList:[],
driveTypeList:[],
- device_level_list: [],
- device_category_list: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
},
queryParamEquip:{},
queryParamPeople:{},
@@ -246,8 +210,6 @@
this.loadData()
this.queryGroup()
this.getDriveTypeByApi()
- this.initDictData('device_level')
- this.initDictData('device_category')
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
@@ -306,20 +268,6 @@
},
},
methods: {
- initDictData(dictCode) {
- // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
- if (getDictItemsFromCache(dictCode)) {
- this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
- return
- }
- //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
- ajaxGetDictItems(dictCode, null).then((res) => {
- if (res.success) {
- this[dictCode + '_list'] = res.result
- return
- }
- })
- },
selectChange(value, key) {
this.queryParams[key] = value
},
@@ -507,8 +455,6 @@
this.queryParams = {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
}
this.loadData();
},
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index a5ab8df..08ebed5 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -38,42 +38,10 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4">
+ <a-col :md="6" :sm="6">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
v-model="dates" :allowClear="false"/>
- </a-form-item>
- </a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绾у埆">
- <a-select
- :value="queryParams.deviceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绾у埆"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceLevel')"
- >
- <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绉嶇被">
- <a-select
- :value="queryParams.deviceCategory"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
- >
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
</a-form-item>
</a-col>
</a-row>
@@ -234,15 +202,11 @@
dates: [],
equipmentTypeList: [],
driveTypeList: [],
- device_level_list: [],
- device_category_list: [],
identifying: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -282,8 +246,6 @@
this.loadData()
this.queryGroup()
this.getDriveTypeByApi()
- this.initDictData('device_level')
- this.initDictData('device_category')
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
@@ -343,20 +305,6 @@
},
computed: {},
methods: {
- initDictData(dictCode) {
- // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
- if (getDictItemsFromCache(dictCode)) {
- this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
- return
- }
- //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
- ajaxGetDictItems(dictCode, null).then((res) => {
- if (res.success) {
- this[dictCode + '_list'] = res.result
- return
- }
- })
- },
selectChange(value, key) {
this.queryParams[key] = value
},
@@ -544,8 +492,6 @@
this.queryParams = {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
}
this.loadData()
},
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 8d1302f..fdc245e 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -38,7 +38,7 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4" :xs="4">
+ <a-col :md="6" :sm="6" :xs="6">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
v-model="dates" :allowClear="false"/>
@@ -60,51 +60,6 @@
:allowClear="allowClearSu">
<a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
{{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="2" :sm="2">
- <a
- @click="toggleSearchStatus=!toggleSearchStatus"
- @selectstart="$event.preventDefault()"
- style="display: inline-block;height: 32px;line-height: 32px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
- </a-col>
- </a-row>
-
- <a-row :gutter="24" v-if="toggleSearchStatus">
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绾у埆">
- <a-select
- :value="queryParams.deviceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绾у埆"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceLevel')"
- >
- <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绉嶇被">
- <a-select
- :value="queryParams.deviceCategory"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
- >
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
- {{item.label}}
</a-select-option>
</a-select>
</a-form-item>
@@ -252,15 +207,11 @@
dates: [],
equipmentTypeList: [],
driveTypeList: [],
- device_level_list: [],
- device_category_list: [],
identifying: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -298,8 +249,6 @@
this.loadData()
this.queryGroup()
this.getDriveTypeByApi()
- this.initDictData('device_level')
- this.initDictData('device_category')
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
@@ -359,20 +308,6 @@
}
},
methods: {
- initDictData(dictCode) {
- // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
- if (getDictItemsFromCache(dictCode)) {
- this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
- return
- }
- //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
- ajaxGetDictItems(dictCode, null).then((res) => {
- if (res.success) {
- this[dictCode + '_list'] = res.result
- return
- }
- })
- },
selectChange(value, key) {
this.queryParams[key] = value
},
@@ -583,8 +518,6 @@
this.queryParams = {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
}
this.loadData()
// this.onClearSelected()
--
Gitblit v1.9.3