From 8337922096e6b6a5a2e7c38dd7b5d2cf52c8aacf Mon Sep 17 00:00:00 2001
From: tangyi <275503107@qq.com>
Date: Thu, 24 Mar 2022 17:04:24 +0800
Subject: [PATCH] xiugai

---
 pages/appreciationServe/appreciationServe.vue | 18 +++--
 pages/dataQuery/dataQuery.vue                 | 73 +++++++++++++++++++
 pages/dataQuery/details.vue                   |  2 +-
 pages/dataQuery/projectDetails.vue            | 38 ++++++++--
 pages/dataQuery/projectQuery.vue              |  1 +
 pages/dataQuery/queryFunction.vue             |  4 +-
 pages/mountingsList/mountingsList.vue         |  2 +-
 pages/peopleManagement/peopleManagement.vue   |  2 +-
 pages/workOrder/details.vue                   | 12 ++-
 9 files changed, 127 insertions(+), 25 deletions(-)

diff --git a/pages/appreciationServe/appreciationServe.vue b/pages/appreciationServe/appreciationServe.vue
index b22d2e3..109d1d0 100644
--- a/pages/appreciationServe/appreciationServe.vue
+++ b/pages/appreciationServe/appreciationServe.vue
@@ -16,13 +16,13 @@
         <view class="appreciationServe-from">
             <view class="li">
                 <view class="title">
-                    *产品名称
+                    <text class="cor">*</text>产品名称
                 </view>
                 <input class="input" type="text" value="全彩LED显示屏" />
             </view>
             <view class="li">
                 <view class="title">
-                    *规格型号
+                    <text class="cor">*</text>规格型号
                 </view>
                 <input class="input" type="text" value="p2.5" />
             </view>
@@ -34,7 +34,7 @@
             </view>
             <view class="li">
                 <view class="title">
-                    *产品尺寸
+                    <text class="cor">*</text>产品尺寸
                 </view>
                 <input class="input" type="text" value="宽:38.5m x 高14.5m" />
             </view>
@@ -46,25 +46,25 @@
         <view class="supplement-from">
             <view class="li">
                 <view class="title">
-                    *联系人
+                    <text class="cor">*</text>联系人
                 </view>
                 <input type="text" class="input" value="王富贵" />
             </view>
             <view class="li">
                 <view class="">
-                    *联系电话
+                    <text class="cor">*</text>联系电话
                 </view>
                 <input type="text" class="input" value="18256666666" />
             </view>
             <view class="li">
                 <view class="">
-                    *预约时间
+                    <text class="cor">*</text>预约时间
                 </view>
                 <input type="text" class="input" value="2022-02-16" />
             </view>
             <view class="li-textarea">
                 <view class="title">
-                    *详细地址
+                    <text class="cor">*</text>详细地址
                 </view>
                 <textarea class="textarea" value="湖南省株洲市荷塘区红旗中路456号五矿二十三冶综合楼" placeholder="" />
             </view>
@@ -129,7 +129,9 @@
     .content {
         padding-top: 80rpx;
     }
-
+   .cor{
+       color: #FF0000;
+   }
     .select-type {
         display: flex;
         margin-top: 10rpx;
diff --git a/pages/dataQuery/dataQuery.vue b/pages/dataQuery/dataQuery.vue
index 6ed9c56..b2e0c8a 100644
--- a/pages/dataQuery/dataQuery.vue
+++ b/pages/dataQuery/dataQuery.vue
@@ -38,6 +38,78 @@
                      <text class="icon-text">待维修</text>
                 </view>
             </view>
+            <view class="li">
+                <view class="title">
+                    项目名称：湖南工业大学生化学院三楼会议室    
+                </view>
+                <view class="text-content">
+                    <view class="left">
+                       <view class="text">
+                          核心品牌：海康威视  
+                       </view>
+                       <view class="text">
+                           规格型号：DS-CK18FI-H 
+                       </view>
+                       <view class="text">
+                           批  次  号：2210122
+                       </view>
+                    </view>
+                    <view class="rigth">
+                        <view class="text">
+                        备品数量：<text class="cor">3张</text>
+                        </view>
+                        <view class="text cor1">
+                            备品尺寸：320*160
+                        </view>
+                        <view class="text cor1">
+                            入库时间：2021-04-06 16:45:45
+                        </view>
+                    </view>
+                </view>
+                
+                <view class="icon" v-if="true">
+                    <text class="icon-text">正常</text>
+                </view>
+                <view class="icon1" v-else>
+                     <text class="icon-text">待维修</text>
+                </view>
+            </view>
+            <view class="li">
+                <view class="title">
+                    项目名称：湖南工业大学生化学院三楼会议室    
+                </view>
+                <view class="text-content">
+                    <view class="left">
+                       <view class="text">
+                          核心品牌：海康威视  
+                       </view>
+                       <view class="text">
+                           规格型号：DS-CK18FI-H 
+                       </view>
+                       <view class="text">
+                           批  次  号：2210122
+                       </view>
+                    </view>
+                    <view class="rigth">
+                        <view class="text">
+                        备品数量：<text class="cor">3张</text>
+                        </view>
+                        <view class="text cor1">
+                            备品尺寸：320*160
+                        </view>
+                        <view class="text cor1">
+                            入库时间：2021-04-06 16:45:45
+                        </view>
+                    </view>
+                </view>
+                
+                <view class="icon" v-if="false">
+                    <text class="icon-text">正常</text>
+                </view>
+                <view class="icon1" v-else>
+                     <text class="icon-text">待维修</text>
+                </view>
+            </view>
         </view>
     </view>
 </template>
@@ -71,6 +143,7 @@
     .dataQuery-content .li{
         background-color: #FFFFFF;
         padding: 26rpx 28rpx;
+        margin-bottom: 14rpx;
     }
         
     .dataQuery-content .li {
diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue
index 3aefc6a..93f1945 100644
--- a/pages/dataQuery/details.vue
+++ b/pages/dataQuery/details.vue
@@ -182,7 +182,7 @@
 
 <style>
     .content {
-        padding-top: 80rpx;
+        padding-top: 100rpx;
         padding-right: 27rpx;
         padding-left: 27rpx;
     }
diff --git a/pages/dataQuery/projectDetails.vue b/pages/dataQuery/projectDetails.vue
index 59ea7d0..e15be75 100644
--- a/pages/dataQuery/projectDetails.vue
+++ b/pages/dataQuery/projectDetails.vue
@@ -4,7 +4,7 @@
         <view class="details-head">
             <view class="swiper-head">
                 <swiper class="swiper" @change="changeAutoplay" :autoplay="autoplay" :interval="interval"
-                    :duration="duration">
+                   >
                     <swiper-item>
                         <view class="swiper-item uni-bg-red">
                             <image class="img" src="../../static/del/项目图片.png" mode="aspectFill"></image>
@@ -220,6 +220,7 @@
                </view>
              </view>
         </view>
+        
         <view class="record-nav">
             <view class="li" @click="recordNav(index)" :class="item.state?'on':''" v-for="(item,index) in recordState">
                 {{item.title}}
@@ -479,6 +480,7 @@
           border-top:2rpx solid #ebebeb;
         border-bottom: 2rpx solid #ebebeb;
       padding-top: 23rpx;
+      background-color: #FFFFFF;
         padding-bottom: 21rpx;
     }
 
@@ -491,7 +493,7 @@
     }
 
     .project-message-title .text {
-        font-size: 13rpx
+        font-size: 26rpx
     }
 
     .project-message-content {
@@ -500,6 +502,7 @@
         padding: 30rpx 25rpx 0rpx;
         flex-wrap: wrap;
         margin-bottom: 8rpx;
+        background-color: #FFFFFF;
         justify-content: space-between;
     }
 
@@ -515,6 +518,8 @@
     .project-message-content .li {
         display: flex;
         margin-bottom: 31rpx;
+        
+        margin-right: 20rpx;
     }
 
     .project-message-content .title {
@@ -529,8 +534,10 @@
     }
 
     .record-nav {
-        padding: 55rpx 50rpx 33rpx;
+        padding: 33rpx 50rpx 33rpx;
         display: flex;
+         margin-top: 10rpx;
+         background-color: #FFFFFF;
         justify-content: space-between;
         border-bottom: 2rpx solid #D5D4D4;
     }
@@ -558,8 +565,12 @@
     }
 
     .record-content {
-        margin-top: 33rpx;
+    
         padding: 0 52rpx;
+        padding-top: 33rpx;
+        overflow: hidden;
+        background-color: #FFFFFF;
+        padding-bottom: 43rpx;
     }
 
     .record-content .title {
@@ -587,14 +598,23 @@
 
     .record-content .list .li .icon::after {
         content: "";
-        width: 1rpx;
+        width: 2rpx;
         position: absolute;
         left: 7rpx;
         height: 102rpx;
         background-color: #999999;
         top: 14rpx;
     }
-
+      
+  .record-content .list .li .icon:last-child::after{
+ content: "";
+ width: 2rpx;
+ position: absolute;
+ left: 7rpx;
+ height: 102rpx;
+ background-color: #999999;
+ top: 14rpx;;
+  }
     .record-content .list .li .con {
         display: flex;
         align-items: center;
@@ -621,10 +641,10 @@
       }
       .record-content .list .on .icon::after {
           content: "";
-          width: 1rpx;
+          width: 2rpx;
           position: absolute;
           left: 9rpx;
-          height: 186rpx;
+          height: 170rpx;
           z-index: -1;
           background-color: #0084ff;
           top: 20rpx;
@@ -647,6 +667,7 @@
             display: flex;
              color: #00a2e9;
             font-size: 24rpx;
+            background-color: #FFFFFF;
             border-bottom: 2rpx solid #EDEDED;
             
             font-weight: bold;
@@ -659,6 +680,7 @@
            }
      .project-materials-text{
          display: flex;
+          background-color: #FFFFFF;
            border-bottom: 2rpx solid #EDEDED;
            padding: 26rpx 20rpx;
            font-size: 24rpx;
diff --git a/pages/dataQuery/projectQuery.vue b/pages/dataQuery/projectQuery.vue
index 6990a02..c55937e 100644
--- a/pages/dataQuery/projectQuery.vue
+++ b/pages/dataQuery/projectQuery.vue
@@ -322,6 +322,7 @@
 
     .project-list-address {
         display: flex;
+        margin-top: 10rpx;
         /* justify-content: space-between; */
     }
 
diff --git a/pages/dataQuery/queryFunction.vue b/pages/dataQuery/queryFunction.vue
index ebf1017..a235da4 100644
--- a/pages/dataQuery/queryFunction.vue
+++ b/pages/dataQuery/queryFunction.vue
@@ -16,7 +16,7 @@
               
             </view>
             <view class="queryFunction-head-Fun">
-                   <input type="text" placeholder="请输入关键字查询" class="queryFunction-head-input" value="" /> 
+                   <input type="text" placeholder="请输入关键词进行查询" class="queryFunction-head-input" value="" /> 
                    <view class="button">
                        查询
                    </view>
@@ -29,7 +29,7 @@
         </view>
         
         <view class="recently-query-title">
-            最后查询
+            最近查询
         </view>
         
         <view class="recently-query-content">
diff --git a/pages/mountingsList/mountingsList.vue b/pages/mountingsList/mountingsList.vue
index 0b8c07a..60e5a56 100644
--- a/pages/mountingsList/mountingsList.vue
+++ b/pages/mountingsList/mountingsList.vue
@@ -131,7 +131,7 @@
 
 <style>
     .content {
-        padding-top: 80rpx;
+        padding-top: 70rpx;
     }
 
     .submit-button {
diff --git a/pages/peopleManagement/peopleManagement.vue b/pages/peopleManagement/peopleManagement.vue
index e8cc895..99e4992 100644
--- a/pages/peopleManagement/peopleManagement.vue
+++ b/pages/peopleManagement/peopleManagement.vue
@@ -35,7 +35,7 @@
                             </view>
                             <view class="iconCon">
                                 <view v-for="(item,index) in 5">
-                                    <image class="icon" v-if="index==2" src="../../static/iocn/6.png" mode=""></image>
+                                    <image class="icon" v-if="index<=2" src="../../static/iocn/6.png" mode=""></image>
                                     <image class="icon" v-else src="../../static/iocn/7.png" mode=""></image>
                                 </view>
                             </view>
diff --git a/pages/workOrder/details.vue b/pages/workOrder/details.vue
index a5ec0ec..cea9b9b 100644
--- a/pages/workOrder/details.vue
+++ b/pages/workOrder/details.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="content">
-        <statusNav navBarTitle="工单详情"></statusNav>
+        <statusNav :navBarTitle="textTitle"></statusNav>
 
         <view class="details-nav">
             <view class="li" @click="detailsNavpa(index)" :class="item.state?'on':''"
@@ -427,9 +427,8 @@
         },
         data() {
             return {
-                swiHeight: 700,
                 swiperCurrent: 0,
-                
+                textTitle:"工单详情",
                 detailsNav: [{
                         title: "基础信息",
                         state: true
@@ -455,7 +454,7 @@
             const query = uni.createSelectorQuery().in(this);
             query.select('#swi1').boundingClientRect(data => {
              
-                this.swiHeight = data.height
+                this.swiHeight = data.height-100
             }).exec();
             this.detailsNavFun(0)
 
@@ -486,24 +485,28 @@
                 console.log(data.detail.current)
                     
                 if(data.detail.current==0){
+                         this.textTitle="工单详情"
                     const query = uni.createSelectorQuery().in(this);
                     query.select('#swi1').boundingClientRect(data => {
                      
                         this.swiHeight = data.height
                     }).exec();
                 }else if(data.detail.current==1){
+                    this.textTitle="处理详情"
                     const query = uni.createSelectorQuery().in(this);
                     query.select('#swi2').boundingClientRect(data => {
                      
                         this.swiHeight = data.height
                     }).exec();
                 }else if(data.detail.current==2){
+                      this.textTitle="工单详情"
                     const query = uni.createSelectorQuery().in(this);
                     query.select('#swi3').boundingClientRect(data => {
                      
                         this.swiHeight = data.height
                     }).exec();
                 }else if(data.detail.current==3){
+                          this.textTitle="工单详情"
                     const query = uni.createSelectorQuery().in(this);
                     query.select('#swi4').boundingClientRect(data => {
                      
@@ -552,6 +555,7 @@
     .work-order-from {
         margin-top: 10rpx;
         background-color: #FFFFFF;
+        padding-bottom: 40rpx;
     }
 
     .work-order-from .li {