소스 검색

修改报表推送滑动条

chauncey 1 년 전
부모
커밋
6016492e71

+ 34 - 29
src/views/message/reportmessage/ReportOperation.vue

@@ -3,9 +3,7 @@
   <div class="page">
     <div class="top">
       <div class="topLeft" @click="clickBack">
-        <img src="./img/rollback.png" style="margin-right: 8px"/><span
-          >返回</span
-        >
+        <img src="./img/rollback.png" style="margin-right: 8px" /><span>返回</span>
       </div>
       <div class="topRight">
         <span v-if="pageType === 1">新建报表配置</span>
@@ -140,17 +138,17 @@
           <el-form-item label="操作人:">
             <el-input style="width: 425px" disabled :placeholder="operater" />
           </el-form-item>
-          <div class="two-btns">
-            <el-button
-              type="primary"
-              @click="submitForm(ruleFormRef)"
-              :disabled="disableType.contentDisable"
-            >
-              确定
-            </el-button>
-            <el-button @click="clickBack">取消</el-button>
-          </div>
         </el-form>
+        <div class="two-btns">
+          <el-button
+            type="primary"
+            @click="submitForm(ruleFormRef)"
+            :disabled="disableType.contentDisable"
+          >
+            确定
+          </el-button>
+          <el-button @click="clickBack">取消</el-button>
+        </div>
       </div>
       <div class="right">
         <TemplateExample :form="form" :disableType="disableType"></TemplateExample>
@@ -204,6 +202,7 @@ const statisticType = ref<number>(
 let queryType = { type: reportType.value, statisticType: statisticType.value };
 
 const form = reactive<reportMessage>({
+  configIdList: null,
   type: 0,
   statisticType: 0,
   monthAndDayList: ['1', '1'],
@@ -232,22 +231,22 @@ const rules = reactive({
   // customUserList: [{ required: true, message: '请选择推送人员', trigger: 'change, blur' }],
 });
 
-  // const form = reactive<reportMessage>({
-  //   configIdList: null,
-  //   type: 0,
-  //   statisticType: 0,
-  //   monthAndDayList: ['1', '1'],
-  //   dayOfWeek: 1,
-  //   monthList: [''],
-  //   dayOfMonthList: ['1'],
-  //   pushTimeList: ['09:00:00'],
-  //   pushChannel: [],
-  //   userGroupList: [],
-  //   designatedUserList: [],
-  //   recipientType: undefined,
-  //   customPushConfigList: [],
-  //   customUserList: []
-  // });
+// const form = reactive<reportMessage>({
+//   configIdList: null,
+//   type: 0,
+//   statisticType: 0,
+//   monthAndDayList: ['1', '1'],
+//   dayOfWeek: 1,
+//   monthList: [''],
+//   dayOfMonthList: ['1'],
+//   pushTimeList: ['09:00:00'],
+//   pushChannel: [],
+//   userGroupList: [],
+//   designatedUserList: [],
+//   recipientType: undefined,
+//   customPushConfigList: [],
+//   customUserList: []
+// });
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   await formEl.validate((valid, fields) => {
@@ -358,11 +357,17 @@ onBeforeMount(() => {
     display: flex;
     height: calc(100vh - 130px);
     .left {
+      display: flex;
+      flex-direction: column;
       position: relative;
       padding: 20px 0 0 32px;
       width: 669px;
       border-right: 1px solid rgba(0, 0, 0, 0.06);
       overflow-y: auto;
+      .el-form{
+        height: 760px;
+        overflow-y: auto;
+      }
       .two-btns {
         position: absolute;
         right: 33px;

+ 3 - 0
src/views/message/reportmessage/components/Form.vue

@@ -143,4 +143,7 @@ watch(
   position: relative;
   width: 100%;
 }
+::v-deep .el-dialog__body{
+  height: 600px;
+}
 </style>

+ 5 - 4
src/views/message/reportmessage/components/LogForm.vue

@@ -75,9 +75,10 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .s-table {
-  .el-table__body-wrapper {
-    overflow-y: auto;
-  }
+.log-form {
+  height: 100%;
+}
+::v-deep .el-table--fit {
+  height: 528px !important;
 }
 </style>