改bug

MrShi

2 天以前 ffba2c405154eb6de9be00d9b5632e8a33ffc366

 admin/src/components/business/OperaHiddenDangerWindow.vue

@@ -10,7 +10,7 @@
        <div class="header">
          <div class="left">
            <div class="h1">隐患提报</div>
            <div class="time">提报时间：{{model.createDate}}</div>
            <div class="time">提报时间：{{model.submitTime}}</div>
          </div>
          <div class="right" v-if="model.status==0">待处理</div>
          <div class="right"  style="background:#53b76f " v-if="model.status==1">已处理</div>
@@ -43,7 +43,6 @@
                  <video
                      v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
                      ref="videoRef"
                      autoplay
                      controls
                      preload="auto"
                      style="width: 80px;height: 80px;object-fit: contain;"
@@ -128,7 +127,7 @@
                </div>
                <div class="line">
                  <div class="company">
                    {{ item.createUserName }} {{ item.companyName }}
                    {{ item.createUserName }}
                    <div style="display: inline" v-if="index == logList.length-1">
                      （<span class="status-green" v-if="model.status==1">已处理</span>
                      <span class="status-blue" v-if="model.status==0">待处理</span>
@@ -162,9 +161,9 @@
          <el-select v-model="transForm.memberId" style="width: 300px"  filterable clearable placeholder="请选择转交安全员">
            <el-option
                v-for="item in memberList"
                :key="item.id"
                :label="item.name"
                :value="item.id">
                :key="item.memberId"
                :label="item.companyName ? `${item.realname}-${item.companyName}` : item.realname"
                :value="item.memberId">
            </el-option>
          </el-select>
        </el-form-item>
@@ -267,6 +266,7 @@
import dayjs from 'dayjs'
import { memberList } from '@/api/business/hiddenDangerParam'
import { mapState } from 'vuex'
import {findAllList as userList} from "@/api/system/user";
export default {
  components: { GlobalWindow, upload },
  extends: BaseOpera,
@@ -540,9 +540,13 @@
      this.loadMemberList()
    },
    loadMemberList () {
      memberList({}).then(res => {
      userList({ queryParam: this.filterText, querySpecial: 1, type: 2, companyType: 1, workStatus: 0 })
        .then(res => {
          this.memberList = res || []
        })
      /*memberList({}).then(res => {
        this.memberList = res
      })
      })*/
    },
    reject () { },
    handleAvatarSuccess () { },
@@ -552,6 +556,7 @@
</script>

<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
.side_title{
  font-weight: 600;
  font-size: 18px;
@@ -616,6 +621,7 @@

          .value {
            color: #111111;
            flex: 1;
          }
        }
      }
@@ -748,7 +754,7 @@
                font-size: 13px;
                color: #888888;
                .status {
                  color: #00ba67;
                  color: $primaryColor;
                }
              }
            }