解决了必选项和封面问题

yz3456

2024-05-07 e717167307cd29740484741f553e1f7aa3e36dc2

解决了必选项和封面问题

 ruoyi-ui/package.json

@@ -41,7 +41,7 @@
    "clipboard": "2.0.8",
    "core-js": "3.25.3",
    "d3": "^7.8.5",
    "echarts": "5.4.0",
    "echarts": "^5.5.0",
    "element-ui": "2.15.12",
    "file-saver": "2.0.5",
    "fuse.js": "6.4.3",

 ruoyi-ui/src/views/meeting/statistics.vue

@@ -31,19 +31,19 @@

      <el-table :data="tableData" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }"
        :row-class-name="tableRowClassName" :row-key="getRowId">
        <el-table-column label="家庭号" prop="num" sortable align="center">
          <template slot-scope="scope">{{ scope.row.num
        ? scope.row.num : '————' }}</template>
        <el-table-column label="家庭号" prop="familyId" sortable align="center">
          <template slot-scope="scope">{{ scope.row.familyId
        ? scope.row.familyId : '————' }}</template>
        </el-table-column>

        <el-table-column label="使用时间" prop="time" sortable align="center">
          <template slot-scope="scope">{{ scope.row.time
        ? scope.row.time : '————' }}</template>
        <el-table-column label="使用时间" prop="useTime" sortable align="center">
          <template slot-scope="scope">{{ scope.row.useTime
        ? scope.row.useTime : '————' }}</template>
        </el-table-column>

        <el-table-column label="会议室名称" prop="address" sortable align="center">
        <el-table-column label="会议室名称" prop="conferenceRoom" sortable align="center">
          <template slot-scope="scope">{{
        scope.row.address ? scope.row.address : '————' }}</template>
        scope.row.conferenceRoom ? scope.row.conferenceRoom : '————' }}</template>
        </el-table-column>

        <el-table-column label="标题" prop="title" sortable align="center">
@@ -51,14 +51,14 @@
        ? scope.row.title : '————' }}</template>
        </el-table-column>

        <el-table-column label="申请人" prop="applicant" sortable align="center">
        <el-table-column label="申请人" prop="applyPerson" sortable align="center">
          <template slot-scope="scope">{{
        scope.row.applicant ? scope.row.applicant : '————' }}</template>
        scope.row.applyPerson ? scope.row.applyPerson : '————' }}</template>
        </el-table-column>

        <el-table-column label="审批人" prop="approve" sortable align="center">
          <template slot-scope="scope">{{ scope.row.approve ?
        scope.row.approve : '————' }}</template>
        <el-table-column label="审批人" prop="ratifyPerson" sortable align="center">
          <template slot-scope="scope">{{ scope.row.ratifyPerson ?
        scope.row.ratifyPerson : '————' }}</template>
        </el-table-column>

        <el-table-column label="状态" prop="status" sortable align="center">
@@ -69,8 +69,8 @@
        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
            <div class="button-container">
              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
              <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> -->
              <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> -->
              <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">查看详情</el-button>
            </div>
          </template>
@@ -79,12 +79,13 @@
      </el-table>

      <!-- 图表统计 -->
      <el-dialog :title="title2" :visible.sync="open2" width="1500px" append-to-body>
        <div class="p1">
          <h1 style="font-size:21px">每月会议次数统计</h1>
      <el-dialog :title="title2" :visible.sync="open2" width="1500px" @open="open1()" append-to-body>
        <!-- class="p1" -->
        <div class="p1" id="main1">
          <!-- <h1 style="font-size:21px">每月会议次数统计</h1> -->
        </div>
        <div class="p1">
          <h1 style="font-size:21px">会议家庭占比统计</h1>
        <div class="p1" id="main2">
          <!-- <h1 style="font-size:21px">会议家庭占比统计</h1> -->
        </div>
      </el-dialog>
      <!-- 新增数据框 -->
@@ -92,8 +93,8 @@

        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

          <el-form-item label="家庭号" prop="num">
            <el-input v-model="formDat.num" placeholder="请输入会议室名称" clearable :style="{width: '100%'}">
          <el-form-item label="家庭号" prop="familyId">
            <el-input v-model="formDat.familyId" placeholder="请输入会议室名称" clearable :style="{width: '100%'}">
            </el-input>
          </el-form-item>

@@ -108,8 +109,8 @@
            ></el-date-picker>
          </el-form-item>

          <el-form-item label="会议室名称" prop="address">
            <el-input v-model="formDat.address" placeholder="请输入会议室名称" clearable :style="{width: '100%'}">
          <el-form-item label="会议室名称" prop="conferenceRoom">
            <el-input v-model="formDat.conferenceRoom" placeholder="请输入会议室名称" clearable :style="{width: '100%'}">
            </el-input>
          </el-form-item>

@@ -118,13 +119,13 @@
            </el-input>
          </el-form-item>

          <el-form-item label="申请人" prop="applicant">
            <el-input v-model="formDat.applicant" placeholder="请输入申请人" clearable :style="{width: '100%'}">
          <el-form-item label="申请人" prop="applyPerson">
            <el-input v-model="formDat.applyPerson" placeholder="请输入申请人" clearable :style="{width: '100%'}">
            </el-input>
          </el-form-item>

          <el-form-item label="审批人" prop="approve">
            <el-input v-model="formDat.approve" placeholder="请输入审批人" clearable :style="{width: '100%'}">
          <el-form-item label="审批人" prop="ratifyPerson">
            <el-input v-model="formDat.ratifyPerson" placeholder="请输入审批人" clearable :style="{width: '100%'}">
            </el-input>
          </el-form-item>

@@ -149,7 +150,9 @@
  </template>

  <script>
import * as echarts from 'echarts';
 export default {
  created() {},
   data() {
     return {
       // 显示搜索条件
@@ -159,18 +162,18 @@
       title: "",
       tableData: [{
         id: 1,
          num: '1',
          familyId: '1',
           title: '1',
           name: 'asasd',
           address: 'asdadsdasd',
           conferenceRoom: 'asdadsdasd',
           status: '结案'
         },
         {
                    id: 2,
          num: '2',
          familyId: '2',
           title: '2',
           name: 'qweqwqwe',
           address: 'qweqweqwe',
           conferenceRoom: 'qweqweqwe',
           status: '未结案'

         }
@@ -180,19 +183,19 @@
         happenTime: undefined,
         endTime: undefined,
         meetingTitle: undefined,
         address: undefined,
         approve: undefined,
         applicant: undefined,
         conferenceRoom: undefined,
         ratifyPerson: undefined,
         applyPerson: undefined,
         url: "",
         status: undefined,
         num: undefined
         familyId: undefined
       },
     queryParams: {
       pageNum: 1,
       pageSize: 10,
       address:undefined,
       conferenceRoom:undefined,
       applyOrganization:undefined,
       applicant:undefined,
       applyPerson:undefined,
       happenTime:undefined
     },
     dateRange: [],
@@ -219,6 +222,52 @@
     }
   },
   methods: {
     open1(){
       this.$nextTick(() => {
       //  执行echarts方法
         this.initEcharts()
       })
    },
    initEcharts() {
            var echarts = require('echarts');

            const myChart1 = this.$echarts.init(document.getElementById('main1'));
             const option1 = {
                title: {
                    text: 'ECharts 入门示例'
                },
                tooltip: {},
                xAxis: {
                    data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
                },
                yAxis: {},
                series: [{
                    name: '销量',
                    type: 'bar',
                    data: [5, 20, 36, 10, 10, 20]
                }]
            };

            const myChart2 = this.$echarts.init(document.getElementById('main2'));
             const option2 = {
                title: {
                    text: 'ECharts 入门示例'
                },
                tooltip: {},
                xAxis: {
                    data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
                },
                yAxis: {},
                series: [{
                    name: '销量',
                    type: 'bar',
                    data: [5, 20, 36, 10, 10, 20]
                }]
            };

            myChart1.setOption(option1)
            myChart2.setOption(option2)
          },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -345,7 +394,7 @@
    width: 700px;
    height: 700px;
    display: inline-block;
    background-color: aqua;
    /* background-color: aqua; */
    margin-right: 30px;
  }
  </style>

 ruoyi-ui/src/views/self/show.vue

@@ -1216,6 +1216,74 @@
          trigger: 'blur'
        }],

        relation: [{
          required: true,
          message: '请输入关系',
          trigger: 'blur'
        }],
        otherName: [{
          required: true,
          message: '请输入姓名',
          trigger: 'blur'
        }],
        otherUnit: [{
          required: true,
          message: '请输入单位',
          trigger: 'blur'
        }],
        otherPosition: [{
          required: true,
          message: '请输入职务',
          trigger: 'blur'
        }],
        otherPolitical: [{
          required: true,
          message: '请输入政治面貌',
          trigger: 'blur'
        }],

        cerName: [{
          required: true,
          message: '请输入证件名称',
          trigger: 'blur'
        }],
        type: [{
          required: true,
          message: '请输入证件类型',
          trigger: 'blur'
        }],
        ownStatus: [{
          required: true,
          message: '请输入持有情况',
          trigger: 'blur'
        }],
        idNo: [{
          required: true,
          message: '请输入证件号码',
          trigger: 'blur'
        }],

        startTime: [{
          required: true,
          message: '请输入开始时间',
          trigger: 'blur'
        }],
        endTime: [{
          required: true,
          message: '请输入结束时间',
          trigger: 'blur'
        }],
        destination: [{
          required: true,
          message: '请输入所到地区',
          trigger: 'blur'
        }],
        cause: [{
          required: true,
          message: '请输入事由',
          trigger: 'blur'
        }]

      },
      selectedOption:'',
      typeOptions:[],