From 57f6ab09a7bade17835216a8ad91f9dee9b1defb Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 25 Apr 2021 17:20:58 +0800
Subject: [PATCH] =?UTF-8?q?state=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client_mp/pages.json                          |  4 +--
 client_mp/pages/home/home.vue                 | 25 ++++++++++++++-----
 client_mp/pages/inspectrecord/index.vue       |  8 +++++-
 .../pages/inspectrecord/recorddetail.vue      | 10 +++-----
 client_mp/pages/login/login.vue               |  2 +-
 client_mp/pages/login/login_password.vue      |  2 +-
 client_mp/pages/my/my.vue                     |  1 +
 client_mp/pages/subtask/my.vue                | 13 +++++++---
 client_mp/pages/subtask/subtaskdetail.vue     | 15 +++++++----
 server/apps/quality/views.py                  |  2 +-
 10 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/client_mp/pages.json b/client_mp/pages.json
index 153781a..359281e 100644
--- a/client_mp/pages.json
+++ b/client_mp/pages.json
@@ -103,9 +103,9 @@
         }
     ],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "uView",
-		"navigationBarBackgroundColor": "#FFFFFF",
+		"navigationBarBackgroundColor": "#2b85e4",
 		"backgroundColor": "#FFFFFF"
 	},
 	"tabBar": {
diff --git a/client_mp/pages/home/home.vue b/client_mp/pages/home/home.vue
index 5484f29..2565085 100644
--- a/client_mp/pages/home/home.vue
+++ b/client_mp/pages/home/home.vue
@@ -1,9 +1,16 @@
 <template>
 	<view>
-		<u-image :src="imageURL" mode="widthFix"></u-image>
+		<!-- <view :style="{background: 'url('+imageURL+')'}">
+		</view> -->
+		<view style="background-color: #0074ba;">
+			<u-image :src="imageURL" mode="widthFix"></u-image>
+			<view style="background-color: #2b85e4;font-weight: bold;font-size: 30rpx;color:white;padding-left:8rpx">欢迎您:{{vuex_user.name}}</view>
+		</view>
+		
 		<!-- <u-swiper @change="change" :height="250" :list="swiper_list" :title="swtitle" :effect3d="effect3d"
 			:indicator-pos="indicatorPos" :mode="mode" :interval="3000" @click="click"></u-swiper> -->
-		<view style="margin-top:12rpx;margin-bottom: 12rpx;">
+		
+		<view style="margin-bottom: 12rpx;">
 		<u-grid :col="3" :border="false">
 			<u-grid-item v-for="(item, index) in grids" v-bind:key="index" @click="clickGrid(item)">
 				<u-icon :name="item.icon" :size="60"></u-icon>
@@ -11,6 +18,7 @@
 			</u-grid-item>
 		</u-grid>
 		</view>
+		
 		<view style="margin-bottom: 12rpx;margin-left: 6rpx;">
 		<u-section title="最近任务" :right="false" ></u-section>
 		</view>
@@ -19,7 +27,7 @@
 			@body-click="taskClick" :index="item.id" padding="10">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:#2979FF;font-weight: bold;margin-right: 8rpx;">{{item.state}}</span>
+					<span class="itemstate">{{item.state}}</span>
 					{{item.name}}
 				</view>
 				<view class="u-body-item">
@@ -33,9 +41,9 @@
 				</view>
 				<view class="u-body-item">
 					涉及单位:
-					<span style="color:blue;">{{item.depts_count}}</span>家
+					<span style="color:darkblue;">{{item.depts_count}}</span>家
 					巡查组:
-					<span style="color:blue;">{{item.members.length}}</span>人
+					<span style="color:darkblue;">{{item.members.length}}</span>人
 				</view>
 			</view>
 		</u-card>
@@ -46,7 +54,7 @@
 	export default {
 		data() {
 			return {
-				imageURL: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+				imageURL: 'http://testsearch.ctc.ac.cn:8000/media/default/banner3.jpg',
 				swiper_list: [{
 						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
 						title: '昨夜星辰昨夜风，画楼西畔桂堂东'
@@ -164,4 +172,9 @@
 			color: #333;
 		}
 	}
+	.itemstate {
+		color:$u-type-primary-dark;
+		font-weight: bold;
+		margin-right: 8rpx;
+	}
 </style>
diff --git a/client_mp/pages/inspectrecord/index.vue b/client_mp/pages/inspectrecord/index.vue
index aeaf214..470bff3 100644
--- a/client_mp/pages/inspectrecord/index.vue
+++ b/client_mp/pages/inspectrecord/index.vue
@@ -4,7 +4,7 @@
 			:head-style="headstyle" padding="10">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:#2979FF;font-weight: bold;margin-right: 8rpx;">{{initData.state}}</span>
+					<span class="itemstate">{{initData.state}}</span>
 				</view>
 			</view>
 			<view class="" slot="foot">
@@ -218,6 +218,7 @@
 				        if (res.confirm) {
 				            that.$u.api.upInspectDept(that.initData.id).then(res=>{
 								this.initData = res.data
+								this.$u.toast('提交成功')
 							}).catch(e=>{})
 				        } else if (res.cancel) {
 				            
@@ -247,4 +248,9 @@
 			color: #333;
 		}
 	}
+	.itemstate {
+		color:$u-type-primary-dark;
+		font-weight: bold;
+		margin-right: 8rpx;
+	}
 </style>
diff --git a/client_mp/pages/inspectrecord/recorddetail.vue b/client_mp/pages/inspectrecord/recorddetail.vue
index d86363c..851907b 100644
--- a/client_mp/pages/inspectrecord/recorddetail.vue
+++ b/client_mp/pages/inspectrecord/recorddetail.vue
@@ -16,13 +16,11 @@
 				<span v-if="form.note">{{form.note}}</span>
 			</u-form-item>
 			<u-form-item label="拍照取证">
-				
-			</u-form-item>
-			<view >
-				<u-image 
+				<u-image
 				@click="imgListPreview(index)"
-				width="260rpx" height="260rpx" :src="item" v-for="(item, index) in fileList" v-bind:key="index" style="padding: 6rpx;"></u-image>
-			</view>
+				width="260rpx" height="260rpx" :src="item" v-for="(item, index) in fileList" v-bind:key="index" style="margin: 8rpx;"></u-image>
+			</u-form-item>
+				
 		</u-form>
 	</view>
 </template>
diff --git a/client_mp/pages/login/login.vue b/client_mp/pages/login/login.vue
index 4be9f4d..45b7cb8 100644
--- a/client_mp/pages/login/login.vue
+++ b/client_mp/pages/login/login.vue
@@ -17,7 +17,7 @@
 			<!-- <button  :style="[inputStyle]" class="getCaptcha">登录</button> -->
 <!-- 			<u-gap height="1" bg-color="#bbb"></u-gap> -->
 <view style="margin-top: 16rpx;">
-			<u-button @click="submit" type="warning" >登录</u-button>
+			<u-button @click="submit" type="primary" >登录</u-button>
 			</view>
 			<view class="alternative">
 				<navigator url="login_password" class="password" open-type="redirect">密码登录</navigator>
diff --git a/client_mp/pages/login/login_password.vue b/client_mp/pages/login/login_password.vue
index 8aaffd1..3b025fa 100644
--- a/client_mp/pages/login/login_password.vue
+++ b/client_mp/pages/login/login_password.vue
@@ -13,7 +13,7 @@
 				</u-form-item>
 			</u-form>
 			<view style="margin-top: 16rpx;">
-						<u-button @click="submit" type="warning" >登录</u-button>
+						<u-button @click="submit" type="primary" >登录</u-button>
 						</view>
 		</view>
 	</view>
diff --git a/client_mp/pages/my/my.vue b/client_mp/pages/my/my.vue
index 8b655c9..252594f 100644
--- a/client_mp/pages/my/my.vue
+++ b/client_mp/pages/my/my.vue
@@ -83,5 +83,6 @@ page{
 }
 .user-box{
 	background-color: #fff;
+	padding-top:24rpx;
 }
 </style>
diff --git a/client_mp/pages/subtask/my.vue b/client_mp/pages/subtask/my.vue
index 8fd6e66..f1e66a9 100644
--- a/client_mp/pages/subtask/my.vue
+++ b/client_mp/pages/subtask/my.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="wrap">
-		<u-card v-for="(item, index) in myinspecttaskList" v-bind:key="index" :title="item.name" margin="6rpx"
+		<u-card v-for="(item, index) in myinspecttaskList" v-bind:key="index" :title="item.name" margin="12rpx"
 			:border="false" :foot-border-top="false" border-radius="2rpx" :head-style="headstyle"
 			@body-click="taskClick" :index="item.id">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:#2979FF;font-weight: bold;margin-right: 8rpx;">{{item.state}}</span>
+					<span class="itemstate">{{item.state}}</span>
 					{{item.name}}
 				</view>
 				<view class="u-body-item">
@@ -19,9 +19,9 @@
 				</view>
 				<view class="u-body-item">
 					涉及单位:
-					<span style="color:blue;">{{item.depts_count}}</span>家
+					<span style="color:darkblue;">{{item.depts_count}}</span>家
 					巡查组:
-					<span style="color:blue;">{{item.members.length}}</span>人
+					<span style="color:darkblue;">{{item.members.length}}</span>人
 				</view>
 			</view>
 		</u-card>
@@ -73,5 +73,10 @@
 			color: #333;
 		}
 	}
+	.itemstate {
+		color:$u-type-primary-dark;
+		font-weight: bold;
+		margin-right: 8rpx;
+	}
 </style>
 
diff --git a/client_mp/pages/subtask/subtaskdetail.vue b/client_mp/pages/subtask/subtaskdetail.vue
index ac8534e..fb7822b 100644
--- a/client_mp/pages/subtask/subtaskdetail.vue
+++ b/client_mp/pages/subtask/subtaskdetail.vue
@@ -4,7 +4,7 @@
 			:head-style="headstyle" padding="10">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:#2979FF;font-weight: bold;margin-right: 4rpx;">{{subtask.state}}</span>
+					<span class="itemstate">{{subtask.state}}</span>
 					{{subtask.name}}
 				</view>
 				<view class="u-body-item">
@@ -18,9 +18,9 @@
 				</view>
 				<view class="u-body-item">
 					涉及单位:
-					<span style="color:blue;">{{subtask.depts_count}}</span>家
+					<span style="color:darkblue;">{{subtask.depts_count}}</span>家
 					巡查组:
-					<span style="color:blue;" v-if="subtask.members">{{subtask.members.length}}</span>人
+					<span style="color:darkblue;" v-if="subtask.members">{{subtask.members.length}}</span>人
 				</view>
 				<view style="margin-top: 6rpx;">
 					<u-gap height="1" bg-color="#bbb"></u-gap>
@@ -29,12 +29,12 @@
 					<view>
 						组长:
 						<span v-for="(item, index) in subtask.members" v-bind:key="index" mode="plain"
-							style="margin-left:8rpx;color: #00007f;" v-if="item.type=='组长'">{{item.member__name}}</span>
+							style="margin-left:8rpx;color: darkblue;" v-if="item.type=='组长'">{{item.member__name}}</span>
 					</view>
 					<view>
 						组员:
 						<span v-for="(item, index) in subtask.members" v-bind:key="index" mode="plain"
-							style="margin-left:8rpx;color: #00007f;" v-if="item.type!='组长'">{{item.member__name}}</span>
+							style="margin-left:8rpx;color: darkblue;" v-if="item.type!='组长'">{{item.member__name}}</span>
 					</view>
 				</u-collapse-item>
 			</view>
@@ -131,4 +131,9 @@
 			color: #333;
 		}
 	}
+	.itemstate {
+		color:$u-type-primary-dark;
+		font-weight: bold;
+		margin-right: 8rpx;
+	}
 </style>
diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py
index fe6e7a5..66d711f 100644
--- a/server/apps/quality/views.py
+++ b/server/apps/quality/views.py
@@ -79,7 +79,7 @@ class SubtaskViewSet(PageOrNot, CreateUpdateCustomMixin, OptimizationMixin, Mode
                  'put': 'inspecttask_update', 'delete': 'inspecttask_delete'}
     queryset = SubInspectTask.objects.all()
     serializer_class = SubtaskListSerializer
-    filterset_fields = ['inspecttask']
+    filterset_fields = ['inspecttask', 'state']
     ordering = ['-create_time']
     
     def get_queryset(self):