Merge branch 'fix_20240123_UAT' into 'master'

Fix 20240123 uat

See merge request laws-foton-slrs/foton-laws-system-front!155

src/pages/phone/domesticDetails.vue

@@ -3204,8 +3204,9 @@ export default {
       })
     },
     openFileInPdf (attId, oldFileName) {
-      // this.$preview(attId)
+      this.$preview(attId)
 
+      /*
       // 判断是否是图片格式，图片格式不预览，直接下载
       const index1 = oldFileName.lastIndexOf('.')
       const index2 = oldFileName.length
@@ -3248,6 +3249,7 @@ export default {
       } else {
         this.$message.warning('PDG文件,不支持手机端预览')
       }
+       */
     },
     getFileInfo (fileId) {
       Axios({

src/pages/phone/standDynamics/components/Standard.vue

@@ -8,9 +8,10 @@
     :loading="loading"
     pullUpLoad
     pullDownRefresh
-      :getDataHandler="getData">
+    :getDataHandler="getData"
+  >
     <div style="padding-top: 10px">
-      <div class="card-content" v-for="item in list" :key="item.id" @click="jumpDetails(item)">
+      <div v-for="item in list" :key="item.id" class="card-content" @click="jumpDetails(item)">
         <div class="standTitle">
           <div class="title">{{ item.standard || '-' }}</div>
         </div>
@@ -24,7 +25,7 @@
 
         <div class="timeFooter">
           <div style="width: 50%">发布日期: <span style="padding-left: 5px;">{{ convertTime(item.releaseDate) }}</span></div>
-          <div style="width: 50%">实施日期: <span style="padding-left: 5px;">{{ convertTime(item.renewTime) }}</span></div>
+          <div style="width: 50%">实施日期: <span style="padding-left: 5px;">{{ convertTime(item.putTime) }}</span></div>
         </div>
       </div>
     </div>
@@ -32,10 +33,10 @@
 </template>
 
 <script>
-import PhoneScroll from "@/components/hzwlComponents/phone/PhoneScroll";
+import PhoneScroll from '@/components/hzwlComponents/phone/PhoneScroll';
 
 export default {
-  name: "Standard",
+  name: 'Standard',
   components: {
     PhoneScroll
   },
@@ -86,7 +87,7 @@ export default {
         if (page) {
           this.searchQuery.page = page
         }
-        this.$http._getData("lawss/NewsFeed/getNewsFeed", this.searchQuery, config).then(res => {
+        this.$http._getData('lawss/NewsFeed/getNewsFeed', this.searchQuery, config).then(res => {
           if (res.ok) {
             this.total = res.data.total
 
@@ -127,7 +128,7 @@ export default {
           break
       }
       this.$router.push({
-        name: "domesticDetails",
+        name: 'domesticDetails',
         query: {
           id: item.standardId,
           pageType
@@ -138,7 +139,6 @@ export default {
 }
 </script>
 
-
 <style scoped lang="less">
 .root {
   height: 100%;

src/pages/phone/zlzxDetails.vue

@@ -1350,8 +1350,9 @@ export default {
       })
     },
     openFileInPdf (attId, oldFileName) {
-      // this.$preview(attId)
+      this.$preview(attId)
 
+      /*
       // 判断是否是图片格式，图片格式不预览，直接下载
       const index1 = oldFileName.lastIndexOf('.')
       const index2 = oldFileName.length
@@ -1380,6 +1381,7 @@ export default {
       }else {
         this.$message.warning('PDG文件,不支持手机端预览')
       }
+       */
     },
     showItemsModel (attField) {
       if (attField) {