浏览代码

提交修改

cl 1 年之前
父节点
当前提交
b375b7ee53

+ 0 - 4
.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run lint:lint-staged

+ 2 - 0
src/views/historyData/regimen/index.vue

@@ -276,6 +276,7 @@
           // max: max1,
           // interval: (max1 - min1) / 2,
           // splitNumber: 2,
+          boundaryGap:[0.1,0.1],
           axisLabel: {
             //y轴文字的配置
             textStyle: {
@@ -308,6 +309,7 @@
           // interval: (max2 - min2) / 2,
           // max: max2,
           // splitNumber: 2,
+          boundaryGap:[0.1,0.1],
           axisLabel: {
             //y轴文字的配置
             textStyle: {

+ 4 - 0
src/views/prediction/artificial/flood.vue

@@ -2189,6 +2189,10 @@ onMounted(() => {
 <style scoped lang="less">
 .main {
   height: 100%;
+  ::v-deep(.ant-table-tbody > tr > td){
+    padding-top: 13px;
+    padding-bottom: 13px;
+  }
 }
 
 .content-box {

+ 4 - 0
src/views/prediction/work/flood.vue

@@ -2107,6 +2107,10 @@ onMounted(() => {
 <style scoped lang="less">
 .main {
   height: 100%;
+  ::v-deep(.ant-table-tbody > tr > td){
+    padding-top: 13px;
+    padding-bottom: 13px;
+  }
 }
 
 .content-box {

+ 4 - 4
src/views/programme/honghao.vue

@@ -40,7 +40,7 @@
             <Authority value="api:sw:hhgl:add">
               <a-button type="primary" @click="handleCreate">新增</a-button>
             </Authority>
-            <Authority value="api:sw:hhgl:allDdd">
+            <!-- <Authority value="api:sw:hhgl:allDdd">
               <Popconfirm
                 title="您确定要批量删除数据"
                 ok-text="确定"
@@ -51,7 +51,7 @@
                   批量删除
                 </a-button>
               </Popconfirm>
-            </Authority>
+            </Authority> -->
             <Authority>
               <a-button type="primary" @click="exportDataFn">导出</a-button>
             </Authority>
@@ -338,8 +338,8 @@ const [
 });
 // 判断表格数据是否选中
 const hasSelected = computed(() => {
-  const rowSelection = getRowSelection();
-  return rowSelection.selectedRowKeys?.length;
+  // const rowSelection = getRowSelection();
+  // return rowSelection.selectedRowKeys?.length;
 });
 function submitFunc() {
   let arr = [];

+ 7 - 2
src/views/realTime/weather/components/sameAs.vue

@@ -144,8 +144,13 @@ function processingData(table_head) {
       element.dataIndex = key + 'Data';
       element.ellipsis = true;
       element.resizable = true;
-      if (element.title == '时间') {
-        element.width = 200;
+      // element.width = 200
+      // element.width = element.title.length*10;
+      // if (element.title == '时间') {
+      //   element.width = 170;
+      // }
+      if (element.title != '时间' && element.title != '序号' && element.title != '测站' && element.title != '测站分区') {
+        element.width = element.title.length*20;
       }
     }
   });

+ 5 - 2
src/views/realTime/weather/components/standard.vue

@@ -175,8 +175,11 @@
         element.key = key + 'Data';
         element.dataIndex = key + 'Data';
         element.ellipsis = true;
-        if (element.title == '时间') {
-          element.width = 200;
+        // if (element.title == '时间') {
+        //   element.width = 200;
+        // }
+        if (element.title != '时间' && element.title != '序号' && element.title != '测站' && element.title != '测站分区') {
+          element.width = element.title.length*15;
         }
       }
     });