From 485cc0bc9d25d5b634cbde593a5b8690614bcc55 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 17 Nov 2023 13:40:18 +0800
Subject: [PATCH] update
---
pages/home/index.vue | 20 ++++++++++++++++++--
static/icon/menu-10.png | 0
api/workLog/workLog.js | 10 ++++++++++
subPackage/house/member/householdLabel.vue | 3 ++-
subPackage/workbench/views/workLog.vue | 6 +++++-
subPackage/task/index.vue | 8 ++++----
6 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/api/workLog/workLog.js b/api/workLog/workLog.js
new file mode 100644
index 0000000..bef3fa4
--- /dev/null
+++ b/api/workLog/workLog.js
@@ -0,0 +1,10 @@
+import http from '@/http/api.js'
+
+
+export const addWorkLog = (params) => {
+ return http.request({
+ url: '/blade-gridWorkLog/gridWorkLog/saver',
+ method: 'POST',
+ params
+ })
+}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 3c2fadf..a955f3f 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -306,13 +306,29 @@
path: "/subPackage/workbench/views/report"
},
{
- icon: "/static/icon/menu-04.png",
+ icon: "/static/icon/menu-10.png",
text: "我的任务",
style: {
- background: 'linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)',
+ background: 'linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)'
},
path: "/subPackage/task/index"
},
+ {
+ icon: "/static/icon/menu-02.png",
+ text: "工作日志",
+ style: {
+ background: 'linear-gradient(131deg, #FCF8FF 0%, rgba(252,248,255,0) 100%)'
+ },
+ path: "/subPackage/workbench/views/workLog"
+ },
+ {
+ icon: "/static/icon/menu-02.png",
+ text: "网格巡查",
+ style: {
+ background: 'linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)'
+ },
+ path: "/subPackage/workbench/views/patrol"
+ },
// {
// icon: "/static/icon/menu-07.png",
// text: "校园安全",
diff --git a/static/icon/menu-10.png b/static/icon/menu-10.png
new file mode 100644
index 0000000..c476a42
--- /dev/null
+++ b/static/icon/menu-10.png
Binary files differ
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index 78518e7..5ffe3fb 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -234,7 +234,8 @@
householdId: this.householdInfo.id,
labelId: id,
remark: this.remark,
- color
+ color,
+ houseCode:this.houseCode
})
}
if (res.code !== 200) {
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index db83953..b385eda 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -29,7 +29,7 @@
<text class="f-32 fw">公安</text>
</view>
</view>
- <view class="nav-item flex j-c-s-b a-i-c">
+ <view class="nav-item flex j-c-s-b a-i-c" @click="navTo('subPackage/workbench/views/report')">
<text class="f-28">报事报修</text>
<view class="flex">
<text class="f-28 c-99">待处理</text>
@@ -45,14 +45,14 @@
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
</view>
- <view class="nav-item flex j-c-s-b a-i-c">
+ <!-- <view class="nav-item flex j-c-s-b a-i-c">
<text class="f-28">工作日志</text>
<view class="flex">
<text class="f-28 c-99">待处理</text>
<view class="dot bgc-main">3</view>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
- </view>
+ </view> -->
</view>
<view class="nav bgc-ff mb-20">
@@ -78,7 +78,7 @@
<text class="f-32 fw">综治</text>
</view>
</view>
- <view class="nav-item flex j-c-s-b a-i-c">
+ <view class="nav-item flex j-c-s-b a-i-c" @click="navTo('/subPackage/task/taskList')">
<text class="f-28">综治任务</text>
<view class="flex">
<text class="f-28 c-99">待处理</text>
diff --git a/subPackage/workbench/views/workLog.vue b/subPackage/workbench/views/workLog.vue
index b75e668..1296ffb 100644
--- a/subPackage/workbench/views/workLog.vue
+++ b/subPackage/workbench/views/workLog.vue
@@ -3,7 +3,11 @@
<view class="content bgc-ff">
<u-form labelPosition="left" :model="info" :rules="rules" ref="uForm" labelWidth="90"
:labelStyle="{fontSize:'28rpx'}">
- <u-form-item label="标题" prop="info.title" borderBottom ref="item1">
+ <u-form-item label="姓名" prop="info.name" borderBottom ref="item1">
+ <u-input v-model="info.title" border="none" placeholder="请输入标题" placeholderClass="f-28 c-99"
+ inputAlign="right"></u-input>
+ </u-form-item>
+ <u-form-item label="手机号" prop="info.phone" borderBottom ref="item1">
<u-input v-model="info.title" border="none" placeholder="请输入标题" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
--
Gitblit v1.9.3