yz3456
2024-05-30 a27ffbdd8353c381312839a0c00ae7444c7a381c
修改完bug
9个文件已修改
134 ■■■■ 已修改文件
ruoyi-ui/src/router/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/healthYear.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/honorInfo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/approve.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/meetingInfo.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js
@@ -681,7 +681,7 @@
        path: 'healthYear',
        component: () => import('@/views/healthy/healthYear'),
        name: 'healthYear',
        meta: { title: '年度健康报告'}
        meta: { title: '现状健康情况'}
      }
    ]
  },
ruoyi-ui/src/views/clean/index.vue
@@ -312,10 +312,49 @@
<!--
            <el-button type="primary">点击上传</el-button>
            <div v-if="uploading" class="upload-status">正在上传...</div> -->
            <template #tip>
            <!-- <template #tip>
              <div class="el-upload__tip">
              </div>
            </template>
          </el-upload> -->
          <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <!-- 添加video元素用于显示视频 -->
              <video
                v-if="file.url.includes('.mp4')"
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                style="width: 147px; height: 147px"
                fit="cover"
              ></video>
              <img v-else
                   class="el-upload-list__item-thumbnail"
                   src="../../assets/images/deviceLis.png"
                   alt=""
                   style="width: 100%; height: 100%"
                   fit="cover"></img>
              <span class="el-upload-list__item-actions">
                   <span class="el-upload-list__item-name">{{ file.name }}</span>
                        <!-- <span
                          class="el-upload-list__item-preview"
                          @click="handleFileCardPreview(file)"
                        >
                          <i class="el-icon-zoom-in"></i>
                        </span> -->
                        <span
                          class="el-upload-list__item-delete"
                          @click="handleRemoveFile(file)"
                        >
                          <i class="el-icon-delete"></i>
                        </span>
                  </span>
            </div>
          </el-upload>
     <el-button
                  style="margin-left: 10px"
ruoyi-ui/src/views/contacts/index.vue
@@ -368,10 +368,49 @@
          list-type="picture-card"
        >
          <template #tip>
          <!-- <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload> -->
        <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <!-- 添加video元素用于显示视频 -->
            <video
              v-if="file.url.includes('.mp4')"
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              style="width: 147px; height: 147px"
              fit="cover"
            ></video>
            <img v-else
                 class="el-upload-list__item-thumbnail"
                 src="../../assets/images/deviceLis.png"
                 alt=""
                 style="width: 100%; height: 100%"
                 fit="cover"></img>
            <span class="el-upload-list__item-actions">
                 <span class="el-upload-list__item-name">{{ file.name }}</span>
                      <!-- <span
                        class="el-upload-list__item-preview"
                        @click="handleFileCardPreview(file)"
                      >
                        <i class="el-icon-zoom-in"></i>
                      </span> -->
                      <span
                        class="el-upload-list__item-delete"
                        @click="handleRemoveFile(file)"
                      >
                        <i class="el-icon-delete"></i>
                      </span>
                </span>
          </div>
        </el-upload>
     <el-button
                  style="margin-left: 10px"
ruoyi-ui/src/views/healthy/healthYear.vue
@@ -1040,6 +1040,7 @@
  created() {
    this.getList()
    this.$route.meta.title = "现状健康情况";
    this.$route.meta.title = "现状健康情况";
  },
  methods: {
ruoyi-ui/src/views/honor/honorInfo.vue
@@ -432,6 +432,7 @@
      // this.getCateInfor()
    }
    console.log(this.fileListOther,'this.fileListOtherthis.fileListOtherthis.fileListOther')
  },
  mounted() {},
ruoyi-ui/src/views/meeting/approve.vue
@@ -176,21 +176,21 @@
        meetingList: [],
        formDat:{
          id: undefined,
          title: undefined,
          place: undefined,
          conPeople: undefined,
          partPeople: undefined,
          applyPerson: undefined,
          applyApart: undefined,
          startTime: undefined,
          endTime: undefined,
          happenStartTime: undefined,
          happenEndTime: undefined,
          isPlacebrand: undefined,
          connPerson: undefined,
          connPhone: undefined,
          // title: undefined,
          // place: undefined,
          // conPeople: undefined,
          // partPeople: undefined,
          // applyPerson: undefined,
          // applyApart: undefined,
          // startTime: undefined,
          // endTime: undefined,
          // happenStartTime: undefined,
          // happenEndTime: undefined,
          // isPlacebrand: undefined,
          // connPerson: undefined,
          // connPhone: undefined,
          statu: undefined,
          createTime: undefined
          // createTime: undefined
        },
      queryParams: {
        pageNum: 1,
@@ -227,6 +227,7 @@
  },
  methods: {
    agree(row){
      // console.log(row,'rowrowrow')
      this.formDat1.id = row.id
      this.formDat1.statu = 1
      // this.$refs['elForm'].validate(valid => {
@@ -271,7 +272,7 @@
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      listMeeting2(this.queryParams).then(response => {
          this.meetingList = response.data.data;
          // console.log(this.meetingList,'meetingmeeting')
          this.total = response.data.total;
          this.loading = false;
        }
ruoyi-ui/src/views/meeting/index.vue
@@ -419,7 +419,7 @@
        isPlacebrand: [{
          required: true,
          message: '请选择是否摆放水牌',
          trigger: 'blur'
          trigger: 'change'
        }],
        connPerson: [{
          required: true,
ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -130,6 +130,13 @@
                </el-select>
              </el-form-item>
            </el-cow>
            <!-- <el-cow>
              <el-form-item label="状态" prop="statu" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-if="!dsb" v-model="formData.connPhone" placeholder="待审批" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                <el-input v-if="dsb" v-model="formData.connPhone" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
              </el-form-item>
            </el-cow> -->
          </el-row>
        </el-container>
@@ -255,9 +262,9 @@
            trigger: 'blur'
          }],
          statu: [{
            // required: true,
            required: true,
            message: '请选择状态',
            trigger: 'blur'
            trigger: 'change'
          }],
        },
ruoyi-ui/src/views/travel/index.vue
@@ -120,15 +120,15 @@
                    alt=""
                    style="width: 35px; height: 35px;"
                    fit="cover"
                    v-if="scope.row.url"
                    v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                  >
                  <img
                    v-else
                    class="el-upload-list__item-thumbnail"
                    src="../../assets/images/deviceA.png"
                    alt=""
                    style="width: 35px; height: 35px;"
                    fit="cover"
                    v-if="!scope.row.url"
                  >
                </template>
              </el-table-column>