src/components/layouts/TabLayout.vue

@@ -165,7 +165,7 @@

      // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
      changeTitle(title) {
        let projectTitle = "统计分析"
        let projectTitle = "MDC智慧车间"
        // 首页特殊处理
        if (this.$route.path === indexKey) {
          document.title = projectTitle

 src/views/eam/Daily3MaintenanceOrderList.vue

@@ -297,16 +297,17 @@
            type="vertical"
          />
          <a
            v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
            v-show="record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
            @click="handleStoveDetection(record)"
            v-has="'daily3MaintenanceOrder:StoveCategory'"
          >炉类检测</a>
          <!-- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" -->
          <a-divider
            v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
            v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
            type="vertical"
          />
          <a
            v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
            v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
            @click="handleStoveReport(record)"
            v-has="'daily3MaintenanceOrder:StoveCategoryReport'"
          >炉类报告</a>

 src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceStandard3List.vue

@@ -151,11 +151,16 @@
  },
  methods: {
    searchQuery() {
      this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '3' };
      // this.queryParam = { type: "daily", delFlag: '0', versionStatus: '2',useId: this.useId, maintenanceType: '3' };
      this.queryParam.type = "daily";
      this.queryParam.delFlag = '0';
      this.queryParam.versionStatus = '2';
      this.queryParam.useId = this.useId;
      this.queryParam.maintenanceType = '3';
      this.loadData(1);
    },
    searchReset() {
      this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '3' };
      this.queryParam = { type: "daily", delFlag: '0', versionStatus: '2', useId: this.useId, maintenanceType: '3' };
      this.loadData(1)
    },
    list(useId) {

 src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue

@@ -22,10 +22,10 @@
                :sm="8"
              >
                <a-form-item label="统一编码">
                  <j-input
                  <a-input
                    placeholder="请输入统一编码检索"
                    v-model="queryParam.num"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>

@@ -34,10 +34,10 @@
                :sm="8"
              >
                <a-form-item label="设备名称">
                  <j-input
                  <a-input
                    placeholder="请输入设备名称检索"
                    v-model="queryParam.name"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>
              <a-col

 src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue

@@ -151,11 +151,16 @@
  },
  methods: {
    searchQuery() {
      this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '2' };
      // this.queryParam = { type: "daily", delFlag: '0', versionStatus: '2', useId: this.useId, maintenanceType: '2' };
      this.queryParam.type = "daily";
      this.queryParam.delFlag = '0';
      this.queryParam.versionStatus = '2';
      this.queryParam.useId = this.useId;
      this.queryParam.maintenanceType = '2';
      this.loadData(1);
    },
    searchReset() {
      this.queryParam = { type: "daily", delFlag: '0', useId: this.useId, maintenanceType: '2' };
      this.queryParam = { type: "daily", delFlag: '0', versionStatus: '2', useId: this.useId, maintenanceType: '2' };
      this.loadData(1)
    },
    list(useId) {

 src/views/mdc/base/DeviceParamThresholdManagement.vue

@@ -191,6 +191,9 @@
      handleAdd: function() {
        this.$refs.modalForm.add()
        this.$refs.modalForm.title = '新增'

        // 调用抽屉表单组件中的清除表单验证方法
        this.$refs.modalForm.removeValidate()
      },

      handleMenuClick(e) {

 src/views/mdc/base/EquipmentList.vue

@@ -9,16 +9,24 @@
          <a-col :md="6" :sm="12">
            <a-form-item label="设备编号">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <j-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></j-input>
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="6" :sm="8">
            <a-form-item label="设备名称">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <j-input placeholder="请输入设备名称" v-model="queryParam.equipmentName"></j-input>
              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentName"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="6" :sm="8">
            <a-form-item label="车间名称">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="6" :sm="8">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

 src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue

@@ -36,13 +36,13 @@

          <a-col :span="12">
            <a-form-model-item prop="maxThreshold" label="阈值上限">
              <a-input v-model="model.maxThreshold" placeholder="请输入阈值上限"></a-input>
              <a-input-number v-model="model.maxThreshold" placeholder="请输入阈值上限" style="width: 100%"></a-input-number>
            </a-form-model-item>
          </a-col>

          <a-col :span="12">
            <a-form-model-item prop="minThreshold" label="阈值下限">
              <a-input v-model="model.minThreshold" placeholder="请输入阈值下限"></a-input>
              <a-input-number v-model="model.minThreshold" placeholder="请输入阈值下限" style="width: 100%"></a-input-number>
            </a-form-model-item>
          </a-col>

@@ -139,12 +139,13 @@
      add() {
        this.visible = true
        this.model = {
          controlSystemType: '',
          controlSystemType: this.driveTypeList[0],
          chineseName: '',
          minThreshold: '',
          maxThreshold: ''
        }
        this.paramList = []
        console.log('driveType',this.driveTypeList)
        this.handleDriveTypeChange(this.driveTypeList[0])
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'controlSystemType', 'chineseName', 'minThreshold', 'maxThreshold'))
        })
@@ -229,7 +230,7 @@
          .then(res => {
            if (res.success) {
              this.paramList = res.result
              this.model.chineseName = res.result.length ? res.result[0].value : ''
              this.model.chineseName = res.result.length ? res.result[0].value : undefined
              if (this.model.chineseName) this.$refs.form.clearValidate('chineseName')
            }
          })

 src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue

@@ -6,25 +6,28 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="6" :sm="6">
            <a-col :md="7" :sm="7">
              <a-form-item label="统一编码">
                <a-input placeholder="请输入统一编码检索" v-model="queryParam.equipmentid"></a-input>
              </a-form-item>
            </a-col>

            <a-col :md="6" :sm="6">
            <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="3" :sm="3">
              <a-space>
                <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-space>
            </a-col>
          </a-row>
        </a-form>
      </div>
      <!-- 操作按钮区域 -->
      <div class="table-operator">
        <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>

      <!-- table区域-begin -->
      <div>
        <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{  y: 300 }" :columns="columns"

 src/views/mdc/base/modules/EquipmentList/UserModal.vue

@@ -143,7 +143,7 @@
    </a-spin>


    <div class="drawer-bootom-button" v-show="!disableSubmit">
    <div class="drawer-bottom-button" v-show="!disableSubmit">
      <a-popconfirm title="确定放弃操作？" @confirm="close" okText="确定" cancelText="取消">
        <a-button style="margin-right: .8rem">取消</a-button>
      </a-popconfirm>
@@ -611,7 +611,7 @@
    padding-bottom:10px;
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: -8px;
    width: 100%;

 src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue

@@ -20,11 +20,17 @@
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
          </a-col>
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
        </a-row>
      </a-form>
    </div>

 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue

@@ -19,12 +19,18 @@
              <!--<a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>-->
            <!--</a-form-item>-->
          <!--</a-col>-->
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
          <!--</a-col>-->

 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue

@@ -7,7 +7,7 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
           <a-col :md="8" :sm="8">
           <a-col :md="6" :sm="6">
             <a-form-item label="时间">
               <a-range-picker @change="dateParamChange" format="YYYYMMDD" v-model="dates"/>
             </a-form-item>
@@ -23,14 +23,17 @@
                <a-input placeholder="请输入设备名称检索" v-model="queryParam.equipmentName"></a-input>
              </a-form-item>
            </a-col>

            <a-col :md="3" :sm="3">
              <a-space>
                <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-space>
            </a-col>
          </a-row>
        </a-form>
      </div>
      <!-- 操作按钮区域 -->
      <div class="table-operator">
        <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>

      <!-- table区域-begin -->
      <div>
        <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{  y: 400 }" :columns="columns"

 src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue

@@ -15,11 +15,17 @@
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
          </a-col>
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
        </a-row>
      </a-form>
    </div>

 src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue

@@ -15,11 +15,17 @@
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
          </a-col>
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
        </a-row>
      </a-form>
    </div>

 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue

@@ -19,12 +19,18 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
          <!--</a-col>-->
@@ -110,10 +116,12 @@
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import ACol from 'ant-design-vue/es/grid/Col'
  export default {
    name: 'TorqueconfigurationList',
    mixins: [JeecgListMixin],
    components: {
      ACol,
      Tooltip,
      TorqueconfigurationModal,
      TorqueconfigurationModaledit,

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue

@@ -19,12 +19,18 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
          <!--</a-col>-->

 src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue

@@ -85,13 +85,13 @@
                <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.systemVersion}}</a-descriptions-item>
                <a-descriptions-item label="驱动类型">{{resultData.driveType}}</a-descriptions-item>
                <a-descriptions-item label="系统型号">{{resultData.SystemType}}</a-descriptions-item>
                <a-descriptions-item label="设备型号">{{resultData.equipmentModel}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.deviceType}}</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.validAxis}}</a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{resultData.maxAxis}}</a-descriptions-item>
                <a-descriptions-item label="备注">{{resultData.remark}}</a-descriptions-item>
              </a-descriptions>


 src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue

@@ -56,26 +56,27 @@
          <!--</table>-->
          <!--</div>-->
          <!--</div>-->
          <!--<a-spin :spinning=""></a-spin>-->
          <a-table :columns="columns" :data-source="dataList" bordered :pagination="false" :scroll="{y:210}"
                   :customRow="customRow"
                   rowKey="alarmCode" @expand="handleExpandChange"
                   rowKey="alarmCode" @expand="handleExpandChange" :loading="outerDataLoading"
          >
            <span slot="timeCount" slot-scope="text">{{getFormattedTime(text)}}</span>
            <!--<a-table-->
              <!--slot="expandedRowRender"-->
              <!--slot-scope="row"-->
              <!--:columns="innerColumns"-->
              <!--:data-source="row.innerDataList"-->
              <!--:pagination="false"-->
              <!--rowKey="equipmentId"-->
              <!--:loading="loading"-->
            <!--&gt;-->
              <!--<span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>-->
            <!--</a-table>-->
            <span slot="timeCount" slot-scope="text">{{text | getFormattedTime}}</span>
            <a-table
              slot="expandedRowRender"
              slot-scope="row"
              :columns="innerColumns"
              :data-source="row.innerDataList"
              :pagination="false"
              rowKey="rowIndex"
              :loading="innerDataLoading"
            >
              <span slot="duration" slot-scope="text">{{text | getFormattedTime}}</span>
            </a-table>
          </a-table>
        </div>

        <a-spin :spinning="spinning">
        <a-spin :spinning="echartLoading">
          <div style="width: 100%;height: 100%;display: flex;">
            <div id="MdcEquipmentWarningPie" style="height: 100%;width: 35%;"></div>
            <div id="MdcEquipmentWarningLine" style="height: 100%;width: 65%;"></div>
@@ -107,13 +108,23 @@
      align: 'center',
      sorter: (a, b) => b.timeCount - a.timeCount
    },
    { title: '报警信息', dataIndex: 'alarmContent', key: 'alarmContent', align: 'center' }
    { title: '报警信息', dataIndex: 'alarmContent', key: 'alarmContent', align: 'center', ellipsis: true }
  ]

  const innerColumns = [
    {
      title: '',
      dataIndex: 'rowIndex',
      key: 'rowIndex',
      width: 60,
      align: 'center',
      customRender: function(t, r, index) {
        return parseInt(index) + 1
      }
    },
    { title: '设备编号', dataIndex: 'equipmentId', key: 'equipmentId', align: 'center' },
    { title: '设备名称', dataIndex: 'equipmentName', key: 'equipmentName', align: 'center' },
    { title: '报警时间', dataIndex: 'alarmTime', key: 'alarmTime', align: 'center' },
    { title: '报警时间', dataIndex: 'startTime', key: 'startTime', align: 'center' },
    { title: '结束时间', dataIndex: 'endTime', key: 'endTime', align: 'center' },
    {
      title: '持续时间',
@@ -132,8 +143,9 @@
      return {
        dataSource: [],
        /* table加载状态 */
        loading: false,
        spinning: false,
        outerDataLoading: false,
        innerDataLoading: false,
        echartLoading: false,
        typeTree: '',
        typeParent: 1,
        typeEquipment: 1,
@@ -159,7 +171,8 @@
        url: {
          efficiencyList: '/mdc/alarmAnalyze/alarmList',
          listByType: '/mdc/MdcUtilizationRate/getByType',
          alarmTrend: '/mdc/alarmAnalyze/alarmTrend'
          alarmTrend: '/mdc/alarmAnalyze/alarmTrend',
          equipmentAlarmList: '/mdc/alarmAnalyze/equipmentAlarmList'
        },
        tableHeads: [],
        pieDate: [0],
@@ -223,6 +236,35 @@
        } else {
          return '0'
        }
      },

      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        var hours = Math.floor(seconds / 3600)
        var minutes = Math.floor((seconds % 3600) / 60)
        var secs = seconds % 60

        if (hours === 0) {
          if (minutes === 0) {
            return secs === 0 ? 0 : `${secs}秒`
          } else {
            if (secs === 0) {
              return `${minutes}分`
            }
            return `${minutes}分 ${secs}秒`
          }
        } else {
          if (minutes === 0 && secs === 0) {
            return `${hours}小时`
          } else if (minutes !== 0 && secs === 0) {
            return `${hours}小时 ${minutes}分`
          }
        }
        return `${hours}小时 ${minutes}分 ${secs}秒`
      }
    },
    methods: {
@@ -235,7 +277,7 @@
      },
      TableDraw(key, val) {
        let that = this
        that.spinning = true
        that.echartLoading = true
        that.queryParam.alarmCode = val.alarmCode
        console.log(this.queryParam)
        getAction(that.url.alarmTrend, that.queryParam)
@@ -262,7 +304,7 @@
            }
          })
          .finally(() => {
            that.spinning = false
            that.echartLoading = false
          })
        console.log(this.YData)

@@ -391,6 +433,7 @@
      //     }
      //   }
      loadData1() {
        this.outerDataLoading = true
        this.tableHeads = []
        this.dataList = []
        getAction(this.url.efficiencyList, this.queryParam).then(res => {
@@ -406,6 +449,8 @@
            // this.initDeviceType(this.dataList)

          }
        }).finally(() => {
          this.outerDataLoading = false
        })
      },
      drawWrin() {
@@ -521,35 +566,6 @@
      },

      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        var hours = Math.floor(seconds / 3600)
        var minutes = Math.floor((seconds % 3600) / 60)
        var secs = seconds % 60

        if (hours === 0) {
          if (minutes === 0) {
            return secs === 0 ? 0 : `${secs}秒`
          } else {
            if (secs === 0) {
              return `${minutes}分`
            }
            return `${minutes}分 ${secs}秒`
          }
        } else {
          if (minutes === 0 && secs === 0) {
            return `${hours}小时`
          } else if (minutes !== 0 && secs === 0) {
            return `${hours}小时 ${minutes}分`
          }
        }
        return `${hours}小时 ${minutes}分 ${secs}秒`
      },

      /**
       * 自定义表格行触发
       * @param record 当前行信息
       * @param index 当前行下标
@@ -570,60 +586,32 @@
        }
      },

      /**
       * 自定义表格行触发
       * @param expanded 当前行是否为展开状态
       * @param record 当前行信息
       */
      handleExpandChange(expanded, record) {
        console.log('expanded', expanded, 'record', record)
        let _this = this
        // 当展开时若该行未被展开过才会请求后台数据，展开过的数据会被缓存无需重复请求
        const param = Object.assign({ alarmCode: record.alarmCode }, this.queryParam)
        if (expanded && !this.hasRequsetAlarmCodeList.includes(record.alarmCode)) {
          this.loading = true
          setTimeout(() => {
            _this.dataList.forEach(item => {
              if (record.alarmCode === item.alarmCode) {
                item.innerDataList = [
                  {
                    equipmentId: '11234',
                    equipmentName: '立体机床',
                    alarmTime: 20,
                    endTime: 20,
                    duration: 123
                  },
                  {
                    equipmentId: '4213',
                    equipmentName: '卧室机床',
                    alarmTime: 312,
                    endTime: 31,
                    duration: 421
                  }
                ]
              }
          this.innerDataLoading = true
          getAction(this.url.equipmentAlarmList, param).then(res => {
            if (res.success) {
              _this.dataList.forEach(item => {
                if (item.alarmCode === record.alarmCode) {
                  item.innerDataList = res.result
                }
              })
              _this.hasRequsetAlarmCodeList.push(record.alarmCode)
            }
          })
            .finally(() => {
              _this.innerDataLoading = false
            })
            this.loading = false
          }, 1000)
          this.hasRequsetAlarmCodeList.push(record.alarmCode)
        }
      }

      // /**
      //  * 自定义展开表格图标
      //  * @param props 图标属性
      //  * @returns {null} 若主表数据下无数据则不显示图标
      //  */
      // expandIcon(props){
      //   console.log('props',props)
      //   if (props.record.innerDataList&&props.record.innerDataList.length>0){
      //     if (props.expanded) {
      //       return <a style="margin-right:0px;color:#999" onClick={e=> {
      //         props.onExpand(props.record, e);
      //       }}><a-icon type="minus" /></a>
      //     } else{
      //       return <a style="margin-right:0px;color:#999" onClick={e => {
      //         props.onExpand(props.record, e);
      //       }}><a-icon type="plus"/></a>
      //     }
      //   }else{
      //     return null
      //   }
      // }
    }
  }
</script>
@@ -844,6 +832,9 @@
  /deep/ .ant-table-body .ant-table-row td {
    padding-top: 10px;
    padding-bottom: 10px;
  }

  /deep/ .ant-table-scroll > .ant-table-body > table > .ant-table-tbody > .ant-table-row td {
    cursor: pointer;
  }

@@ -859,7 +850,7 @@
    height: 265px;
  }

  /deep/ .ant-table-scroll>.ant-table-placeholder {
  /deep/ .ant-table-scroll > .ant-table-placeholder {
    height: 210px;
  }
</style>

 src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue

@@ -86,7 +86,7 @@
                <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.systemType}}</a-descriptions-item>
                <a-descriptions-item label="设备型号">{{resultData.equipmentModel}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.deviceType}}</a-descriptions-item>
                <a-descriptions-item label="设备功率">{{resultData.devicePower}}</a-descriptions-item>
                <a-descriptions-item label="有效轴数">{{resultData.validAxis}}</a-descriptions-item>

 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue

@@ -13,14 +13,20 @@
                </a-form-item>
              </a-col>
              <a-col :md="2" :sm="2" :xs="2">
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                <a-space>
                  <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                  <a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">配置</a-button>
                </a-space>
              </a-col>
              <a-col :md="2" :sm="2">
                <!--//沈飞-->
                <a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">配置</a-button>
              <!--<a-col :md="2" :sm="2" :xs="2">-->
                <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
              <!--</a-col>-->
              <!--<a-col :md="2" :sm="2">-->
                <!--&lt;!&ndash;//沈飞&ndash;&gt;-->
                <!--<a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">配置</a-button>-->

                <!--<a-button type="primary" @click="handleAdd" icon="plus">配置</a-button>-->
              </a-col>
                <!--&lt;!&ndash;<a-button type="primary" @click="handleAdd" icon="plus">配置</a-button>&ndash;&gt;-->
              <!--</a-col>-->


            </a-row>

 src/views/mdc/base/modules/deviceLog/LogInfo.vue

@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :md="6" :sm="6">
          <a-col :md="4" :sm="4">
            <a-form-item label="设备编号">
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
            </a-form-item>
@@ -14,18 +14,24 @@
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
          <a-col :md="4" :sm="4">
            <a-form-item label="日期">
              <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" @change="dataChange"
                             format='YYYY-MM-DD'/>
            </a-form-item>
          </a-col>
          <a-col :md="3" :sm="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="3" :sm="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
        </a-row>
      </a-form>
    </div>

 src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue

@@ -4,7 +4,7 @@
    <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :md="9" :sm="9">
          <a-col :md="7" :sm="7">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
            </a-form-item>
@@ -19,16 +19,23 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
              <a-button type="primary" @click="handleExportXls('维修休班管理')" icon="download">导出</a-button>
            </a-space>
          </a-col>
          <a-col :lg="2" :md="3" :sm="3" :xs="3">
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
            <a-button type="primary" @click="handleExportXls('维修休班管理')" icon="download">导出</a-button>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--&lt;!&ndash;<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>&ndash;&gt;-->
            <!--<a-button type="primary" @click="handleExportXls('维修休班管理')" icon="download">导出</a-button>-->
          <!--</a-col>-->
        </a-row>
      </a-form>
    </div>
@@ -92,10 +99,12 @@
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import ACol from 'ant-design-vue/es/grid/Col'
  export default {
    name: 'DeviceRepairList',
    mixins: [JeecgListMixin],
    components: {
      ACol,
      Tooltip,
      DeviceRepairModel,
      DeviceRepairModelAdd,

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -215,7 +215,7 @@
     */
    getFormattedTime(seconds) {
      if (seconds) {
        return parseFloat((seconds / 3600).toFixed(2)) + '小时'
        return parseFloat((seconds / 3600).toFixed(2))
      } else {
        return '0'
      }

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -248,7 +248,7 @@
       */
      getFormattedTime(seconds) {
        if (seconds) {
          return parseFloat((seconds / 3600).toFixed(2)) + '小时'
          return parseFloat((seconds / 3600).toFixed(2))
        } else {
          return '0'
        }

 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue

@@ -276,7 +276,7 @@
       */
      getFormattedTime(seconds) {
        if (seconds) {
          return parseFloat((seconds / 3600).toFixed(2)) + '小时'
          return parseFloat((seconds / 3600).toFixed(2))
        } else {
          return '0'
        }

 src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue

@@ -21,7 +21,7 @@
                  <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
                </a-form-item>
              </a-col>
              <a-col :md="7" :sm="7" :xs="7">
              <a-col :md="6" :sm="6" :xs="6">
                <a-form-item label="时间段">
                  <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
                  至

 src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue

@@ -22,7 +22,7 @@
                                 @change="dataChange"/>
                </a-form-item>
              </a-col>
              <a-col :md="4" :sm="4" :xs="4">
              <a-col :md="3" :sm="3" :xs="3">
                <a-form-item label="间隔">
                  <a-select default-value="2" style="width: 80px" v-model="queryParam.timeType">
                    <a-select-option :value="2">

 src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue

@@ -19,12 +19,18 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
          <!--</a-col>-->
@@ -111,10 +117,12 @@
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import ACol from 'ant-design-vue/es/grid/Col'
  export default {
    name: 'mdcPassRateList',
    mixins: [JeecgListMixin],
    components: {
      ACol,
      Tooltip,
      mdcPassRateModal,
      mdcPassRateEdit,

 src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue

@@ -19,12 +19,18 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
          <!--</a-col>-->

 src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue

@@ -42,25 +42,28 @@
              <!--</a-form-item>-->
            <!--</a-col>-->

            <a-col :md="6" :sm="6">
            <a-col :md="7" :sm="7">
              <a-form-item label="统一编码">
                <a-input placeholder="请输入统一编码检索" v-model="queryParam.equipmentId"></a-input>
              </a-form-item>
            </a-col>

            <a-col :md="6" :sm="6">
            <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="3" :sm="3">
              <a-space>
                <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-space>
            </a-col>
          </a-row>
        </a-form>
      </div>
      <!-- 操作按钮区域 -->
      <div class="table-operator">
        <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>

      <!-- table区域-begin -->
      <div>
        <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{  y: 300 }" :columns="columns"

 src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue

@@ -19,12 +19,18 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="2" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
          <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
          <!--</a-col>-->

 src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue

@@ -11,7 +11,7 @@
                                v-model="dates"/>
              </a-form-item>
            </a-col>
            <a-col :md="7" :sm="7" :xs="7">
            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="时间段">
                <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
                至

 src/views/system/DepartList.vue

@@ -107,7 +107,7 @@
        </div>
      </a-card>
      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown
          :trigger="['click']"
          placement="topCenter"
@@ -814,7 +814,7 @@
  margin-left: 3px;
}

.drawer-bootom-button {
.drawer-bottom-button {
  /*position: absolute;*/
  bottom: 0;
  width: 100%;

 src/views/system/ProductionManager.vue

@@ -70,7 +70,7 @@
        </div>
      </a-card>
      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown :trigger="['click']" placement="topCenter">
          <a-menu slot="overlay">
            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -634,7 +634,7 @@
    margin-left: 3px
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    /*position: absolute;*/
    bottom: 0;
    width: 100%;

 src/views/system/modules/UserModal.vue

@@ -75,7 +75,7 @@
          ></j-dict-select-tag>
        </a-form-model-item>
        <a-form-model-item label="中心分配" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
          <j-dict-select-tag  
          <j-dict-select-tag
          v-model="model.areaId"
          :triggerChange="true"
          dictCode="mom_base_area,name,id,del_flag = 0"
@@ -131,7 +131,7 @@
    </a-spin>


    <div class="drawer-bootom-button" v-show="!disableSubmit">
    <div class="drawer-bottom-button" v-show="!disableSubmit">
      <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
        <a-button style="margin-right: .8rem">取消</a-button>
      </a-popconfirm>
@@ -596,7 +596,7 @@
    padding-bottom:10px;
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: -8px;
    width: 100%;

 src/views/system/modules/UserRoleModal.vue

@@ -28,7 +28,7 @@
      </a-form-item>
    </a-form>

    <div class="drawer-bootom-button">
    <div class="drawer-bottom-button">
      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -185,7 +185,7 @@

</script>
<style lang="less" scoped>
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;