Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

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

@@ -118,8 +118,8 @@
                   自定义
                   <el-date-picker
                     ref="picker"
+                    v-if="datatype ==3"
                     :default-value="defaultValue"
-                    style="position: absolute;opacity: 0;left: -12px;width: 60px;"
                     v-model="pickerValue"
                     type="daterange"
                     range-separator="至"
@@ -507,10 +507,10 @@
       }
       this.datatype=key;
       if(value == '自定义') {
-        this.$refs.picker && this.$refs.picker.length && this.$refs.picker[0].focus()
-        this.$nextTick(() => {
+        // this.$refs.picker && this.$refs.picker.length && this.$refs.picker[0].focus()
+        // this.$nextTick(() => {
           // this.$refs['picker-block'].appendChild(this.$refs.picker[0].popperElm)
-        })
+        // })
       }else {
         this.pickerValue = []
         let timeStr = []
@@ -856,8 +856,8 @@
       .time-label{
         .labels{
           width: 240px;
-          height: 30px;
-          line-height: 30px;
+          height: 32px;
+          line-height: 32px;
           border-radius: 4px;
           >div{
             height: 100%;
@@ -885,7 +885,12 @@
           }
         }
       }
-
+      ::v-deep .el-date-editor{
+        width: 320px;
+        position: absolute;
+        right: 250px;
+        height: 32px;
+      }
 
       ::v-deep .picker-block {
         position: relative;
@@ -896,14 +901,6 @@
           visibility:hidden;
           clear:both;
         }
-
-        .el-picker-panel.el-date-range-picker.el-popper {
-          left: -650px !important;
-        }
-
-        .popper__arrow {
-          left: 30px !important;
-        }
       }
     }
   }

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -98,15 +98,6 @@ export default {
     getYears({}).then(res => {
       this.yearOptions=res.data.reverse();
     })
-    //列表一屏幕显示完整，底部滚动条隐藏
-    const targetTableWrapperEl = document.querySelector('.el-table__body-wrapper')
-    const viewHeight = window.innerHeight || document.documentElement.clientHeight
-    const { bottom } = targetTableWrapperEl.getBoundingClientRect()
-    if (bottom <= viewHeight) {
-      targetTableWrapperEl.style.display = 'initial'
-    } else {
-      targetTableWrapperEl.style.display = 'none'
-    }
   },
   methods: {
     getData(){

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

@@ -156,16 +156,6 @@
       this.querySubmit()
       this.dataRegion()
       this.getYears()
-
-      //列表一屏幕显示完整，底部滚动条隐藏
-      const targetTableWrapperEl = document.querySelector('.el-table__body-wrapper')
-      const viewHeight = window.innerHeight || document.documentElement.clientHeight
-      const { bottom } = targetTableWrapperEl.getBoundingClientRect()
-      if (bottom <= viewHeight) {
-        targetTableWrapperEl.style.display = 'initial'
-      } else {
-        targetTableWrapperEl.style.display = 'none'
-      }
     },
     mounted() {
 

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

@@ -321,7 +321,6 @@
       this.getRangeBidMoney()
       this.getRangeBidFiveYears()
       this.getLowerRateByYear()
-      this.getLowerRangeTenderType()
     },
     beforeDestroy(){
 
@@ -346,6 +345,7 @@
               this.initChart1(list)
             })
           }
+          this.getLowerRangeTenderType()
         })
       },
       getCountBidGroupByProvince(){