Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
seimin
/
zuel-itsm-3.0.2
Obserwuj 1
Polub 0
Forkuj 0
Files Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

巡检优化

seimin 3 lat temu
rodzic
97a58789f5
commit
b786b9181d
5 zmienionych plików z 846 dodań i 601 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 18 35
      assets/js/controllers/customform/customformCtrl.js
  2. 502 409
      assets/js/controllers/inspect/inspectListCtrl.js
  3. 75 10
      assets/js/controllers/inspect/inspectReportCtrl.js
  4. 233 143
      assets/views/inspect/inspectList.html
  5. 18 4
      assets/views/inspect/inspectReport.html

+ 18 - 35
assets/js/controllers/customform/customformCtrl.js
Wyświetl plik 

@@ -21196,43 +21196,26 @@ appFormly.controller("CustomformCtrl", [
21196 21196 
         console.log(vm);
21197 21197 
         var incidentDescription = "";
21198 21198 
         console.log($stateParams.formUiEdit);
21199 
-        if ($stateParams.formUiEdit == "inspection_confirm") {
21200 
-          if (vm.model.wnCheckEnable) {
21201 
-            incidentDescription =
21202 
-              incidentDescription.concat(" 机房温度检查异常");
21203 
-          }
21204 
-          if (vm.model.sdCheckEnable) {
21205 
-            incidentDescription =
21206 
-              incidentDescription.concat(" 机房湿度检查异常");
21207 
-          }
21208 
-          if (vm.model.xfjCheckEnable) {
21209 
-            incidentDescription = incidentDescription.concat(" 新风机检查异常");
21210 
-          }
21211 
-          if (vm.model.lsCheckEnable) {
21212 
-            incidentDescription = incidentDescription.concat(" 漏水检查异常");
21213 
-          }
21214 
-          if (vm.model.xfCheckEnable) {
21215 
-            incidentDescription = incidentDescription.concat(" 消防检查异常");
21216 
-          }
21217 
-          if (vm.model.upsCheckEnable) {
21218 
-            incidentDescription =
21219 
-              incidentDescription.concat(" UPS供电检查异常");
21220 
-          }
21221 
-          if (vm.model.dcCheckEnable) {
21222 
-            incidentDescription =
21223 
-              incidentDescription.concat(" 电池连接检查异常");
21224 
-          }
21225 
-          if (vm.model.plCheckEnable) {
21226 
-            incidentDescription =
21227 
-              incidentDescription.concat(" 旁路供电检查异常");
21228 
-          }
21229 
-          if (vm.model.wjtdCheckEnable) {
21230 
-            incidentDescription =
21231 
-              incidentDescription.concat(" 外机通道检查异常");
21232 
-          }
21199 
+        if ($stateParams.formUiEdit == "inspection_LinHu_confirm") {
21200 
+          var fields = vm.fields
21201 
+            .filter((v) => {
21202 
+              v.key = (v.key || "").toString();
21203 
+              return v.key.indexOf("sdCheckEnable") > -1;
21204 
+            })
21205 
+            .map((v) => ({
21206 
+              key: v.key,
21207 
+              name: v.templateOptions.label,
21208 
+              value: vm.model[v.key],
21209 
+            }));
21210 
+          fields.forEach(v=>{
21211 
+            if (vm.model[v.key]) {
21212 
+              incidentDescription =
21213 
+                incidentDescription.concat(v.name);
21214 
+            }
21215 
+          })
21233 21216 
           if (vm.model.descriptionTextarea) {
21234 21217 
             incidentDescription = incidentDescription.concat(
21235 
-              " " + "备注：" + vm.model.descriptionTextarea
21218 
+              " " + "整改意见：" + vm.model.descriptionTextarea
21236 21219 
             );
21237 21220 
           }
21238 21221 
         }

Plik diff jest za duży
+ 502 - 409
assets/js/controllers/inspect/inspectListCtrl.js


+ 75 - 10
assets/js/controllers/inspect/inspectReportCtrl.js
Wyświetl plik 

@@ -63,6 +63,65 @@ app.controller("inspectReportCtrl", [
63 63 
     //         $scope.zantingzhixing = true
64 64 
     //     }
65 65 
     // }
66 
+    // 打印
67 
+    $scope.print = function () {
68 
+      ///.ui-grid-viewport
69 
+      var docHead = document.head.outerHTML; //.ui-grid-viewport
70 
+      console.log(docHead);
71 
+      var printContents = document.querySelector(".grid").outerHTML;
72 
+      console.log(printContents);
73 
+      var winAttr =
74 
+        "location=yes, statusbar=no, menubar=no, titlebar=no, toolbar=no,dependent=no, width=865, height=600, resizable=yes, screenX=200, screenY=200, personalbar=no, scrollbars=yes";
75 
+
76 
+      var newWin = window.open("", "_blank", winAttr);
77 
+      var writeDoc = newWin.document;
78 
+      writeDoc.open();
79 
+      writeDoc.write(
80 
+        `<!doctype html>
81 
+          ${docHead}
82 
+          <body onLoad="window.print()">
83 
+          <style>
84 
+          .ui-grid-viewport{
85 
+            width:100%!important;
86 
+            height:100%!important;
87 
+          }
88 
+          .ui-grid-header-viewport{
89 
+            width:100%!important;
90 
+          }
91 
+          .xj_img {
92 
+            width: 50px;
93 
+            height: 100px;
94 
+            object-fit: cover;
95 
+            margin: 0 2px;
96 
+            cursor: pointer;
97 
+          }
98 
+          [ui-grid-cell] .ui-grid-cell-contents {
99 
+              display: flex;
100 
+              align-items: center;
101 
+              justify-content: center;
102 
+              white-space:normal;
103 
+          }
104 
+        [ui-grid-cell] .ui-grid-cell-contents .inspectPar {
105 
+            overflow: auto;
106 
+            display: flex;
107 
+            align-items: center;
108 
+            justify-content: center;
109 
+            white-space:normal;
110 
+            flex-wrap: wrap;
111 
+            height: 100%;
112 
+        }
113 
+        [ui-grid-cell] .ui-grid-cell-contents .inspectPar p{
114 
+            text-align: justify;
115 
+            width: 100%;
116 
+            margin: 0;
117 
+        }</style>
118 
+        ${printContents}
119 
+        </body>
120 
+        </html>`
121 
+      );
122 
+      writeDoc.close();
123 
+      newWin.focus();
124 
+    };
66 125
67 126 
     //获取计划主题和批次号，级联
68 127 
     $scope.titles = [];
 
@@ -91,10 +150,12 @@ app.controller("inspectReportCtrl", [
91 150 
     $scope.changeTitle = function () {
92 151 
       console.log($scope.queryList.title);
93 152 
       $scope.queryList.batchNo = "";
94 
-      $scope.batchNos = $scope.queryList.title.batchNos.map((v) => ({
95 
-        id: v,
96 
-        name: v,
97 
-      }));
153 
+      if ($scope.queryList.title.batchNos) {
154 
+        $scope.batchNos = $scope.queryList.title.batchNos.map((v) => ({
155 
+          id: v,
156 
+          name: v,
157 
+        }));
158 
+      }
98 159 
     };
99 160 
     //选择计划主题和批次号，确定
100 161 
     $scope.onClick = function () {
 
@@ -141,7 +202,7 @@ app.controller("inspectReportCtrl", [
141 202 
     $scope.gridOptions.enableGridMenu = true;
142 203 
     $scope.gridOptions.enableRowSelection = true;
143 204 
     $scope.gridOptions.showGridFooter = true;
144 
-    $scope.gridOptions.rowHeight = 112;
205 
+    $scope.gridOptions.rowHeight = 252;
145 206 
     $scope.gridOptions.showColumnFooter = false;
146 207 
     $scope.gridOptions.useExternalFiltering = false;
147 208 
     $scope.gridOptions.useExternalPagination = true;
 
@@ -172,8 +233,10 @@ app.controller("inspectReportCtrl", [
172 233 
       {
173 234 
         name: "startTime",
174 235 
         displayName: "日期",
175 
-        width: "17%",
236 
+        width: 168,
176 237 
         enableFiltering: true,
238 
+        cellTemplate:
239 
+          '<div class="ui-grid-cell-contents">{{row.entity.startTime | date:"yyyy-MM-dd HH:mm:ss"}}</div>',
177 240 
       },
178 241 
       {
179 242 
         name: "type",
 
@@ -184,7 +247,7 @@ app.controller("inspectReportCtrl", [
184 247 
       {
185 248 
         name: "inspectItem",
186 249 
         displayName: "巡检项",
187 
-        width: "25%",
250 
+        width: "22%",
188 251 
         enableFiltering: false,
189 252 
         cellTemplate: `<div class="ui-grid-cell-contents">
190 253 
             <div class="inspectPar">
 
@@ -219,7 +282,7 @@ app.controller("inspectReportCtrl", [
219 282 
       {
220 283 
         name: "userName",
221 284 
         displayName: "巡检人",
222 
-        width: "18%",
285 
+        width: "12%",
223 286 
         enableFiltering: false,
224 287 
       },
225 288 
       //   {
 
@@ -386,6 +449,8 @@ app.controller("inspectReportCtrl", [
386 449 
                 i + 1 + filterData.idx * filterData.sum;
387 450 
             }
388 451 
             for (var i = 0; i < $scope.myData.length; i++) {
452 
+              //处理日期
453 
+              $scope.myData[i].startTime = new Date($scope.myData[i].startTime);
389 454 
               // 处理图片
390 455 
               if ($scope.myData[i].filePath) {
391 456 
                 $scope.myData[i].filePath = $scope.myData[i].filePath
 
@@ -397,7 +462,7 @@ app.controller("inspectReportCtrl", [
397 462 
               //巡检项cnm
398 463 
               $scope.myData[i].xj_items = $scope.myData[i].fields
399 464 
                 .filter((v) => {
400 
-                  v.key = v.key || "";
465 
+                  v.key = (v.key || "").toString();
401 466 
                   return v.key.indexOf("sdCheckEnable") > -1;
402 467 
                 })
403 468 
                 .map((v) => ({
 
@@ -406,7 +471,7 @@ app.controller("inspectReportCtrl", [
406 471 
                   value: $scope.myData[i].model[v.key],
407 472 
                 }));
408 473 
             }
409 
-            console.log($scope.myData)
474 
+            console.log($scope.myData);
410 475 
           } else {
411 476 
             SweetAlert.swal({
412 477 
               title: "数据为空",

+ 233 - 143
assets/views/inspect/inspectList.html
Wyświetl plik 

@@ -46,185 +46,275 @@
46 46 
 </div> -->
47 47
48 48 
 <style>
49 
-    .inspectlistsearch{
50 
-        width: 30%!important;
51 
-        margin-right: 16px
52 
-    }
53 
-    .iptSize{
54 
-        width: 60%!important;
55 
-        height: 28px!important;
56 
-    }
57 
-    .tree-control .tree-input{
58 
-        min-height:28px!important
59 
-    }
60 
-    .searchBtnBox>.btn {
61 
-        margin: 0 8px 10px 0;
62 
-    }
49 
+  .inspectlistsearch {
50 
+    width: 30% !important;
51 
+    margin-right: 16px;
52 
+  }
53 
+  .iptSize {
54 
+    width: 60% !important;
55 
+    height: 28px !important;
56 
+  }
57 
+  .tree-control .tree-input {
58 
+    min-height: 28px !important;
59 
+  }
60 
+  .searchBtnBox > .btn {
61 
+    margin: 0 8px 10px 0;
62 
+  }
63 63 
 </style>
64 64 
 <div ng-controller="inspectListCtrl">
65 
-    <!-- <section id="page-title">
65 
+  <!-- <section id="page-title">
66 66 
         <div class="row">
67 67 
             <div class="col-sm-8">
68 68 
                 <h1 class="mainTitle">巡检列表</h1><span class="mainDescription">巡检列表,点击操作处理任务</span></div>
69 69 
         </div>
70 70 
     </section> -->
71 
-    <section id="page-title">
72 
-        <div class="row">
73 
-            <div class="col-sm-8">
74 
-                <h1 class="mainTitle">巡检列表<i tooltip='巡检列表,点击操作处理任务' tooltip-placement="right" class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
71 
+  <section id="page-title">
72 
+    <div class="row">
73 
+      <div class="col-sm-8">
74 
+        <h1 class="mainTitle">
75 
+          巡检列表<i
76 
+            tooltip="巡检列表,点击操作处理任务"
77 
+            tooltip-placement="right"
78 
+            class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
79 
+          ></i>
80 
+        </h1>
81 
+      </div>
82 
+    </div>
83 
+  </section>
84 
+  <!-- <div class="row searchlistback margin-top-15" id="searchid"> -->
85 
+  <div class="list-controls clearfix">
86 
+    <div class="btn-group">
87 
+      <button
88 
+        class="btn btn-statebutton statebutton keepleftbottom"
89 
+        ng-click="onChange('all')"
90 
+        ng-class="{'statecolor':searchstate=='all'}"
91 
+      >
92 
+        全部
93 
+      </button>
94 
+      <button
95 
+        class="btn btn-statebutton statebutton"
96 
+        ng-class="{'statecolor':searchstate=='todo'}"
97 
+        ng-click="onChange('todo')"
98 
+      >
99 
+        待处理
100 
+      </button>
101 
+      <button
102 
+        class="btn btn-statebutton statebutton"
103 
+        ng-class="{'statecolor':searchstate=='done'}"
104 
+        ng-click="onChange('done')"
105 
+      >
106 
+        处理过
107 
+      </button>
108 
+    </div>
109 
+  </div>
110 
+  <div class="row searchlistback" id="searchid">
111 
+    <div class="col-xs-10" style="padding-right: 0px !important">
112 
+      <form class="form-inline incidentsearchsize col-xs-12">
113 
+        <div class="form-group inspectlistsearch">
114 
+          <div>
115 
+            <div class="control-label pull-left" style="padding-top: 4px">
116 
+              计划主题:
75 117 
             </div>
118 
+            <ui-select
119 
+              class="pull-right iptSize"
120 
+              ng-model="tData.title" ng-change="changeTitle()"
121 
+              theme="bootstrap"
122 
+            >
123 
+              <ui-select-match placeholder="">
124 
+                {{$select.selected.title}}
125 
+              </ui-select-match>
126 
+              <ui-select-choices repeat="item in titleData">
127 
+                <div
128 
+                  ng-bind-html="item.title | highlight: $select.search"
129 
+                ></div>
130 
+              </ui-select-choices>
131 
+            </ui-select>
132 
+          </div>
76 133 
         </div>
77 
-    </section>
78 
-    <!-- <div class="row searchlistback margin-top-15" id="searchid"> -->
79 
-    <div class="list-controls clearfix">
80 
-        <div class="btn-group">
81 
-            <button class="btn btn-statebutton statebutton  keepleftbottom" ng-click="onChange('all')" ng-class="{'statecolor':searchstate=='all'}">全部</button>
82 
-            <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate=='todo'}" ng-click="onChange('todo')">待处理</button>
83 
-            <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate=='done'}" ng-click="onChange('done')">处理过</button>
134 
+        <div class="form-group inspectlistsearch">
135 
+            <div>
136 
+              <div class="control-label pull-left" style="padding-top: 4px">
137 
+                批次号:
138 
+              </div>
139 
+              <ui-select
140 
+                class="pull-right iptSize"
141 
+                ng-model="tData.batchNo"
142 
+                theme="bootstrap"
143 
+              >
144 
+                <ui-select-match placeholder="">
145 
+                  {{$select.selected.batchNo}}
146 
+                </ui-select-match>
147 
+                <ui-select-choices repeat="item in batchNoData">
148 
+                  <div
149 
+                    ng-bind-html="item.batchNo | highlight: $select.search"
150 
+                  ></div>
151 
+                </ui-select-choices>
152 
+              </ui-select>
153 
+            </div>
154 
+          </div>
155 
+        <div class="form-group inspectlistsearch">
156 
+          <div class="pull-left" style="padding-top: 4px">巡检类型:</div>
157 
+          <div class="pull-right iptSize" style="display: inline">
158 
+            <div>
159 
+              <multi-select-tree
160 
+                ng-model="model.inspectionProcessActual.inspectionType"
161 
+                data-input-model="my_data"
162 
+                data-output-model="model.inspectionProcessActual.inspectionType"
163 
+                theme="bootstrap"
164 
+                multi-select="false"
165 
+                data-default-label=""
166 
+                data-callback="onFilterCallback(item)"
167 
+                data-select-only-leafs="false"
168 
+                reset-search-input="false"
169 
+                data-trans-label="label"
170 
+                data-switch-view="false"
171 
+              ></multi-select-tree>
172 
+            </div>
173 
+          </div>
84 174 
         </div>
85 
-    </div>
86 
-    <div class="row searchlistback" id="searchid">
87 
-        <div class="col-xs-10" style="padding-right: 0px !important;">
88 
-            <form class="form-inline incidentsearchsize col-xs-12">
89 
-                <div class="form-group inspectlistsearch ">
90 
-                    <div>
91 
-                        <div class="control-label pull-left" style="padding-top:4px">计划主题:</div>
92 
-                        <input class="form-control pull-right inputcolor iptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="model.inspectionProcessActual.inspection.title" placeholder="" />
93 
-                    </div>
94 
-                </div>
95 
-                <div class="form-group inspectlistsearch ">
96 
-                    <div class=" pull-left" style="padding-top:4px">巡检类型:</div>
97 
-                    <div class="pull-right iptSize" style="display:inline">
98 
-                        <div>
99 
-                            <multi-select-tree ng-model="model.inspectionProcessActual.inspectionType" data-input-model="my_data" data-output-model="model.inspectionProcessActual.inspectionType" theme="bootstrap" multi-select="false" data-default-label="" data-callback="onFilterCallback(item)" data-select-only-leafs="true" reset-search-input="false"
100 
-                                data-trans-label="label" data-switch-view="false"></multi-select-tree>
101 
-                        </div>
102 
-                    </div>
103 
-                </div>
104 
-                <div class="form-group inspectlistsearch ">
105 
-                    <div class=" pull-left" style="padding-top:4px">处理人:</div>
106 
-                    <ui-select class="pull-right iptSize" ng-model="model.inspectionProcessActual.inspection.executeUser"
107 
-                        theme="bootstrap">
108 
-                        <ui-select-match placeholder="">
109 
-                            {{$select.selected.name}}
110 
-                        </ui-select-match>
111 
-                        <ui-select-choices repeat="item in executeUserData">
112 
-                            <div ng-bind-html="item.name | highlight: $select.search"></div>
113 
-                        </ui-select-choices>
114 
-                    </ui-select>
115 
-                </div>
116 
-                <div class="form-group inspectlistsearch ">
117 
-                    <div class=" pull-left" style="padding-top:4px">创建人:</div>
118 
-                    <ui-select class="pull-right iptSize" ng-model="model.inspectionProcessActual.inspection.createUser"
119 
-                        theme="bootstrap">
120 
-                        <ui-select-match placeholder="">
121 
-                            {{$select.selected.name}}
122 
-                        </ui-select-match>
123 
-                        <ui-select-choices repeat="item in createUserData">
124 
-                            <div ng-bind-html="item.name | highlight: $select.search"></div>
125 
-                        </ui-select-choices>
126 
-                    </ui-select>
127 
-                </div>
128 
-                <!-- <div class="form-group inspectlistsearch ">
175 
+        <div class="form-group inspectlistsearch">
176 
+          <div class="pull-left" style="padding-top: 4px">处理人:</div>
177 
+          <ui-select
178 
+            class="pull-right iptSize"
179 
+            ng-model="model.inspectionProcessActual.inspection.executeUser"
180 
+            theme="bootstrap"
181 
+          >
182 
+            <ui-select-match placeholder="">
183 
+              {{$select.selected.name}}
184 
+            </ui-select-match>
185 
+            <ui-select-choices repeat="item in executeUserData">
186 
+              <div ng-bind-html="item.name | highlight: $select.search"></div>
187 
+            </ui-select-choices>
188 
+          </ui-select>
189 
+        </div>
190 
+        <!-- <div class="form-group inspectlistsearch">
191 
+          <div class="pull-left" style="padding-top: 4px">创建人:</div>
192 
+          <ui-select
193 
+            class="pull-right iptSize"
194 
+            ng-model="model.inspectionProcessActual.inspection.createUser"
195 
+            theme="bootstrap"
196 
+          >
197 
+            <ui-select-match placeholder="">
198 
+              {{$select.selected.name}}
199 
+            </ui-select-match>
200 
+            <ui-select-choices repeat="item in createUserData">
201 
+              <div ng-bind-html="item.name | highlight: $select.search"></div>
202 
+            </ui-select-choices>
203 
+          </ui-select>
204 
+        </div> -->
205 
+        <!-- <div class="form-group inspectlistsearch ">
129 206 
                     <div class=" pull-left" style="padding-top:4px">创建时间:</div>
130 207 
                     <input type="text" class="pull-right iptSize" datepicker-popuptime="yyyy-MM-dd"
131 208 
                         ng-model="inspecttype.createTime" max-date="searchkeys.acceptDateEnd" is-open="startOpened"
132 209 
                         hour-time=true ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
133 210 
                         placeholder="" />
134 211 
                 </div> -->
135 
-                <div class="form-group inspectlistsearch">
136 
-                    <div class=" pull-left" style="padding-top:4px">状态:</div>
137 
-                    <ui-select class="pull-right iptSize" ng-model="statusData.state"
138 
-                        theme="bootstrap">
139 
-                        <ui-select-match placeholder="">
140 
-                            {{$select.selected.name}}
141 
-                        </ui-select-match>
142 
-                        <ui-select-choices repeat="item in statusData">
143 
-                            <div ng-bind-html="item.name | highlight: $select.search"></div>
144 
-                        </ui-select-choices>
145 
-                    </ui-select>
146 
-                </div>
147 
-                <!-- <div class="form-group inspectlistsearch">
212 
+        <div class="form-group inspectlistsearch">
213 
+          <div class="pull-left" style="padding-top: 4px">状态:</div>
214 
+          <ui-select
215 
+            class="pull-right iptSize"
216 
+            ng-model="statusData.state"
217 
+            theme="bootstrap"
218 
+          >
219 
+            <ui-select-match placeholder="">
220 
+              {{$select.selected.name}}
221 
+            </ui-select-match>
222 
+            <ui-select-choices repeat="item in statusData">
223 
+              <div ng-bind-html="item.name | highlight: $select.search"></div>
224 
+            </ui-select-choices>
225 
+          </ui-select>
226 
+        </div>
227 
+        <!-- <div class="form-group inspectlistsearch">
148 228 
                     <div class="pull-right">
149 229 
                         <div class="control-label pull-left" style="padding-top:4px">计划主题:</div>
150 230 
                         <input class="form-control pull-right inputcolor" style="width:170px !important;border-color: #dedede;color: #93989e;" type="text" ng-model="inspectdata.title" placeholder="" />
151 231 
                     </div>
152 232 
                 </div> -->
153 
-            </form>
154 
-        </div>
155 
-        <div class="col-xs-2">
156 
-            <div>
157 
-                <!-- <div class="centerdiv-one"></div> -->
158 
-                <div class="pull-left margin-top-10 searchBtnBox">
159 
-                    <!-- <div class="form-group"> -->
160 
-                    <!-- <a class="btn btn-searchbutton steelbutton" id="jry_searchBtn" ng-click="searchinspectlist(inspecttype)" type="button">搜索</a> -->
161 
-                    <div class="btn btn_search" ng-click="searchinspectlist(inspecttype)"><span>搜索</span></div>
162 
-                    <div class="btn btn_clean" ng-click="clean()">重置</div>
163 
-                    <!-- <a ladda="ldloading.expand_right" class="btn btn-primary" data-style="expand-right" ng-click="reload()">
233 
+      </form>
234 
+    </div>
235 
+    <div class="col-xs-2">
236 
+      <div>
237 
+        <!-- <div class="centerdiv-one"></div> -->
238 
+        <div class="pull-left margin-top-10 searchBtnBox">
239 
+          <!-- <div class="form-group"> -->
240 
+          <!-- <a class="btn btn-searchbutton steelbutton" id="jry_searchBtn" ng-click="searchinspectlist(inspecttype)" type="button">搜索</a> -->
241 
+          <div class="btn btn_search" ng-click="searchinspectlist(inspecttype)">
242 
+            <span>搜索</span>
243 
+          </div>
244 
+          <div class="btn btn_clean" ng-click="clean()">重置</div>
245 
+          <!-- <a ladda="ldloading.expand_right" class="btn btn-primary" data-style="expand-right" ng-click="reload()">
164 246 
                         <span translate="list.button.REFRESH">Refresh Data</span>
165 247 
                         <i class="ti-reload" />
166 248 
                     </a> -->
167 
-                    <!-- <button ladda="ldloading.expand_right" type="button" class="btn btn-reashbutton reashbutton jry_reashbutton" data-style="expand-right" ng-click="reload()">
249 
+          <!-- <button ladda="ldloading.expand_right" type="button" class="btn btn-reashbutton reashbutton jry_reashbutton" data-style="expand-right" ng-click="reload()">
168 250 
                         <span translate="list.button.REFRESH">Refresh Data</span>
169 251 
                     </button> -->
170 
-                    <!-- <a ladda="ldloading.expand_right" class="btn btn-reashbutton reashbutton" data-style="expand-right" ng-click="reload()">
252 
+          <!-- <a ladda="ldloading.expand_right" class="btn btn-reashbutton reashbutton" data-style="expand-right" ng-click="reload()">
171 253 
                                 <span translate="list.button.REFRESH">Refresh Data</span>
172 254 
                             </a> -->
173 
-                    <!-- <button type="button" id="addData" class="btn btn-success" ng-click="addData()">
255 
+          <!-- <button type="button" id="addData" class="btn btn-success" ng-click="addData()">
174 256 
                                 <span translate="list.button.CREATE">Add Data</span>
175 257 
                                 <i class="ti-plus"/>
176 258 
                             </button> -->
177 
-                    <!--<button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">-->
178 
-                    <!-- <button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">
259 
+          <!--<button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">-->
260 
+          <!-- <button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">
179 261 
                                 <span translate=" list.button.REMOVE ">Remove First Row</span>
180 262 
                                 <i class="ti-trash "/>
181 263 
                             </button> -->
182 
-                </div>
183 
-            </div>
184 
-            <!-- </div>
185 
-            </div> -->
186 264 
         </div>
265 
+      </div>
266 
+      <!-- </div>
267 
+            </div> -->
187 268 
     </div>
188 
-    <div class="jry_gridBg">
189 
-        <div ui-i18n="{{lang}}">
190 
-            <div class=" ">
191 
-                <div id="grid1 " ui-grid="gridOptions " ui-grid-pagination external-scopes="$scope " ui-grid-resize-columns ui-grid-auto-resize class="grid "></div>
192 
-            </div>
193 
-        </div>
269 
+  </div>
270 
+  <div class="jry_gridBg">
271 
+    <div ui-i18n="{{lang}}">
272 
+      <div class=" ">
273 
+        <div
274 
+          id="grid1 "
275 
+          ui-grid="gridOptions "
276 
+          ui-grid-pagination
277 
+          external-scopes="$scope "
278 
+          ui-grid-resize-columns
279 
+          ui-grid-auto-resize
280 
+          class="grid"
281 
+        ></div>
282 
+      </div>
194 283 
     </div>
284 
+  </div>
195 285 
 </div>
196 286 
 <style>
197 
-    .jry_gridBg{
198 
-        padding: 15px;
199 
-        background: #f9f9f9;
200 
-    }
201 
-    /* tab点击颜色 */
202 
-    .statecolor{
203 
-        background-color: #005395!important
204 
-    }
205 
-    /* 搜索按钮 */
206 
-    #jry_searchBtn{
207 
-        width: 60px;
208 
-        height: 34px!important;
209 
-        border-radius: 2px;
210 
-        background-color: #005395;
211 
-        padding: 6px 0px!important
212 
-    }
213 
-    #jry_searchBtn:hover{
214 
-        background-color: #004279!important
215 
-    }
216 
-    /* 刷新按钮 */
217 
-    .jry_reashbutton{
218 
-        width: 60px;
219 
-        height: 34px;
220 
-        border-radius: 2px!important;
221 
-        border:1px #005395 solid;
222 
-        color: #005395;
223 
-        background-color: #e6eef4!important;
224 
-        padding: 0 6px!important
225 
-    }
226 
-    .jry_reashbutton:hover{
227 
-        color: #005395;
228 
-        background-color: #e6eef4!important;
229 
-    }
230 
-</style>
287 
+  .jry_gridBg {
288 
+    padding: 15px;
289 
+    background: #f9f9f9;
290 
+  }
291 
+  /* tab点击颜色 */
292 
+  .statecolor {
293 
+    background-color: #005395 !important;
294 
+  }
295 
+  /* 搜索按钮 */
296 
+  #jry_searchBtn {
297 
+    width: 60px;
298 
+    height: 34px !important;
299 
+    border-radius: 2px;
300 
+    background-color: #005395;
301 
+    padding: 6px 0px !important;
302 
+  }
303 
+  #jry_searchBtn:hover {
304 
+    background-color: #004279 !important;
305 
+  }
306 
+  /* 刷新按钮 */
307 
+  .jry_reashbutton {
308 
+    width: 60px;
309 
+    height: 34px;
310 
+    border-radius: 2px !important;
311 
+    border: 1px #005395 solid;
312 
+    color: #005395;
313 
+    background-color: #e6eef4 !important;
314 
+    padding: 0 6px !important;
315 
+  }
316 
+  .jry_reashbutton:hover {
317 
+    color: #005395;
318 
+    background-color: #e6eef4 !important;
319 
+  }
320 
+</style>

+ 18 - 4
assets/views/inspect/inspectReport.html
Wyświetl plik 

@@ -60,7 +60,7 @@
60 60 
     <div class="inspectMain">
61 61 
       <div class="inspectMain_header">请选择计划主题和批次号</div>
62 62 
       <div>
63 
-        计划主题<span style="color:red" class="ng-scope">*</span>：
63 
+        计划主题<span style="color: red" class="ng-scope">*</span>：
64 64 
         <ui-select ng-model="queryList.title" ng-change="changeTitle(e)">
65 65 
           <ui-select-match placeholder="请选择计划主题">
66 66 
             <span ng-bind="$select.selected.title"> </span>
 
@@ -73,7 +73,7 @@
73 73 
         </ui-select>
74 74 
       </div>
75 75 
       <div>
76 
-        批次号<span style="color:red" class="ng-scope">*</span>：
76 
+        批次号<span style="color: red" class="ng-scope">*</span>：
77 77 
         <ui-select ng-model="queryList.batchNo">
78 78 
           <ui-select-match placeholder="请选择批次号">
79 79 
             <span ng-bind="$select.selected.name"> </span>
 
@@ -94,8 +94,8 @@
94 94 
     <div class="row">
95 95 
       <div class="col-sm-8">
96 96 
         <h1 class="mainTitle">
97 
-          巡检计划<i
98 
-            tooltip="巡检计划列表，可对巡检进行修改，新增，删除"
97 
+          巡检报告<i
98 
+            tooltip="巡检报告列表"
99 99 
             tooltip-placement="right"
100 100 
             class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
101 101 
           ></i>
 
@@ -103,6 +103,20 @@
103 103 
       </div>
104 104 
     </div>
105 105 
   </section>
106 
+  <div class="schuback" id="searchid">
107 
+    <div class="row" style="padding-right: 0px !important">
108 
+      <div class="col-xs-12">
109 
+        <div class="col-xs-11" style="padding-right: 0px !important"></div>
110 
+        <div class="col-xs-1">
111 
+          <div>
112 
+            <div class="pull-left margin-top-10 searchBtnBox">
113 
+              <div class="btn btn_clean" ng-click="print()">打印</div>
114 
+            </div>
115 
+          </div>
116 
+        </div>
117 
+      </div>
118 
+    </div>
119 
+  </div>
106 120 
   <div class="tableList" ui-i18n="{{lang}}">
107 121 
     <div class=" ">
108 122 
       <div