Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-03-26 71e8709a556ec8782e4da4bcae52fa050ef2066f

Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

 ruoyi-ui/src/assets/images/²âÊÔ.mp4

Binary files differ

 ruoyi-ui/src/router/index.js

@@ -170,6 +170,15 @@
    // permissions: [],
    hidden: true,
    permissions: ['meetingModel:approve:list'],
    children: [
      {
        // path: 'meetingInfo/',
        path: 'approveInfo/:id(\\d+)',
        component: () => import('@/views/meeting/approveInfo'),
        name: 'approveInfo',
        meta: { title: '审批详情',activeMenu: '/meeting/approveInfo'}
      }
    ]
  },
  //会议统计
  {
@@ -186,6 +195,15 @@
    // permissions: [],
    hidden: true,
    permissions: ['meetingModel:webcast:list'],
    children: [
      {
        path: 'webcastInfo/',
        // path: 'webcastInfo/:id(\\d+)',
        component: () => import('@/views/meeting/webcastInfo'),
        name: 'webcastInfo',
        meta: { title: '直播详情',activeMenu: '/meeting/webcastInfo'}
      }
    ]
  },
  //直播回放
  {

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

@@ -10,12 +10,6 @@
      <span>会议审批</span>
      <div class="button-container"></div>
      <div style="display: flex; align-items: center;">
<!--        <el-button size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
          <div class="form"><el-icon style="padding-right:100px;"></el-icon>
            <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">新申请</span>
          </div>
        </el-button> -->
      </div>
    </h1>

@@ -100,9 +94,10 @@
      <el-table-column label="操作" align="center" width="250" 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">同意</el-button>
            <el-button size="mini" type="text" icon="el-icon-delete">拒绝</el-button>
              <el-button size="mini" type="text" icon="el-icon-d-arrow-right">查看详情</el-button>
            <el-button v-show="agree" size="mini" type="text" @click="agree(scope.row)">同意</el-button>
            <el-button v-show="agree" size="mini" type="text" icon="el-icon-delete">拒绝</el-button>
            <el-button v-show="agree1" size="mini" type="text" icon="el-icon-delete">重新审批</el-button>
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">查看详情</el-button>
          </div>
        </template>
      </el-table-column>
@@ -131,13 +126,17 @@
        people: undefined,
        address: undefined,
        title: undefined,
        remark: undefined
        remark: undefined,
        status: undefined,
        agree1: false,
        agree: true,
      }
    }
  },
  methods: {

    tableRowClassName({ row, rowIndex }) {

      if (rowIndex % 2 == 0) {
        return "statistics-warning-row1";
      } else {
@@ -148,6 +147,27 @@
      return row.id
    },

    agree(row){
    this.agree1 = true
    this.agree = false
      row.status = '同意'


      alert(row.status)
    },
    // æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯
    handleCheck(row){
      const id = row.id;
      let jd = true

      this.$router.push({
        path:"/meeting/approve/approveInfo/" + id,
        query:{
          detail:jd
        }
      });
    },

  }
}
</script>

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

New file
@@ -0,0 +1,330 @@
<template>
  <div class="app-container" id="printable-content">
    <div class="form-header mt">
      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
        <span>审批详情</span>
      </h1>
    </div>
    <div style="padding-left:15px">
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" label-width="160px">

        <el-container>

          <el-row :span="12">

            <el-cow>
              <el-form-item label="会议标题" prop="meetingTitle" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.meetingTitle" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="开始时间" prop="happenTime" label-width="80px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-date-picker v-model="formDat.happenTime" type="datetime" placeholder="选择日期时间" align="right"
                  :picker-options="pickerOptions" :style="{width: '100%'}">
                </el-date-picker>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="结束时间" prop="endTime" label-width="80px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="选择日期时间" align="right"
                  :picker-options="pickerOptions" :style="{width: '100%'}">
                </el-date-picker>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="会议地点" prop="address" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.address" placeholder="请输入会议地点" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>

            <!-- <el-cow>
              <el-form-item label="会议室代码" prop="meetingID" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.meetingID" placeholder="请输入会议室代码" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow> -->
            <el-cow>
              <el-form-item label="可容纳人数" prop="capacity" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.capacity" placeholder="请输入可容纳人数" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="参与人数" prop="attendance" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.attendance" placeholder="请输入参与人数" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="申请人" prop="applicant" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.applicant" placeholder="请输入申请人" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="家庭或部门" prop="familyName" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.familyName" placeholder="请输入申请家庭或部门" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="是否拜访水牌" prop="status" label-width="120px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formDat.status" placeholder="请选择 " clearable :style="{width: '100%'}"
                  :disabled="dsb">
                  <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label"
                    :value="item.value"></el-option>
                </el-select>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="联系人" prop="name" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.name" placeholder="请输入联系人" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="联系电话" prop="phone" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.phone" placeholder="请输入联系电话" clearable :style="{width: '100%'}"></el-input>
              </el-form-item>
            </el-cow>
          </el-row>
        </el-container>

        <h4 class="form-header"> </h4>
        <el-form-item size="large">
          <el-button type="primary" @click="submitForm" :disabled="dsb">同意</el-button>
          <el-button type="primary" @click="submitForm" :disabled="dsb">拒绝</el-button>
        </el-form-item>
      </el-form>
    </div>


  </div>
</template>

<script>
  export default {
    components: {},
    props: [],
    data() {
      return {
        cdi: "个人财产详细信息",
        udi: "个人财产信息详情",
        // æ•°æ®èŒƒå›´é€‰é¡¹
        fot: ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.gif', '.pcx', '.tga', '.exif', '.fpx',
          '.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.aw', '.WMF', '.webp', '.apng'
        ],

        fileList: [],
        fileList1: [],
        uploadFileList: [],
        uploadFileList1: [],
        fileListOther: [],
        dsb: false,
        btn: false,
        uploading: false,

        formDat: {
          id: undefined,
          happenTime: undefined,
          endTime: undefined,
          timeSpan: undefined,
          meetingTitle: undefined,
          address: undefined,
          meetingID: undefined,
          capacity: undefined,
          attendance: undefined,
          applicant: undefined,
          familyName: undefined,
          name: undefined,
          phone: undefined,
          url: "",
          status: undefined


        },
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
        rules: {
          meetingTitle: [{
            required: true,
            message: '请输入会议标题',
            trigger: 'blur'
          }],
          happenTime: [{
            required: true,
            message: '请选择开始时间',
            trigger: 'blur'
          }],
          endTime: [{
            required: true,
            message: '请选择结束时间',
            trigger: 'blur'
          }],
          status: [{
            required: true,
            message: '请输入是否注销',
            trigger: 'blur'
          }],
          isChange: [{
            required: true,
            message: '请输入变更/注销',
            trigger: 'blur'
          }],
          price: [{
            required: true,
            message: '请输入金额',
            trigger: 'blur'
          }],
          incomeName: [{
            required: true,
            message: '请输入收支类别',
            trigger: 'blur'
          }],
          timeLimit: [{
            required: true,
            message: '请输入期限',
            trigger: 'blur'
          }],
          location: [{
            required: true,
            message: '请输入存放位置',
            trigger: 'blur'
          }],
          propertyRight: [{
            required: true,
            message: '请输入实现难度',
            trigger: 'blur'
          }],

          remark: [{
            // required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
        },
        typeOptions: [{
            value: 1,
            label: '是',
          },
          {
            value: 0,
            label: '否',
          }
        ],
        typeOptions1: [{
            value: '变更',
            label: '变更',
          },
          {
            value: '注销',
            label: '注销',
          }
        ],
      }
    },
    created() {
      const id = this.$route.params && this.$route.params.id;
      let jd;
      if (this.$route.query.detail == 'true') {
        jd = this.$route.query.detail
        this.btn = jd
        //    document.title = "修改个人财产详细信息";
        this.$route.meta.title = "审批详情"; //列表的名称
      } else {
        //   document.title = "个人财产详细信息";
        this.$route.meta.title = "审批详情"; //列表的名称
        this.btn = false;
      }

      let _this = this
    },
    mounted() {},
    methods: {
      submitForm() {
        let ul = this.fileList.map(function(elem) {
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
        }).join(",")
        let uls = this.fileListOther.map(function(elem) {
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
        }).join(",")
        this.formDat.url = ul + "," + uls

        this.$refs['elForm'].validate(valid => {
          alert(this.formDat.status)
          if (valid) {
            if (this.formDat.id != undefined) {
              updateSelfEconomy(this.formDat).then(response => {
                this.$modal.msgSuccess("修改成功");
                // this.open = false;
                if (this.formDat.status == 1)
                  this.formDat.status = '是'
                else
                  this.formDat.status = '否'
                this.btn = false
              });
            } else {
              this.$modal.msgSuccess("修改失败");
              if (this.formDat.status == '是')
                this.formDat.status = 1
              else
                this.formDat.status = 0
            }
          }
        })
      },
    }
  }
</script>

<style scoped>
  .app-container {
    background-color: #FEF7FC;
  }

  .mt {
    position: relative;
  }

  .dt {
    display: block;

  }

  .pt {
    right: 10px;
    top: -3px;
    display: block;
    position: absolute;
  }

  .form {
    background: center/11% no-repeat url('../../assets/icons/form.png');
  }

  .hide /deep/ .el-upload--picture-card {
    display: none;
  }

  .form_item {
    font-size: 12px;
    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
    font-weight: 400;
    color: #000000;
  }
</style>

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

@@ -112,13 +112,55 @@


    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">

      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
        <el-form-item label="时间" prop="timeSpan">
          <el-date-picker v-model="formData.timeSpan" type="datetimerange" range-separator="至" start-placeholder="开始日期"
          <el-date-picker v-model="formDat.timeSpan" type="datetimerange" range-separator="至" start-placeholder="开始日期"
            end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="标题" prop="meetingTitle">
          <el-input v-model="formDat.meetingTitle" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="地点" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入会议地点" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="可容纳人数" prop="capacity">
          <el-input v-model="formDat.capacity" placeholder="请输入可容纳人数" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>


        <el-form-item label="参与人数" prop="attendance">
          <el-input v-model="formDat.attendance" placeholder="请输入参与人数" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="申请人" prop="applicant">
          <el-input v-model="formDat.applicant" placeholder="请输入申请人" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="申请家庭或部门" prop="familyName">
          <el-input v-model="formDat.familyName" placeholder="请输入申请家庭或部门" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="是否拜访水牌" prop="status">
          <el-select v-model="formDat.status" placeholder="请选择 " clearable :style="{width: '100%'}"
            :disabled="dsb">
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label"
              :value="item.value"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="联系人" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入联系人" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="联系电话" prop="phone">
          <el-input v-model="formDat.phone" placeholder="请输入联系电话" clearable :style="{width: '100%'}"></el-input>
        </el-form-item>

      </el-form>

        </el-upload>
      </el-form>
@@ -186,8 +228,23 @@
            age: '30'
          },
        ],
        formData:{
        formDat:{
          timeSpan: undefined,
          id: undefined,
          happenTime: undefined,
          endTime: undefined,
          timeSpan: undefined,
          meetingTitle: undefined,
          address: undefined,
          meetingID: undefined,
          capacity: undefined,
          attendance: undefined,
          applicant: undefined,
          familyName: undefined,
          name: undefined,
          phone: undefined,
          url: "",
          status: undefined
        },
        queryParams1: {
          pageNum: 1,
@@ -211,7 +268,7 @@
        // this.reset();
      },
      submitDataScope() {
        console.log(this.formData.timeSpan)
        console.log(this.formDat.timeSpan)
      },

      tableRowClassName({

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

@@ -43,13 +43,13 @@
              </el-form-item>
            </el-cow>

            <el-cow>
            <!-- <el-cow>
              <el-form-item label="会议室代码" prop="meetingID" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formDat.meetingID" placeholder="请输入会议室代码" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow>
            </el-cow> -->
            <el-cow>
              <el-form-item label="可容纳人数" prop="capacity" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">

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

@@ -33,7 +33,7 @@
                <div class="module">
                    <span class="span1">中秋家庭会议</span>
                    <span class="span2">2010-8-26 12:00</span>
                    <el-button class="huifang" type="primary" plain >回放</el-button>
                    <el-button class="huifang" type="primary" plain @click="show">回放</el-button>
                    <div class="tubiao"><i class="el-icon-view">10000</i></div>
                    <p class="author">发起者</p>
                </div>
@@ -42,7 +42,7 @@
                <div class="module">
                    <span class="span1">中秋家庭会议</span>
                    <span class="span2">2010-8-26 12:00</span>
                    <el-button class="huifang" type="primary" plain >回放</el-button>
                    <el-button class="huifang" type="primary" plain @click="show">回放</el-button>
                    <div class="tubiao"><i class="el-icon-view">10000</i></div>
                    <p class="author">发起者</p>
                </div>
@@ -51,7 +51,7 @@
                <div class="module">
                    <span class="span1">中秋家庭会议</span>
                    <span class="span2">2010-8-26 12:00</span>
                    <el-button class="huifang" type="primary" plain >回放</el-button>
                    <el-button class="huifang" type="primary" plain @click="show">回放</el-button>
                    <div class="tubiao"><i class="el-icon-view">10000</i></div>
                    <p class="author">发起者</p>
                </div>
@@ -60,13 +60,32 @@
                <div class="module">
                    <span class="span1">中秋家庭会议</span>
                    <span class="span2">2010-8-26 12:00</span>
                    <el-button class="huifang" type="primary" plain >回放</el-button>
                    <el-button class="huifang" type="primary" plain @click="show">回放</el-button>
                    <div class="tubiao"><i class="el-icon-view">10000</i></div>
                    <p class="author">发起者</p>
                </div>
            </el-col>
        </el-row>
        <!-- </el-form> -->

        <!-- å›žè®¿è§†é¢‘弹窗 -->
          <el-dialog
            :visible.sync="dialogVisible"
            width="50%"
            height="100%"
            :before-close="handleClose"
          >

          <h4>中秋家庭会议</h4>
            <el-divider />
            <video id="video" class="video" controls width="100%%" height="480" >
              <source src="../../assets/images/测试.mp4" type="video/mp4">
            </video>
<!--            <span slot="footer" class="dialog-footer">
              <el-button @click="dialogVisible = false">取 æ¶ˆ</el-button>
            </span> -->
          </el-dialog>

    </div>
</template>
<script>
@@ -75,11 +94,19 @@
        return {
            queryParams1: [],
            vList: [],
            dialogVisible: false,

        }
    },
    methods: {

    show(){
      this.dialogVisible = true
    },
    handleClose(){
      this.dialogVisible = false;
      const video = document.getElementById("video")
      video.pause()
    }
    }
}
</script>
@@ -157,4 +184,7 @@
    bottom: 5px;
    left: 100px;
}
.video{
  object-fit: cover;
}
</style>

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

@@ -38,7 +38,7 @@

    <el-row :gutter="0">
      <el-col :span="4">
        <div class="module">
        <div class="module" @click="toLook">
          <div class="video">
            66666666
          </div>
@@ -231,6 +231,9 @@
      },
      submitDataScope() {
        console.log(this.formDat.timeSpan)
      },
      toLook(){
        this.$router.push('/meeting/webcast/webcastInfo/')
      }

    }
@@ -279,6 +282,7 @@
    /*    margin-left: 5px;
    margin-right: 5px; */
    position: relative;
    cursor: pointer;
  }

  .grid-content {

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

New file
@@ -0,0 +1,233 @@
<template>
  <div class="app-container" id="printable-content">
    <div class="form-header mt">
      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
        <span>直播名字</span>
      </h1>
    </div>

    <el-container class="homeContainer">
      <!-- <el-header>Header</el-header> -->
      <el-container class="chirldContainer">
        <el-aside width="400px">
          <div class="one">1</div>
          <div class="two">2</div>
          <div class="three">3</div>
        </el-aside>

        <el-main>
          <div></div>
        </el-main>
      </el-container>
      <el-footer>Footer</el-footer>
    </el-container>



  </div>
</template>

<script>
  export default {
    components: {},
    props: [],
    data() {
      return {
        // æ•°æ®èŒƒå›´é€‰é¡¹
        fot: ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.gif', '.pcx', '.tga', '.exif', '.fpx',
          '.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.aw', '.WMF', '.webp', '.apng'
        ],

        fileList: [],
        fileList1: [],
        uploadFileList: [],
        uploadFileList1: [],
        fileListOther: [],
        dsb: true,
        btn: false,
        isShow: true,
        uploading: false,

        formDat: {
          id: undefined,
          happenTime: undefined,
          endTime: undefined,
          timeSpan: undefined,
          meetingTitle: undefined,
          address: undefined,
          meetingID: undefined,
          capacity: undefined,
          attendance: undefined,
          applicant: undefined,
          familyName: undefined,
          name: undefined,
          phone: undefined,
          url: "",
          status: undefined


        },
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
        rules: {
          meetingTitle: [{
            required: true,
            message: '请输入会议标题',
            trigger: 'blur'
          }],
          happenTime: [{
            required: true,
            message: '请选择开始时间',
            trigger: 'blur'
          }],
          endTime: [{
            required: true,
            message: '请选择结束时间',
            trigger: 'blur'
          }],
          status: [{
            required: true,
            message: '请输入是否注销',
            trigger: 'blur'
          }],
          isChange: [{
            required: true,
            message: '请输入变更/注销',
            trigger: 'blur'
          }],
          price: [{
            required: true,
            message: '请输入金额',
            trigger: 'blur'
          }],
          incomeName: [{
            required: true,
            message: '请输入收支类别',
            trigger: 'blur'
          }],
          timeLimit: [{
            required: true,
            message: '请输入期限',
            trigger: 'blur'
          }],
          location: [{
            required: true,
            message: '请输入存放位置',
            trigger: 'blur'
          }],
          propertyRight: [{
            required: true,
            message: '请输入实现难度',
            trigger: 'blur'
          }],

          remark: [{
            // required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
        },
        typeOptions: [{
            value: 1,
            label: '是',
          },
          {
            value: 0,
            label: '否',
          }
        ],
        typeOptions1: [{
            value: '变更',
            label: '变更',
          },
          {
            value: '注销',
            label: '注销',
          }
        ],
      }
    },

    mounted() {},
    methods: {

    }
  }
</script>

<style scoped>
  .one,.two,.three{
    background-color: aqua;
    margin-bottom: 20px;
    height: 25%;
  }
  .homeContainer {
    height: 100%;
  }

  .chirldContainer {
    direction: rtl;
  }

  .el-header,
  .el-footer {
    background-color: #B3C0D1;
    color: #333;
    text-align: center;
    line-height: 200px;
  }

  .el-main {
    background-color: #E9EEF3;
    color: #333;
    text-align: center;
    line-height: 400px;
    width: 60%;
  }

  .el-aside {
    /* background-color: #D3DCE6; */
    /* color: #333; */
    text-align: center;
    line-height: 120px;
    flex-direction: column;
  }

  .app-container {
    background-color: #FEF7FC;
    height: 100%;
    width: 100%;
  }

  .mt {
    position: relative;
  }

  .dt {
    display: block;

  }

  .pt {
    right: 10px;
    top: -3px;
    display: block;
    position: absolute;
  }

  .form {
    background: center/11% no-repeat url('../../assets/icons/form.png');
  }

  .hide /deep/ .el-upload--picture-card {
    display: none;
  }

  .form_item {
    font-size: 12px;
    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
    font-weight: 400;
    color: #000000;
  }
</style>

 ruoyi-ui/src/views/pet/index.vue

@@ -322,6 +322,10 @@

    </el-dialog>

    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl"    style="width: 100%; height: 100%" alt="Preview Image" />
    </el-dialog>

  </div>
</template>

@@ -363,13 +367,16 @@
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,

      dialogImageUrl: '',
      dialogVisible: false,
      // æ—¥æœŸèŒƒå›´
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      

      fileList1:[ ],
      fileList2:[ ],
      fileListOther:[ ],
@@ -713,16 +720,24 @@
            addPet(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              // æ¸…空formDat对象的数据
              Object.keys(this.formDat).forEach(key => {
                this.formDat[key] = '';
              });
              for(let i = 0; i <= this.fileList1.length; i++)
              {
                this.handleRemove(this.fileList1[0]);
              }
              for(let i = 0; i < this.fileListOther.length; i++){
                this.handleRemoveFile(this.fileListOther[0]);
              }
              // this.handleRemove(this.fileList[0]);
              // this.handleRemoveFile(this.fileListOther[0]);
              this.getList();
            });
          }
        });
      // æ¸…空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      this.handleRemove(this.fileList[0]);
      this.handleRemoveFile(this.fileListOther[0]);

    },
    requestUpload(params)
    {

 ruoyi-ui/src/views/pet/noteInfo.vue

@@ -272,7 +272,7 @@
        for(let i = 0; i < paths.length; i++)
    {
      if(paths[i]!="") {
    

        let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
    //    alert(pth)
        if (_this.fot.includes(pth) === true)
@@ -291,7 +291,7 @@
          _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
            else
            _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
    		

        }
      }
    //  _this.fileList1 = _this.fileList
@@ -341,7 +341,7 @@
      const Base64 = require('js-base64').Base64

      this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
      let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');      
      let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');



@@ -507,11 +507,11 @@
           let _this = this

           this.uploading = true;
        alert(234)
        // alert(234)
           uploadPic(formData).then(response => {
           _this.uploadFileList1 = []
             _this.formData.url = _this.formData.url+","+response.fileNames
          alert(2346)
          // alert(2346)
               updatenotePet(_this.formData).then(response => {
                 this.$modal.msgSuccess("文档上传成功");
                 // this.open = false;

 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue

@@ -649,6 +649,11 @@
         console.log(this.uploadFileList1)
         let _this = this

    if(this.formData.status=='是')
                  this.formData.status = 1
                  else
                  this.formData.status = 0

         this.uploading = true;
         uploadPic(formData).then(response => {
         _this.uploadFileList1 = []
@@ -656,9 +661,14 @@
             updateSelfEconomy(_this.formData).then(response => {
               this.$modal.msgSuccess("文档上传成功");
               // this.open = false;
          if(this.formData.status=='是')
              this.formData.status = 1
          else
              this.formData.status = 0

             });
           })

          this.uploading = false;
     },
     picUpload()
     {
@@ -711,12 +721,14 @@
                      else
                      _this.formData.status = '否'
           });

         // }
         // else{
         //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

         // }
       });
       this.uploading = false;
     },
      requestUpload(params)
     {