Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -208,7 +208,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
         List<SkinFieldEntity> collect = entity.getSkinFieldList().stream().map(field -> {
             SkinFieldEntity skinFieldEntity = new SkinFieldEntity();
             BeanUtils.copyProperties(field, skinFieldEntity, BeanUtil.getNullPropertyNames(field));
-            updateUrl(skinFieldEntity);
+         //   updateUrl(skinFieldEntity);
             return skinFieldEntity;
         }).collect(Collectors.toList());
 

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/components/FormDetails.vue

@@ -78,11 +78,30 @@
           <div class="card">
             <div class="cardTitle">附件</div>
             <div class="cardContent" v-if="fromData.url">
-              <img
-                v-for="(item, index) in fromData.url"
-                :key="index"
-                :src="baseUrl + item"
-              />
+              <template v-for="(item, index) in fromData.url">
+                <img
+                  v-if="/\.(jpg|jpeg|png|GIF|JPG|PNG)$/.test(item)"
+                  :key="index"
+                  :src="baseUrl + item"
+                  @click="$viewerApi({ images: [baseUrl + item] })"
+                />
+
+                <video
+                  width="320"
+                  height="240"
+                  v-if="/\.(mp4|rmvb|avi|)$/.test(item)"
+                  :key="index"
+                  :src="baseUrl + item"
+                ></video>
+                <a-button
+                  :href="baseUrl + item"
+                  v-else
+                  :key="index"
+                  type="primary"
+                >
+                  点击下载
+                </a-button>
+              </template>
             </div>
             <div v-else>--</div>
           </div>
@@ -273,7 +292,7 @@ export default {
   data() {
     return {
       fromData: {},
-      baseUrl: process.env.VUE_APP_API_BASE_URL,
+      baseUrl: process.env.VUE_APP_API_PHP_URL,
     };
   },
   computed: {
@@ -286,6 +305,7 @@ export default {
       },
     },
   },
+
   methods: {
     onClose() {
       this.Visible = false;