3.0.25更新资产卡片详情

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/components/customer/AssetInstanceSearchDetail.vue

@@ -511,21 +511,21 @@
                 $t("lang.AssetInstanceSearchDetail.lifeCycle")
               }}</a>
             </li>
-            <li>
+            <!-- <li>
               <a href="#asset-content-2" data-toggle="tab">{{
                 $t("lang.AssetInstanceSearchDetail.currentLocation")
               }}</a>
-            </li>
+            </li> -->
             <li>
               <a href="#asset-content-3" data-toggle="tab">{{
                 $t("lang.AssetInstanceSearchDetail.historicalPosition")
               }}</a>
             </li>
-            <li>
+            <!-- <li>
               <a href="#asset-content-5" data-toggle="tab">{{
                 $t("lang.AssetInstanceSearchDetail.historicalPosition1")
               }}</a>
-            </li>
+            </li> -->
             <li>
               <a href="#asset-content-4" data-toggle="tab">{{
                 $t("lang.AssetInstanceSearchDetail.inAndOutRecords")
@@ -555,9 +555,9 @@
                 </div>
               </div>
             </div>
-            <div id="asset-content-2" class="tab-pane fade in">
+            <!-- <div id="asset-content-2" class="tab-pane fade in">
               <p>{{ $t("lang.AssetInstanceSearchDetail.currentLocation") }}</p>
-            </div>
+            </div> -->
             <div id="asset-content-3" class="tab-pane fade in">
               <div class="form form-inline time-box">
                 <div class="form-group">
@@ -581,7 +581,6 @@
                 <button
                   type="button"
                   class="btn btn-default"
-                  style="margin-top: 25px"
                   @click="getAssetImageInfosByEpc"
                 >
                   {{ $t("lang.AssetInstanceSearchDetail.determine") }}
@@ -630,7 +629,7 @@
                 </div>
               </div>
             </div>
-            <div id="asset-content-5" class="tab-pane fade in">
+            <!-- <div id="asset-content-5" class="tab-pane fade in">
               <div class="form form-inline time-box">
                 <div class="form-group">
                   <label>{{
@@ -709,7 +708,7 @@
                   </div>
                 </div>
               </div>
-            </div>
+            </div> -->
             <div id="asset-content-4" class="tab-pane fade in">
               <div class="form form-inline time-box">
                 <div class="form-group">
@@ -733,7 +732,6 @@
                 <button
                   type="button"
                   class="btn btn-default"
-                  style="margin-top: 25px"
                   @click="getAssetInstanceRfidRecordByDate"
                 >
                   {{ $t("lang.AssetInstanceSearchDetail.determine") }}
@@ -890,12 +888,12 @@ export default {
         current_page: 1, // required
         last_page: 0, // required
       },
-      pagination3: {
-        total: 0,
-        per_page: Common.pageSize, // required
-        current_page: 1, // required
-        last_page: 0, // required
-      },
+      // pagination3: {
+      //   total: 0,
+      //   per_page: Common.pageSize, // required
+      //   current_page: 1, // required
+      //   last_page: 0, // required
+      // },
       assetInstanceRfidRecords: [],
       eventFilters: [],
       loading: false,
@@ -1027,7 +1025,7 @@ export default {
       this.getAssetInstanceRfidRecord();
 
       // 查询历史位置1
-      this.queryPageSingleEpcOriginalByTime();
+      // this.queryPageSingleEpcOriginalByTime();
     },
 
     // 查询历史位置
@@ -1362,56 +1360,56 @@ export default {
     /**
      * 查询历史位置1
      */
-    queryPageSingleEpcOriginalByTime: function () {
-      var _self = this;
-      if (
-        _self.eventOriginalStartDate == null &&
-        _self.eventOriginalEndDate == null
-      ) {
-        Common.showDialog('错误', '请选择开始时间和结束时间', 'error');
-        return;
-      }
-      const dto = {
-        epc: _self.showAssetInstance.epc,
-        startTime: _self.eventOriginalStartDate,
-        endTime: _self.eventOriginalEndDate,
-        pageNumber: _self.pagination3.current_page,
-        pageSize: _self.pagination3.per_page,
-      };
-      console.log(dto);
-      _self.queryPageSingleEpcFilterByTimeErrorMessage = null;
-      $.ajax({
-        url:
-          Common.getHostPageBaseURL() +
-          'datacenter/api/eventFilterResource/queryPageSingleEpcFilterByTime',
-        type: 'post',
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(dto),
-        beforeSend: function (request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function (data) {
-          if (data.errorCode != 0) {
-            Common.showDialog('错误', data.errorMessage, 'error');
-          } else {
-            if (data.eventFilters != null && data.eventFilters.length > 0) {
-              console.log(JSON.stringify(data.eventFilters));
-              _self.eventFilters = data.eventFilters;
-              _self.pagination3.total = data.total;
-              _self.pagination3.last_page = Math.ceil(
-                _self.pagination3.total / _self.pagination3.per_page,
-              );
-            }
-          }
-        },
-        error: function (XMLHttpRequest, textStatus, errorThrown) {
-          _self.queryPageSingleEpcFilterByTimeErrorMessage = '数据查询异常，您可能没有采购/启动相关的功能。';
-          console.log(XMLHttpRequest);
-          //Common.processException(XMLHttpRequest, textStatus, errorThrown);
-        },
-      });
-    },
+    // queryPageSingleEpcOriginalByTime: function () {
+    //   var _self = this;
+    //   if (
+    //     _self.eventOriginalStartDate == null &&
+    //     _self.eventOriginalEndDate == null
+    //   ) {
+    //     Common.showDialog('错误', '请选择开始时间和结束时间', 'error');
+    //     return;
+    //   }
+    //   const dto = {
+    //     epc: _self.showAssetInstance.epc,
+    //     startTime: _self.eventOriginalStartDate,
+    //     endTime: _self.eventOriginalEndDate,
+    //     pageNumber: _self.pagination3.current_page,
+    //     pageSize: _self.pagination3.per_page,
+    //   };
+    //   console.log(dto);
+    //   _self.queryPageSingleEpcFilterByTimeErrorMessage = null;
+    //   $.ajax({
+    //     url:
+    //       Common.getHostPageBaseURL() +
+    //       'datacenter/api/eventFilterResource/queryPageSingleEpcFilterByTime',
+    //     type: 'post',
+    //     contentType: 'application/json',
+    //     dataType: 'json',
+    //     data: JSON.stringify(dto),
+    //     beforeSend: function (request) {
+    //       Common.addTokenToRequest(request);
+    //     },
+    //     success: function (data) {
+    //       if (data.errorCode != 0) {
+    //         Common.showDialog('错误', data.errorMessage, 'error');
+    //       } else {
+    //         if (data.eventFilters != null && data.eventFilters.length > 0) {
+    //           console.log(JSON.stringify(data.eventFilters));
+    //           _self.eventFilters = data.eventFilters;
+    //           _self.pagination3.total = data.total;
+    //           _self.pagination3.last_page = Math.ceil(
+    //             _self.pagination3.total / _self.pagination3.per_page,
+    //           );
+    //         }
+    //       }
+    //     },
+    //     error: function (XMLHttpRequest, textStatus, errorThrown) {
+    //       _self.queryPageSingleEpcFilterByTimeErrorMessage = '数据查询异常，您可能没有采购/启动相关的功能。';
+    //       console.log(XMLHttpRequest);
+    //       //Common.processException(XMLHttpRequest, textStatus, errorThrown);
+    //     },
+    //   });
+    // },
   },
 };
 </script>