3.0.67

package.json

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

src/components/sonicAlbumUpload/configData.js

@@ -229,6 +229,28 @@ export const deleteAssetData = () => {
   });
 };
 
+// 删除全部资产图片临时表
+export const cleanUpAssetImageImport = () => {
+  var requestUrl = 'AssetImageImportResource/cleanUpAssetImageImport';
+  return new Promise((resolve, reject) => {
+    $.ajax({
+      url: Common.getApiURL(requestUrl),
+      type: 'post',
+      contentType: 'application/json',
+      dataType: 'json',
+      beforeSend: function(request) {
+        Common.addTokenToRequest(request);
+      },
+      success: function(data) {
+        resolve(data);
+      },
+      error: function(XMLHttpRequest, textStatus, errorThrown) {
+        reject(XMLHttpRequest);
+      },
+    });
+  });
+};
+
 
 export const listClientCanAccess = () => {
   var requestUrl = 'clientResourceV2/listClientCanAccess';

src/components/sonicAlbumUpload/index.vue

@@ -12,7 +12,7 @@
         <ImagesUpload v-show="company==''?false:true" />
         <p class="pStyle">支持拓展名：.png .jpg .jpeg .gif 注意：文件小于1GB</p>
         <p class="pStyle">
-          <a @click="viewImage">查看上传的图片</a>
+          <a :style="company==''?style3:style4" @click="viewImage">查看上传的图片</a>
         </p>
       </div>
       <div class="step">
@@ -95,15 +95,19 @@
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'mainImageName'">
             <a-image
-              v-if="record.mainImageName !== ''&&record.mainImageName !== null" :width="50" :src="
-                getThumbnailImageSrc(record.className, record.mainImageName)
-              "
+              v-if="record.mainImageName !== ''&&record.mainImageName !== null" :width="50" :preview="false" 
+              :src="getThumbnailImageSrc(record.className, record.mainImageName)"
+              @click="handlePreview(record.className, record.mainImageName)"
             />
           </template>
           <template v-if="column.key === 'otherImageName'">
             <template v-if="record.otherImageName !== ''&&record.otherImageName !== null">
               <div style="display: flex">
-                <a-image v-for="item in record.otherImageNameArr" :key="item" :width="50" :src="getThumbnailImageSrc(record.className, item)" />
+                <a-image
+                  v-for="item in record.otherImageNameArr" :key="item" :preview="false" :width="50" 
+                  :src="getThumbnailImageSrc(record.className, item)"
+                  @click="handlePreview(record.className, item)"
+                />
               </div>
             </template>
           </template>
@@ -151,6 +155,12 @@
       <a-button @click="imagesVisible = false">取消</a-button>
     </template>
   </a-modal>
+  <a-modal v-model:visible="showLargeImage">
+    <a-image :preview="false" :src="getImageSrc(className, imageName)" />
+    <template #footer>
+      <a-button @click="showLargeImage = false">取消</a-button>
+    </template>
+  </a-modal>
   <Loading v-if="loading" />
 </template>
 
@@ -183,6 +193,7 @@ import {
   resultColumns,
   queryAssetData,
   deleteAssetData,
+  cleanUpAssetImageImport,
   testImportExcel,
   listClientCanAccess,
 } from './configData.js';
@@ -216,12 +227,21 @@ const viewColumns = ref(imageColumns);
 const assetImageColumns = ref(assetColumns);
 const resultImageColumns = ref(resultColumns);
 const excelFile = ref(null);
+const showLargeImage = ref(false);
+const className = ref('');
+const imageName = ref('');
 const style1 = ref({
   color: 'black',
 });
 const style2 = ref({
   color: 'red',
 });
+const style3 = ref({
+  color: 'grey',
+});
+const style4 = ref({
+  color: 'blue',
+});
 const pager = reactive({
   start: 0,
   length: 20,
@@ -249,6 +269,12 @@ const downloadBtn = () => {
   downloadVisible.value = true;
 };
 
+const handlePreview = (className1,image) => {
+  className.value = className1;
+  imageName.value = image;
+  showLargeImage.value = true;
+};
+
 // 获取分页
 const getPageParams = (start, length) => {
   pager.start = (start - 1) * length;
@@ -337,6 +363,7 @@ const excelFileChange = e => {
     return;
   }
   showTest.value = true;
+  showFormal.value = false;
   excelFile.value = e.file;
 };
 
@@ -448,8 +475,10 @@ const downloadReport = type => {
 // 清空临时表数据
 const cleanUp = () => {
   loading.value = true;
-  deleteAssetData().then(
+  cleanUpAssetImageImport().then(
     successData => {
+      showTest.value = false;
+      showFormal.value = false;
       loading.value = false;
       resultImageDatas.value = null;
     },

webpack.dev.js

@@ -60,65 +60,65 @@ module.exports = WebpackMerge.merge(baseConfig, {
 
     proxy: {
       '/api': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/static': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/content': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/dashboard': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/mock': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/authApi': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/Dictionary': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/Files': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/WebSocket': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: true,
         changeOrigin: true,
       },
       '/TrainVideo': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: true,
         changeOrigin: true,
       },
       '/gateway-api': {
-        target: 'http://wuzhixin.vip:10023/',
+        target: 'http://wuzhixin.vip:10022/',
         ws: true,
         changeOrigin: true,
         secure: true,