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 @@
-
+
+
+
+ 欢迎您:{{vuex_user.name}}
+
+
-
+
+
@@ -11,6 +18,7 @@
+
@@ -19,7 +27,7 @@
@body-click="taskClick" :index="item.id" padding="10">
- {{item.state}}
+ {{item.state}}
{{item.name}}
@@ -33,9 +41,9 @@
涉及单位:
- {{item.depts_count}}家
+ {{item.depts_count}}家
巡查组:
- {{item.members.length}}人
+ {{item.members.length}}人
@@ -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;
+ }
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">
- {{initData.state}}
+ {{initData.state}}
@@ -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;
+ }
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 @@
{{form.note}}
-
-
-
-
-
+ width="260rpx" height="260rpx" :src="item" v-for="(item, index) in fileList" v-bind:key="index" style="margin: 8rpx;">
+
+
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 @@
- 登录
+ 登录
密码登录
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 @@
- 登录
+ 登录
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;
}
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 @@
-
- {{item.state}}
+ {{item.state}}
{{item.name}}
@@ -19,9 +19,9 @@
涉及单位:
- {{item.depts_count}}家
+ {{item.depts_count}}家
巡查组:
- {{item.members.length}}人
+ {{item.members.length}}人
@@ -73,5 +73,10 @@
color: #333;
}
}
+ .itemstate {
+ color:$u-type-primary-dark;
+ font-weight: bold;
+ margin-right: 8rpx;
+ }
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">
- {{subtask.state}}
+ {{subtask.state}}
{{subtask.name}}
@@ -18,9 +18,9 @@
涉及单位:
- {{subtask.depts_count}}家
+ {{subtask.depts_count}}家
巡查组:
- {{subtask.members.length}}人
+ {{subtask.members.length}}人
@@ -29,12 +29,12 @@
组长:
{{item.member__name}}
+ style="margin-left:8rpx;color: darkblue;" v-if="item.type=='组长'">{{item.member__name}}
组员:
{{item.member__name}}
+ style="margin-left:8rpx;color: darkblue;" v-if="item.type!='组长'">{{item.member__name}}
@@ -131,4 +131,9 @@
color: #333;
}
}
+ .itemstate {
+ color:$u-type-primary-dark;
+ font-weight: bold;
+ margin-right: 8rpx;
+ }
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):