Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

昨天 eb6f3d149c6279877cf806575901bb482d7f2b64

 src/views/equipmentManagement/measurementEquipment/index.vue

@@ -82,6 +82,12 @@
    minWidth:150,
    align:"center"
   },
  {
    label: "计量器具名称",
    prop: "name",
    width: '160px',
    align: "center",
  },
   {
      label: "安装位置",
      prop: "instationLocation",