1、扭矩配置页面更名为参数配置，增加字段“进给参数” 2、设备监控页面设备表增加状态异常说明字段以及操作列状态反馈功能（具备鉴权功能） 3、设备加工工...

zhuzhuanzhuan

2024-01-17 e205cad00ed14b91f7c7395146941ade750982bb

 src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue

@@ -41,23 +41,23 @@
      </div>

      <div class="container" id="EfficiencyShift" style="flex:1;overflow: hidden">
        <a-table :columns="columns"  rowKey="equipmentId" :dataSource="dataSource.records" :scroll="{x:'max-content',y:scrollY}" :pagination="false" bordered>
        <a-table :columns="columns"  rowKey="equipmentId" :dataSource="dataSource" :scroll="{x:'max-content',y:scrollY}" :pagination="false" bordered>
          <span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>
        </a-table>
      </div>
      <div class="pagination">
        <a-pagination
          :total=dataSource.total
          :show-total="(total, range) => `${range[0]}-${range[1]} 共 ${total} 条`"
          :page-size="+queryParam.pageSize"
          :default-current="1"
          :current=+queryParam.pageNo
          show-size-changer
          :pageSizeOptions="['20','30','40','50']"
          @change="handlePageNoChange"
          @showSizeChange="handlePageSizeChange"
        />
      </div>
      <!--<div class="pagination">-->
        <!--<a-pagination-->
          <!--:total=dataSource.total-->
          <!--:show-total="(total, range) => `${range[0]}-${range[1]} 共 ${total} 条`"-->
          <!--:page-size="+queryParam.pageSize"-->
          <!--:default-current="1"-->
          <!--:current=+queryParam.pageNo-->
          <!--show-size-changer-->
          <!--:pageSizeOptions="['20','30','40','50']"-->
          <!--@change="handlePageNoChange"-->
          <!--@showSizeChange="handlePageSizeChange"-->
        <!--/>-->
      <!--</div>-->
  </div>
</template>

@@ -95,7 +95,7 @@
            title: '序号',
            dataIndex: '',
            key: 'rowIndex',
            width: 70,
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
@@ -106,18 +106,18 @@
            title: '设备统一编号',
            align: 'center',
            dataIndex: 'equipmentId',
            width: 120
            width: 200
          },
          {
            title: '设备名称',
            align: 'center',
            width: 150,
            width: 200,
            dataIndex: 'equipmentName'
          },
          {
            title: '驱动类型',
            align: 'center',
            width: 110,
            width: 100,
            dataIndex: 'driveType'
          },
          {
@@ -129,7 +129,7 @@
          {
            title: '加工件数',
            align: 'center',
            width: 80,
            width: 100,
            dataIndex: 'processCount'
          },
          {
@@ -137,14 +137,14 @@
            dataIndex: 'duration',
            align: 'center',
            scopedSlots: { customRender: 'duration' },
            width: 110
            width: 150
          },
          {
            title: '日期',
            dataIndex: 'theDate',
            align: 'center',
            width: 110
          }
          // {
          //   title: '日期',
          //   dataIndex: 'theDate',
          //   align: 'center',
          //   width: 110
          // }
        ],
        dataSource: [],
        driveTypeList: [],