Merge remote-tracking branch 'origin/V20230915' into V20230915

dsk-operate-ui/src/assets/styles/index.scss

@@ -231,9 +231,9 @@ li {
 }
 .app-container {
   width: 100%;
-  margin: 12px 24px;
+  padding: 16px 24px;
   background-color: #f5f5f5;
-  padding-bottom: 16px !important;
+  box-sizing: border-box;
   .el-input__inner {
     border-color: #d9d9d9;
     color: #232323;

dsk-operate-ui/src/assets/styles/project.scss

 .el-card{
   overflow: initial;
 }
-.app-container{
-  padding: 0;
-}
 //小导航
 .miantitle{
   color: #232323;

dsk-operate-ui/src/assets/styles/public.scss

@@ -1222,8 +1222,7 @@ select {
 	color: #232323;
   }
 .enterprise_contatiner{
-	padding: 0;
-	padding-bottom: 16px;
+
 }
 .el-input-group__append{
 	cursor: pointer;

dsk-operate-ui/src/router/index.js

@@ -139,8 +139,8 @@ export const constantRoutes = [
       {
         path: '/performance/gzsc/:id',
         component: () => import('@/views/market/detail'),
-        name: 'gzsc',
-        meta: { title: '公招市场详情', icon: 'enterprise', noCache: false },
+        name: 'GzscDetail',
+        meta: { title: '公招市场详情', icon: 'enterprise'},
       }
     ]
   },

dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue

@@ -287,7 +287,7 @@ export default {
 .headerFixed{
   position: sticky;
   top: 0;
-  z-index: 9;
+  z-index: 10;
   padding-top: 16px;
   margin-top: -16px;
   background: #fff;

dsk-operate-ui/src/views/enterpriseData/components/searchTheOwner/index.vue

@@ -916,6 +916,14 @@ export default {
       }
     }
   }
+
+  .checkbox {
+    .checkbox-content {
+      .el-checkbox {
+        margin-bottom: 15px;
+      }
+    }
+  }
 }
 ::v-deep .dialog-renlin {
   margin-top: 40vh !important;

dsk-operate-ui/src/views/index.vue

@@ -970,7 +970,7 @@ export default {
               yAxisIndex: 1,
               tooltip: {
                 valueFormatter: function (value) {
-                  return value + '万元'
+                  return value
                 }
               },
               itemStyle: {
@@ -989,7 +989,7 @@ export default {
               barWidth: 20,
               tooltip: {
                 valueFormatter: function (value) {
-                  return value + '个';
+                  return value;
                 }
               },
               itemStyle: {
@@ -1295,7 +1295,7 @@ export default {
               yAxisIndex: 1,
               tooltip: {
                 valueFormatter: function (value) {
-                  return value + '万元'
+                  return value
                 }
               },
               itemStyle: {
@@ -1314,7 +1314,7 @@ export default {
               barWidth: 20,
               tooltip: {
                 valueFormatter: function (value) {
-                  return value + '个';
+                  return value;
                 }
               },
               itemStyle: {

dsk-operate-ui/src/views/macro/nationalEconomies/component/jzqyfx.vue

@@ -41,34 +41,34 @@
 
               <el-table-column label="特级" align="right">
                 <el-table-column prop="tjCount" label="数量" align="right">
-                  <template slot-scope="scope">{{ scope.row.tjCount }}个</template>
+                  <template slot-scope="scope">{{ scope.row.tjCount }}{{ scope.row.tjCount ? '个':'--' }}</template>
                 </el-table-column>
                 <el-table-column prop="tjRate" label="占比" align="right">
-                  <template slot-scope="scope">{{ scope.row.tjRate }}%</template>
+                  <template slot-scope="scope">{{ scope.row.tjRate }}{{ scope.row.tjRate ? '%':'--' }}</template>
                 </el-table-column>
               </el-table-column>
               <el-table-column label="一级" align="right">
                 <el-table-column prop="oneCount" label="数量" align="right">
-                  <template slot-scope="scope">{{ scope.row.oneCount }}个</template>
+                  <template slot-scope="scope">{{ scope.row.oneCount }}{{ scope.row.oneCount ? '个':'--' }}</template>
                 </el-table-column>
                 <el-table-column prop="oneRate" label="占比" align="right">
-                  <template slot-scope="scope">{{ scope.row.oneRate }}%</template>
+                  <template slot-scope="scope">{{ scope.row.oneRate }}{{ scope.row.oneRate ? '%':'--' }}</template>
                 </el-table-column>
               </el-table-column>
               <el-table-column label="二级" align="right">
                 <el-table-column prop="twoCount" label="数量" align="right">
-                  <template slot-scope="scope">{{ scope.row.twoCount }}个</template>
+                  <template slot-scope="scope">{{ scope.row.twoCount }}{{ scope.row.twoCount ? '个':'--' }}</template>
                 </el-table-column>
                 <el-table-column prop="twoRate" label="占比" align="right">
-                  <template slot-scope="scope">{{ scope.row.twoRate }}%</template>
+                  <template slot-scope="scope">{{ scope.row.twoRate }}{{ scope.row.twoRate ? '%':'--' }}</template>
                 </el-table-column>
               </el-table-column>
               <el-table-column label="三级" align="right">
                 <el-table-column prop="threeCount" label="数量" align="right">
-                  <template slot-scope="scope">{{ scope.row.threeCount }}个</template>
+                  <template slot-scope="scope">{{ scope.row.threeCount }}{{ scope.row.threeCount ? '个':'--' }}</template>
                 </el-table-column>
                 <el-table-column prop="threeRate" label="占比" align="right">
-                  <template slot-scope="scope">{{ scope.row.threeRate }}%</template>
+                  <template slot-scope="scope">{{ scope.row.threeRate }}{{ scope.row.threeRate ? '%':'--' }}</template>
                 </el-table-column>
               </el-table-column>
             </el-table>

dsk-operate-ui/src/views/market/detail.vue

 <template>
-  <div>
-    <div :style="{'minHeight':minHeight+'px'}">
-      <div :style="{'height':navigation.totalHeight+'px'}"></div>
   <div class="iframe" v-loading="loading">
-        <iframe id="companyIframe" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" width="100%" :style="{height:iframeHight+'px'}" :src="src" />
-      </div>
-    </div>
+    <iframe id="companyIframe" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" width="100%" :src="src" />
   </div>
 </template>
 
@@ -14,7 +9,7 @@
   import { steerScroll } from '@/assets/js/jskplug';
   import { dskAccessToken } from '@/api/common';
   export default {
-    name: 'Detail',
+    name: 'GzscDetail',
     data() {
       return {
         currentUrl:'',
@@ -35,7 +30,6 @@
 
     },
     created() {
-      console.log("11111")
       if(window.location.host === 'http://szh.jiansheku.com' || window.location.host === 'szh.jiansheku.com'){
         this.domain='https://plug.jiansheku.com'
       }else {
@@ -48,11 +42,11 @@
       }
     },
     mounted() {
-      this.setInitHeight()  //设置初始相关高度
+      // this.setInitHeight()  //设置初始相关高度
       this.iframeLoading() // 判断iframe页面是否加载完成-当前页控制
-      steerScroll('companyIframe', this.navigation, this.footHeight, true, '', this) // 监听滚动（iframe的id、页面排除iframe后页面剩下高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]]）
+      // steerScroll('companyIframe', this.navigation, this.footHeight, true, '', this) // 监听滚动（iframe的id、页面排除iframe后页面剩下高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]]）
       //控制页面内容最低高度
-      this.setMainHeight()
+      // this.setMainHeight()
     },
     beforeDestroy() {
       clearInterval(this.iframeTimer) // -当前页控制
@@ -69,17 +63,18 @@
         const iframeHeight = document.getElementById('companyIframe').clientHeight
         let number = 0
         this.iframeTimer = setInterval(() => {
-          number = number + 1
+          number = number + 1000
           if (document.getElementById('companyIframe').clientHeight !== iframeHeight || number === 5000) {
             this.loading = false
             clearInterval(this.iframeTimer)
           }
-        })
+        },1000)
       },
       // 获取accessToken
       async getAccesstoken(init){
         dskAccessToken().then(res => {
           if (res.code == 200) {
+            // this.loading = true
             this.timelongs = res.data.expire;
             this.ak = res.data.accessToken;
             if(init){ //首次加载iframe地址
@@ -133,10 +128,15 @@
   }
 </script>
 <style lang="scss" scoped>
-  .iframe{
-    background: #fafafa;
+  .iframe {
+    width: 100%;
+    padding: 16px 24px;
+    padding-right: 15px;
+    box-sizing: border-box;
+
+    #companyIframe {
+      width: 100%;
+      height: 100%;
     }
-  #companyIframe{
-    min-height: 500px;
   }
 </style>

dsk-operate-ui/src/views/market/index.vue

 <template>
   <div v-loading="loading" class="market-container">
-    <!-- <iframe id="companyIframe" class="market-iframe" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" width="100%" :style="{ height: iframeHight + 'px' }"
-      :src="src" /> -->
     <iframe id="companyIframe" class="market-iframe" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" width="100%" :src="src" />
 
     <transition name="fade" mode="out-in" appear>
@@ -24,7 +22,7 @@ export default {
       loading: false, // 是否加载完成-当前页控制
       iframeTimer: '',  // 是否加载中定时器-当前页控制
       footHeight: 0,  //底部高度，若为0（页面内部嵌套或者没有底部板块）
-      iframeHight: window.innerHeight, // iframe高度-当前页控制
+      iframeHight: `${window.innerHeight}px`, // iframe高度-当前页控制
       navigation: { isFixed: true, fixedHeight: 56, totalHeight: 68 },  // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
       src: '',  //iframe嵌套页面地址
       domain: 'https://plug.jiansheku.com', // 插件地址
@@ -34,6 +32,7 @@ export default {
       timelongs: 7200,//刷新token时间
       tokentimer: null,
       showMaxPageTip: false,
+      iframeIns : null,
     };
   },
   created() {
@@ -41,22 +40,34 @@ export default {
       this.domain = 'https://plug.jiansheku.com';
     } else {
       this.domain='https://pre-plug.jiansheku.com'
-      // this.domain='http://192.168.60.8:3400'
+      // this.domain = 'http://192.168.60.104:3400';
     }
     this.gettokens();
+    this.iframeObserver();
     window.addEventListener("message", this.pagecapListener, { passive: true });
   },
   mounted() {
-    // this.iframeLoading(); // 判断iframe页面是否加载完成-当前页控制
+    this.iframeLoading(); // 判断iframe页面是否加载完成-当前页控制
     // steerScroll('companyIframe', this.navigation, this.footHeight, true); // iframeId: iframe的id；navigation:页面排除iframe后剩下的顶部高度；footHeight: 页面排除iframe后剩下的底部高度；state:监听or移除监听；parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例（可忽略）
+    console.log(document.querySelector(".market-iframe").contentWindow.document.documentElement.scrollHeight);
   },
   beforeDestroy() {
     clearInterval(this.iframeTimer); // -当前页控制
     steerScroll('companyIframe', this.navigation, this.footHeight); // iframeId: iframe的id；navigation:页面排除iframe后剩下的顶部高度；footHeight: 页面排除iframe后剩下的底部高度；state:监听or移除监听；parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例（可忽略）
     clearInterval(this.tokentimer);
     window.removeEventListener("message", this.pagecapListener, { passive: true });
+    // 移除layout样式
+    this.iframeIns.contentWindow.postMessage("",{})
   },
   methods: {
+    async iframeObserver() {
+      try {
+        await this.$nextTick();
+        this.iframeIns = document.querySelector(".market-iframe");
+      } catch (error) {
+        console.log(error);
+      }
+    },
     // 列表翻页上限
     pagecapListener(e) {
       const { origin, data } = e;