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

@@ -1,16 +1,17 @@
 <template>
   <PhoneScroll
-      height="calc(100vh - 101px)"
+    height="calc(100vh - 101px)"
-      :data="list"
+    :data="list"
-      :page="searchQuery.page"
+    :page="searchQuery.page"
-      :pageSize="searchQuery.pageSize"
+    :pageSize="searchQuery.pageSize"
-      :total="total"
+    :total="total"
-      :loading="loading"
+    :loading="loading"
-      pullUpLoad
+    pullUpLoad
-      pullDownRefresh
+    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>
@@ -18,13 +19,13 @@
         <div class="standContent">
           <div class="standState">{{ item.standardName || '-' }}</div>
           <div class="standState">
-            标准状态: <span style="color: #35720B; padding-left: 5px;">{{textStateMap[item.textState] || '-' }}</span>
+            标准状态: <span style="color: #35720B; padding-left: 5px;">{{ textStateMap[item.textState] || '-' }}</span>
           </div>
         </div>
 
         <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
   },
@@ -45,7 +46,7 @@ export default {
       default: 'ZYBZFG'
     }
   },
-  data() {
+  data () {
     return {
       searchQuery: {
         page: 1,
@@ -59,7 +60,7 @@ export default {
       textStateMap: {}
     }
   },
-  created() {
+  created () {
     this.getDicTypeListCode()
     this.getData()
   },
@@ -86,14 +87,14 @@ 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
 
             if (this.searchQuery.page === 1) {
               this.list = res.data.records
             } else {
-              this.list = [...this.list, ...res.data.records]
+              this.list = [ ...this.list, ...res.data.records ]
             }
           }
         }).finally(() => {
@@ -103,17 +104,17 @@ export default {
     },
     getDicTypeListCode () {
       this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
-        this.dict = {...res.data}
+        this.dict = { ...res.data }
         // WBZTCLASS 国内、国外  TEXTSTATUSBUSS 企业
-        this.setMap([...this.dict.WBZTCLASS, ...this.dict.TEXTSTATUSBUSS], 'textStateMap')
+        this.setMap([ ...this.dict.WBZTCLASS, ...this.dict.TEXTSTATUSBUSS ], 'textStateMap')
       })
     },
-    setMap(data, key) {
+    setMap (data, key) {
       data.forEach(item => {
         this.$set(this[key], item.value, item.label);
       });
     },
-    jumpDetails(item) {
+    jumpDetails (item) {
       let pageType = ''
       switch (item.resourceType) {
         case 'INLAND':
@@ -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) {