Merge remote-tracking branch 'origin/master'

马宇豪

2023-07-21 a94d46abe031d827c0e3bc49999cc02782ec09b8

 pages/tabBar/examine/examine.vue

@@ -13,8 +13,14 @@
      <view class="contentList">
         <view class="buttonGroup">
            <view style="display: flex;">
               <view  class="buttonAll all"
                  :class="{ 'active': selectedSaleAnalysis === 'all'}" 
                  @click="handleButtonClick({label: 'all',name: '全部'})">
                  全部
               </view>
               <view v-for="(button, index) in buttons" :key="index" class="buttonItem"
                  :class="{ 'active': selectedSaleAnalysis === button.label,
                   'all': button.label === 'all',
                   'red': button.label === 'red',
                   'orange':button.label === 'orange',
                   'yellow':button.label === 'yellow',
@@ -24,7 +30,7 @@
               </view>
            </view>
            <view class="switchBtn">
               <text style="margin-right: 7px;">是否紧临</text>
               <text style="margin-right: 7px;">仅紧临</text>
               <u-switch v-model="checked"  size="20" @change="clickSwitch"></u-switch>
            </view>
         </view>
@@ -39,7 +45,7 @@
                  <view class="content" @click="toDetail(item)">
                     <text>[{{item.colorContent}}]</text>
                     <text>{{item.title}},{{item.content}}</text>
                     <view  style="float: right; width: 80px;margin-top: 3px;">
                     <view  style="float: right; width: 80px;margin-top: -5px;">
                        <u-button v-if="item.buttonContent == '已审核通过'" size="mini" class="buttonCo" style="background-color:rgb(17, 204, 33);color: white">
                           {{item.buttonContent}}
                        </u-button>
@@ -78,35 +84,36 @@
         return {
            data: {
               pageIndex: 1,
               pageSize: 1000,
               pageSize: 10,
               searchParams: {
                  emergType: 1,//1-紧急；2-常规
                  warningLevel: 1,//1-红色预警；2-橙色预警；3-黄色预警；4-蓝色预警
                  reviewStatus: 0//1：未审核，2：已审核，3：审核已驳回	
                  emergType: null,//1-紧急；2-常规
                  warningLevel: null,//1-红色预警；2-橙色预警；3-黄色预警；4-蓝色预警
                  reviewStatus: null//1：未审核，2：已审核，3：审核已驳回	
               }
            },
            page: 'pages/tabBar/examine/examine',
            checked: true,
            checked: false,
            isReadOnly: false,
            statusBarHeight: 0,
            buttons: [{
               label: 'red',
               name: '红'
            },
            {
               label: 'orange',
               name: '橙'
            },
            {
               label: 'yellow',
               name: '黄'
            },
            {
               label: 'blue',
               name: '蓝'
            },
            buttons: [
               {
                  label: 'red',
                  name: '红'
               },
               {
                  label: 'orange',
                  name: '橙'
               },
               {
                  label: 'yellow',
                  name: '黄'
               },
               {
                  label: 'blue',
                  name: '蓝'
               },
            ],
            selectedSaleAnalysis: 'red',
            selectedSaleAnalysis: 'all',
            examineList: [],
         }
      },
@@ -121,8 +128,8 @@
      methods: {
         getExanineList() {
            this.data.searchParams.reviewStatus = this.isReadOnly ? 1 : null;
            this.data.searchParams.emergType = this.checked ? 1 : 2;
            this.data.searchParams.warningLevel = this.selectedSaleAnalysis =='red' ? 1 : this.selectedSaleAnalysis =='orange' ? 2: this.selectedSaleAnalysis =='yellow'? 3 : 4;
            this.data.searchParams.emergType = this.checked ? 1 : null;
            this.data.searchParams.warningLevel = this.selectedSaleAnalysis == 'all' ? null : this.selectedSaleAnalysis =='red' ? 1 : this.selectedSaleAnalysis =='orange' ? 2: this.selectedSaleAnalysis =='yellow'? 3 : 4;
            getExamine(this.data).then(res => {
               if(res.code == 100) {
                  this.examineList = res.data ? res.data : [];
@@ -131,10 +138,10 @@
                  if(this.examineList.length > 0) {
                     
                     this.examineList.forEach((item, index) => {
                        this.examineList[index].colorContent = this.data.searchParams.warningLevel == 1 ? '红色预警': this.data.searchParams.warningLevel == 2 ? '橙色预警': this.data.searchParams.warningLevel == 3 ? '黄色预警':'蓝色预警'; 
                        this.examineList[index].colorContent = item.warningLevel == 1 ? '红色预警': item.warningLevel == 2 ? '橙色预警': item.warningLevel == 3 ? '黄色预警':'蓝色预警'; 
                        this.examineList[index].buttonContent = item.reviewStatus == 1 ? '待审核': item.reviewStatus == 2 ? '已审核通过' : '已驳回';
                        this.examineList[index].role = 'leader';
                        this.examineList[index].warningLevel = this.data.searchParams.warningLevel;
                        this.examineList[index].warningLevel = item.warningLevel;
                     });
                  }
               }
@@ -147,11 +154,6 @@
         chooseRead(e) {
            this.isReadOnly = e;
            this.getExanineList();
            // if(e) {
            //    this.examineList = this.examineList.filter(item => item.reviewStatus == 1);
            // }else {
            //    this.getExanineList();
            // }
         },
         toDetail(item) {
            console.log("item",item)
@@ -218,6 +220,19 @@
   align-items: center;
   justify-content: space-between;
}
.buttonAll{
   margin-left:5px;
   color: white;
   display: flex;
   flex-direction: row;
   justify-content: center;
   align-items: center;
   width: 35px;
   height: 30px;
   border-radius: 5px;
   font-size: 12px;
   font-weight: 700;
}
.buttonItem{
   margin-left:5px;
   color: white;
@@ -230,7 +245,10 @@
   border-radius: 5px;
}
.active {
   border: 1px solid gray;
   border: 1.5px solid #8d8d8d;
}
.all {
   background-color: rgb(17,204,33);
}
.red {
   background-color: red;