Merge remote-tracking branch 'origin/master'

hw-ui/src/views/dms/station/index.vue

@@ -2,22 +2,22 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small"
              :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="设备类型ID" prop="deviceTypeId">
-        <el-input
-          v-model="queryParams.deviceTypeId"
-          placeholder="请输入设备类型ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备类型名称" prop="TypeName">
-        <el-input
-          v-model="queryParams.TypeName"
-          placeholder="请输入设备类型名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="设备类型ID" prop="deviceTypeId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deviceTypeId"-->
+<!--          placeholder="请输入设备类型ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="设备类型名称" prop="TypeName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.TypeName"-->
+<!--          placeholder="请输入设备类型名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="部位编号" prop="maintStationCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.maintStationCode"-->
@@ -96,19 +96,19 @@
     <el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键标识" align="center" prop="maintStationId" />-->
-      <el-table-column label="设备类型ID" align="center" prop="deviceTypeId" />
-      <el-table-column label="设备类型" align="center" prop="deviceTypeId"   >
-        <template slot-scope="scope">
-            <span
-              v-for="(item, index) in devicetypeList"
-              :key="index"
-              :value="item.devicetypeList"
-              v-if="scope.row.deviceTypeId == item.deviceTypeId"
-            >
-              {{ item.typeName }}
-            </span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="设备类型ID" align="center" prop="deviceTypeId" />-->
+<!--      <el-table-column label="设备类型" align="center" prop="deviceTypeId"   >-->
+<!--        <template slot-scope="scope">-->
+<!--            <span-->
+<!--              v-for="(item, index) in devicetypeList"-->
+<!--              :key="index"-->
+<!--              :value="item.devicetypeList"-->
+<!--              v-if="scope.row.deviceTypeId == item.deviceTypeId"-->
+<!--            >-->
+<!--              {{ item.typeName }}-->
+<!--            </span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="部位编号" align="center" prop="maintStationCode" />
 <!--      <el-table-column label="保养标准" align="center" prop="protocolCode" />-->
       <el-table-column label="标准编号" align="center" prop="protocolCode" />