Merge branch 'master' of http://47.92.161.104:10080/yanliming/jp-charging-station-portal

# Conflicts:
#	src/views/inspection/inspectionErrorRecord-list.vue

src/views/inspection/inspectionErrorRecord-list.vue

@@ -97,105 +97,43 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column
-        prop="stationName"
-        label="站点名称"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="stationNo"
-        label="站点编号"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="errorCodeText"
-        label="故障类型"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="errorDesc"
-        label="故障描述"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="stationName" label="站点名称" width="180"></el-table-column>
+      <el-table-column prop="stationNo" label="站点编号" width="180"></el-table-column>
+      <el-table-column prop="errorCodeText" label="故障类型" width="180"></el-table-column>
+      <el-table-column prop="errorDesc" label="故障描述" width="180"></el-table-column>
       <el-table-column prop="errorImage" label="故障图片" width="180">
-        <template slot-scope="{ row }">
-          <template v-if="row.errorImage != null">
-            <el-image
-              style="width: 50px; height: 50px"
-              :src="url"
-              fit="fit"
-              :data-source="url"
-              v-for="(url, index) in row.errorImage.split(',')"
-              :key="index"
-              v-viewer
+        <template slot-scope="{row}">
+          <template v-if="row.errorImage!=null">
+            <el-image style="width: 50px; height: 50px" :src="url" fit="fit"
+            :data-source="url" 
+            v-for="(url, index) in row.errorImage.split(',')" :key="index" v-viewer
             ></el-image>
-          </template>
+          </template> 
         </template>
       </el-table-column>
-      <el-table-column
-        prop="errorReportTime"
-        label="故障上报时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="errorReportNames"
-        label="故障上报人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="statusN"
-        label="状态"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="repairDesc"
-        label="处理描述"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="errorReportTime" label="故障上报时间"
+        width="180"></el-table-column>
+      <el-table-column prop="errorReportNames" label="故障上报人"
+        width="180"></el-table-column>
+              <el-table-column prop="statusN" label="状态"
+        width="180"></el-table-column>
+      <el-table-column prop="repairDesc" label="处理描述"
+        width="180"></el-table-column>
       <el-table-column prop="repairImage" label="处理图片" width="180">
-        <template slot-scope="{ row }">
-          <template v-if="row.repairImage != null">
-            <a
-              v-for="(url, index) in row.repairImage.split(',')"
-              :href="url"
-              target="_blank"
-              :key="index"
-            >
-              <el-image
-                style="width: 50px; height: 50px"
-                :src="url"
-                fit="fit"
-              ></el-image>
+        <template slot-scope="{row}">
+          <template v-if="row.repairImage!=null">
+            <a v-for="(url, index) in row.repairImage.split(',')" :href="url" target="_blank" :key="index">
+              <el-image style="width: 50px; height: 50px" :src="url" fit="fit"></el-image>
             </a>
           </template>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="repairTime"
-        label="处理时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="repairNames"
-        label="故障处理人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="overdueType"
-        label="备注"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="overdueHours"
-        label="超时时长(小时)"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="oveduerScore"
-        label="超时扣除分数"
-        width="120"
-      ></el-table-column>
-      <el-table-column label="操作" width="180">
+      <el-table-column prop="repairTime" label="处理时间" width="180"></el-table-column>
+      <el-table-column prop="repairNames" label="故障处理人" width="180"></el-table-column>
+      <el-table-column prop="overdueType" label="备注" width="120"></el-table-column>
+      <el-table-column prop="overdueHours" label="超时时长(小时)" width="120"></el-table-column>
+      <el-table-column prop="oveduerScore" label="超时扣除分数" width="120"></el-table-column>
+      <el-table-column label="操作" width="180" fixed="right">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"
             >编辑</el-button
@@ -215,11 +153,11 @@
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
     <inspectionErrorRecord-detail
-      v-if="showModal"
-      :businessKey="businessKey"
-      :title="modalTitle"
-      @close="onDetailModalClose"
-    ></inspectionErrorRecord-detail>
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></inspectionErrorRecord-detail>
   </div>
 </template>
 <script>
@@ -231,6 +169,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
+  name: "inspectionErrorRecordList",
   data() {
     var self = this;
 
@@ -276,6 +215,7 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
+
       formData.append("stationNo", self.queryModel.stationNo);
       formData.append("stationName", self.queryModel.stationName);
       formData.append("errorCode", self.queryModel.errorCode);

src/views/inspection/inspectionRecord-list.vue

@@ -170,6 +170,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
+  name: "inspectionRecordList",
   data() {
     var self = this;
 

src/views/inspection/inspectionUser-list.vue

@@ -144,6 +144,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
+  name: "inspectionUserList",
   data() {
     var self = this;