From d4bdabb3c7fe8fa5060f73dc59ac1b699c7ea17d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 24 Jul 2020 19:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E6=AE=B5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addInspectionPoint.html                   |  6 +-
 .../editInspectionPoint.html                  |  4 +-
 .../inspectionPointManage.html                |  2 +-
 .../inspectionRoutePointManage.html           | 72 +++++++++----------
 4 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/public/components/property/addInspectionPoint/addInspectionPoint.html b/public/components/property/addInspectionPoint/addInspectionPoint.html
index f89c65c0c..30350bc8a 100644
--- a/public/components/property/addInspectionPoint/addInspectionPoint.html
+++ b/public/components/property/addInspectionPoint/addInspectionPoint.html
@@ -18,7 +18,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">巡检类型</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addInspectionPlanInfo.pointObjType">
+                                    <select class="custom-select" v-model="addInspectionPointInfo.pointObjType">
                                         <option selected disabled value="">必填，请选择巡检类型</option>
                                         <option value="2002">环境</option>
                                         <option value="1001">设备</option>
@@ -26,14 +26,14 @@
                                 </div>
                             </div>
 
-                            <div class="form-group row" v-if="addInspectionPlanInfo.pointObjType == '2002'">
+                            <div class="form-group row" v-show="addInspectionPointInfo.pointObjType == '2002'">
                                 <label class="col-sm-2 col-form-label">位置</label>
                                 <div class="col-sm-10">
                                     <input v-model="addInspectionPointInfo.pointObjName" type="text"
                                         placeholder="必填，请填写巡检点名称" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row" v-else>
+                            <div class="form-group row" v-show="addInspectionPointInfo.pointObjType == '1001'">
                                 <label class="col-sm-2 col-form-label">巡检设备</label>
                                 <div class="col-sm-10">
                                     <vc:create path="property/machineSelect2" parentModal="addInspectionPointModel"
diff --git a/public/components/property/editInspectionPoint/editInspectionPoint.html b/public/components/property/editInspectionPoint/editInspectionPoint.html
index dab369573..acc444487 100644
--- a/public/components/property/editInspectionPoint/editInspectionPoint.html
+++ b/public/components/property/editInspectionPoint/editInspectionPoint.html
@@ -24,14 +24,14 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="form-group row" v-if="editInspectionPointInfo.pointObjType == '2002'">
+                            <div class="form-group row" v-show="editInspectionPointInfo.pointObjType == '2002'">
                                 <label class="col-sm-2 col-form-label">位置</label>
                                 <div class="col-sm-10">
                                     <input v-model="editInspectionPointInfo.pointObjName" type="text"
                                         placeholder="必填，请填写巡检点名称" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row" v-else>
+                            <div class="form-group row" v-show="editInspectionPointInfo.pointObjType == '1001'">
                                 <label class="col-sm-2 col-form-label">巡检设备</label>
                                 <div class="col-sm-10">
                                     <vc:create path="property/machineSelect2"
diff --git a/public/pages/property/inspectionPointManage/inspectionPointManage.html b/public/pages/property/inspectionPointManage/inspectionPointManage.html
index 10ba83b3a..eb6690d9b 100644
--- a/public/pages/property/inspectionPointManage/inspectionPointManage.html
+++ b/public/pages/property/inspectionPointManage/inspectionPointManage.html
@@ -64,7 +64,7 @@
                         <thead>
                         <tr>
                             <th class="text-center">巡检点名称</th>
-                            <th class="text-center">巡检类型</th>
+                            <th class="text-center">巡检点类型</th>
                             <th class="text-center">巡检位置</th>
                             <th class="text-center">巡检点ID</th>
                             <th class="text-center">操作</th>
diff --git a/public/pages/property/inspectionRoutePointManage/inspectionRoutePointManage.html b/public/pages/property/inspectionRoutePointManage/inspectionRoutePointManage.html
index dcfdf63ae..1bed2dd06 100644
--- a/public/pages/property/inspectionRoutePointManage/inspectionRoutePointManage.html
+++ b/public/pages/property/inspectionRoutePointManage/inspectionRoutePointManage.html
@@ -4,12 +4,12 @@
             <div class="ibox-title">
                 <h5>巡检点信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" class="btn btn-primary btn-sm "
-                            v-on:click="_goBack()"  style="margin-right:10px">
+                    <button type="button" class="btn btn-primary btn-sm " v-on:click="_goBack()"
+                        style="margin-right:10px">
                         返回
                     </button>
                     <button type="button" class="btn btn-primary btn-sm"
-                            v-on:click="_openAddInspectionRoutePointModal()">
+                        v-on:click="_openAddInspectionRoutePointModal()">
                         <i class="fa fa-plus"></i>
                         添加
                     </button>
@@ -17,42 +17,40 @@
             </div>
             <div class="ibox-content">
 
-                <table class="footable table table-stripped toggle-arrow-tiny"
-                       data-page-size="15"
-                >
+                <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                     <thead>
-                    <tr>
-                        <th class="text-center">巡检点名称</th>
-                        <th class="text-center">巡检点ID</th>
-                        <th class="text-center">设备位置</th>
-                        <th class="text-center">设备编码</th>
-                        <th class="text-center">设备名称</th>
-                        <th class="text-right">操作</th>
-                    </tr>
+                        <tr>
+                            <th class="text-center">巡检点名称</th>
+
+                            <th class="text-center">巡检点类型</th>
+                            <th class="text-center">巡检位置</th>
+                            <th class="text-center">巡检点ID</th>
+                            <th class="text-right">操作</th>
+                        </tr>
                     </thead>
                     <tbody>
-                    <tr v-for="inspectionPoint in inspectionRoutePointManageInfo.inspectionPoints">
-                        <td class="text-center">{{inspectionPoint.inspectionName}}</td>
-                        <td class="text-center">{{inspectionPoint.inspectionId}}</td>
-                        <td class="text-center">{{inspectionPoint.locationObjName}}</td>
-                        <td class="text-center">{{inspectionPoint.machineCode}}</td>
-                        <td class="text-center">{{inspectionPoint.machineName}}</td>
-                        <td class="text-right">
-                            <div class="btn-group">
-                                <button class="btn-white btn btn-xs"
-                                        v-on:click="_openDeleteInspectionRoutePointModel(inspectionPoint)">删除
-                                </button>
-                            </div>
-                        </td>
+                        <tr v-for="inspectionPoint in inspectionRoutePointManageInfo.inspectionPoints">
+                            <td class="text-center">{{inspectionPoint.inspectionName}}</td>
 
-                    </tr>
+                            <td class="text-center">{{inspectionPoint.pointObjType=='1001'?'设备':'环境'}}</td>
+                            <td class="text-center">{{inspectionPoint.pointObjName}}</td>
+                            <td class="text-center">{{inspectionPoint.inspectionId}}</td>
+                            <td class="text-right">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                        v-on:click="_openDeleteInspectionRoutePointModel(inspectionPoint)">删除
+                                    </button>
+                                </div>
+                            </td>
+
+                        </tr>
                     </tbody>
                     <tfoot>
-                    <tr>
-                        <td colspan="7">
-                            <ul class="pagination float-right"></ul>
-                        </td>
-                    </tr>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
                     </tfoot>
                 </table>
                 <!-- 分页 -->
@@ -60,10 +58,8 @@
             </div>
         </div>
     </div>
-    <vc:create path="property/chooseInspectionRoutePoint"
-        emitListener="inspectionRoutePointManage"
-        emitFunction="listInspectionPoint"
-    ></vc:create>
+    <vc:create path="property/chooseInspectionRoutePoint" emitListener="inspectionRoutePointManage"
+        emitFunction="listInspectionPoint"></vc:create>
 
     <vc:create path="property/deleteInspectionRoutePoint"></vc:create>
-</div>
+</div>
\ No newline at end of file