Просмотр исходного кода

3.0.29 更新 pc-component-v3 图片预览

liuyanpeng 2 лет назад
Родитель
Сommit
4832a5b41f
2 измененных файлов с 12 добавлено и 21 удалено
  1. 2 2
      package.json
  2. 10 19
      src/components/customer/AssetInstanceSearchDetail.vue

+ 2 - 2
package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "client-eam-v3",
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -15,7 +15,7 @@
   "peerDependencies": {
   "peerDependencies": {
     "ant-design-vue": "^3.2.15",
     "ant-design-vue": "^3.2.15",
     "moment": "^2.29.4",
     "moment": "^2.29.4",
-    "pc-component-v3": "^1.0.45",
+    "pc-component-v3": "^1.0.51",
     "v-tooltip": "^4.0.0-beta.17",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
     "vue-select": "^4.0.0-beta.6"
   },
   },

+ 10 - 19
src/components/customer/AssetInstanceSearchDetail.vue

@@ -4,11 +4,7 @@
       <div class="row">
       <div class="row">
         <div class="col-md-12">
         <div class="col-md-12">
           <h1 class="page-header" style="margin-top: 10px; margin-bottom: 0px">
           <h1 class="page-header" style="margin-top: 10px; margin-bottom: 0px">
-            <a-image
-              style="width: 78px; height: 78px"
-              :src="Common.getThumbnailImageSrc(assetClassName,showAssetInstance.imageName)"
-            />
-            <!-- <AuthImage
+            <AuthImage
               :auth-src="
               :auth-src="
                 Common.getThumbnailImageSrc(
                 Common.getThumbnailImageSrc(
                   assetClassName,
                   assetClassName,
@@ -23,7 +19,7 @@
                   showAssetInstance.imageName
                   showAssetInstance.imageName
                 )
                 )
               "
               "
-            /> -->
+            />
 
 
             {{ $t("lang.AssetInstanceSearchDetail.assetCardDetails") }}
             {{ $t("lang.AssetInstanceSearchDetail.assetCardDetails") }}
           </h1>
           </h1>
@@ -778,25 +774,16 @@
                       <td>{{ item.position }}</td>
                       <td>{{ item.position }}</td>
                       <td>{{ item.type }}</td>
                       <td>{{ item.type }}</td>
                       <td>
                       <td>
-                        <a-image
-                          style="width: 80px; height: 50px"
-                          :src="Common.getThumbnailImageSrc(item.className,item.image)"
-                        />
-                        <!-- <img
-                          :authSrc="
+                        <AuthImage
+                          :auth-src="
                             showRfidRecordThumbnailImage(
                             showRfidRecordThumbnailImage(
                               item.className,
                               item.className,
                               item.image
                               item.image
                             )
                             )
                           "
                           "
                           style="width: 80px; height: 50px"
                           style="width: 80px; height: 50px"
-                          @click="
-                            $refs.imagePreview.preview(
-                              item.className,
-                              item.image
-                            )
-                          "
-                        /> -->
+                          @click="getImage(item.className,item.image)"
+                        />
                       </td>
                       </td>
                     </tr>
                     </tr>
                   </tbody>
                   </tbody>
@@ -929,6 +916,10 @@ export default {
   },
   },
 
 
   methods: {
   methods: {
+    getImage: function (className,imageName) {
+      const url = this.showRfidRecordThumbnailImage(className,imageName);
+      this.$refs.imagePreview.preview(url);
+    },
     getEventOriginalEndDate: function () {
     getEventOriginalEndDate: function () {
       const _self = this;
       const _self = this;
       // 前一个月的时间
       // 前一个月的时间