From 2de0198c138a18684be5cd0434754e5d3510c2c2 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 17 Oct 2024 13:53:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/phaseTwo/homePage.js          |  19 ++
 pages.json                        |   7 +
 pages/realName/index/index.vue    |  16 +-
 pages/realName/workPlan/index.vue | 298 ++++++++++++++++++++++++++++++
 static/realName/screen.png        | Bin 0 -> 302 bytes
 utils/request.js                  |   3 +-
 6 files changed, 331 insertions(+), 12 deletions(-)
 create mode 100644 pages/realName/workPlan/index.vue
 create mode 100644 static/realName/screen.png

diff --git a/api/phaseTwo/homePage.js b/api/phaseTwo/homePage.js
index f71e52b..8cfeb71 100644
--- a/api/phaseTwo/homePage.js
+++ b/api/phaseTwo/homePage.js
@@ -8,3 +8,22 @@ export function getHomePageListApi(data) {
     data: data
   })
 }
+// 首页二级页面--作业计划列表
+export function getWorkPlantApi(data) {
+  return request({
+    url: '/bmw/homeSubPage/getAppDayPlanMsg',
+    method: 'post',
+    header: {
+      'Content-Type': 'application/json'
+    },
+    data: data
+  })
+}
+// 首页二级页面--作业计划列表
+export function getHomePageSelectApi() {
+  return request({
+    url: '/bmw/homePageSelect/getProCondition',
+    method: 'post',
+    data: {}
+  })
+}
diff --git a/pages.json b/pages.json
index bf93dfd..f7a5753 100644
--- a/pages.json
+++ b/pages.json
@@ -219,6 +219,13 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      //首页二级跳转页面 -- 作业计划
+      "path": "pages/realName/workPlan/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       //工作台
       "path": "pages/realName/workbench/index",
diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue
index ea20a5d..49ce18e 100644
--- a/pages/realName/index/index.vue
+++ b/pages/realName/index/index.vue
@@ -98,7 +98,7 @@
       <view class="today-warning">
         <image class="warning-img" src="../../../static/images/img-phase-two/index_news.png" mode=""></image>
         <text>今日风险</text>
-        <view class="uni-notice-bar">
+        <view class="uni-notice-bar" @tap="onJumpWorkPlan">
           <uni-notice-bar
             style="height: 100%"
             :speed="30"
@@ -600,16 +600,10 @@ export default {
 
         e.project_ratio = ((e.project_num / proAmount) * 100).toFixed(0)
       })
-
-      // this.planProNum = res.personAtt.planProNum
-      // this.redPersonNum = res.personAtt.redPersonNum
-      // this.yellowPersonNum = res.personAtt.yellowPersonNum
-      // this.greenPersonNum = res.personAtt.greenPersonNum
-
-      // this.buildProNum = res.personAtt.buildProNum
-      // this.teamNum = res.personAtt.teamNum
-      // this.subNum = res.personAtt.subNum
-      // this.formalPersonNum = res.personAtt.formalPersonNum
+    },
+    /* 跳转作业计划 */
+    onJumpWorkPlan() {
+      uni.navigateTo({ url: '/pages/realName/workPlan/index' })
     }
   },
   onShow() {}
diff --git a/pages/realName/workPlan/index.vue b/pages/realName/workPlan/index.vue
new file mode 100644
index 0000000..2f9c343
--- /dev/null
+++ b/pages/realName/workPlan/index.vue
@@ -0,0 +1,298 @@
+<template>
+  <view class="work-plan">
+    <u-navbar
+      class="u-navbar"
+      title="作业计划"
+      placeholder
+      @leftClick="leftClick"
+      leftIconColor="#fff"
+      bgColor="#00337A"
+      :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
+    />
+
+    <view class="header-fixed">
+      <view class="search-content">
+        <view>
+          <uni-easyinput
+            suffixIcon="search"
+            v-model="queryParams.params.proName"
+            placeholder="请输入工程信息"
+            @iconClick="getWorkPlantData"
+          ></uni-easyinput>
+        </view>
+        <view class="search-icon" @tap="onSearchFilter"></view>
+      </view>
+      <view style="margin-top: 20rpx; color: #3f9dfd; letter-spacing: 2rpx">已查询{{ recordsTotal }}条数据</view>
+    </view>
+    <view style="padding: 0 20rpx">
+      <scroll-view class="data-container" scroll-y="true">
+        <view class="scroll-item" v-for="(item, index) in companyInfoList" :key="item.proId">
+          <view class="item-1">
+            <view>{{ index + 1 }}</view>
+            <view>{{ item.proName }}</view>
+          </view>
+          <view class="item-2">
+            <view>{{ item.subComName }}</view>
+            <view>
+              <text v-if="item.kjsfx > 0" style="color: #6ff6d5">可接受风险：{{ item.kjsfx }}</text>
+              <text v-if="item.dfx > 0" style="color: #25c294">低风险：{{ item.dfx }}</text>
+              <text v-if="item.zfx > 0" style="color: #f9971e">中风险：{{ item.zfx }}</text>
+              <text v-if="item.gfx > 0" style="color: #f44d46">高风险：{{ item.gfx }}</text>
+            </view>
+          </view>
+          <view class="item-3">
+            <view>作业人数</view>
+            <view style="color: #3f9dfd; font-weight: bold">{{ item.personNum }}</view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 底部弹框 -->
+    <uni-popup ref="popup" type="bottom" background-color="#fff">
+      <view class="bottom-content">
+        <h1>条件筛选</h1>
+        <h2>分公司</h2>
+
+        <view>
+          <scroll-view class="company-container" scroll-y="true">
+            <view class="company-items">
+              <view
+                :key="item.company_name"
+                v-for="(item, index) in companyList"
+                :class="{ active: index === activeIndex }"
+                @tap="onSelectCompany(index, item.name)"
+              >
+                {{ item.name }}
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+        <view class="bottom-btn">
+          <button style="background-color: #fff; color: #00337a" @tap="onReset">重置</button>
+          <button style="background-color: #00337a; color: #fff" @tap="onQuery">查询</button>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import { getHomePageSelectApi } from '../../../api/phaseTwo/homePage'
+import config from '@/config'
+export default {
+  data() {
+    return {
+      activeIndex: 0,
+      recordsTotal: 0,
+      token: uni.getStorageSync('tjToken'),
+      // 查询参数
+      queryParams: {
+        offset: 0,
+        limit: 99999,
+        params: {
+          proName: '',
+          subComName: ''
+        }
+      },
+      companyList: [{ name: '全部', id: '' }],
+      companyInfoList: []
+    }
+  },
+  mounted() {
+    this.getWorkPlantData()
+    this.getHomePageSelectData()
+  },
+  methods: {
+    /* 获取作业计划列表 */
+    async getWorkPlantData() {
+      uni.request({
+        url: config.loginBaseUrl + '/bmw/homeSubPage/getAppDayPlanMsg',
+        method: 'POST',
+        data: JSON.stringify(this.queryParams),
+        header: {
+          'Content-Type': 'application/json'
+          //   token: this.token
+        },
+        success: res => {
+          console.log('res****', res)
+          this.recordsTotal = res.data.recordsTotal
+          this.companyInfoList = res.data.data
+        },
+        fail: err => {}
+      })
+    },
+    /* 获取公司数据 */
+    async getHomePageSelectData() {
+      const res = await getHomePageSelectApi()
+      this.companyList = this.companyList.concat(res.subList)
+    },
+    leftClick() {
+      uni.navigateTo({ url: '/pages/realName/index/index' })
+    },
+    onSearchFilter() {
+      // 打开底部弹框
+      this.$refs.popup.open()
+    },
+    /* 选择公司 */
+    onSelectCompany(index, name) {
+      this.activeIndex = index
+      if (index === 0) {
+        this.queryParams.params.subComName = ''
+      } else {
+        this.queryParams.params.subComName = name
+      }
+    },
+    /* 重置 */
+    onReset() {
+      this.activeIndex = 0
+      this.queryParams.params.subComName = ''
+      this.onQuery()
+    },
+    /* 查询 */
+    onQuery() {
+      this.getWorkPlantData().then(() => {
+        this.$refs.popup.close()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.work-plan {
+  background-color: #eee;
+  padding-top: 80px;
+
+  .header-fixed {
+    width: 100%;
+    padding: 20rpx;
+    position: fixed;
+    top: 64px;
+    left: 0;
+    z-index: 6;
+    background-color: #ccc;
+
+    .search-content {
+      display: flex;
+      align-items: center;
+
+      .search-icon {
+        width: 48rpx;
+        height: 40rpx;
+        margin-right: 60rpx;
+        margin-left: 30rpx;
+        background: url('../../../static/realName/screen.png') no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .data-container {
+    width: 100%;
+    // height: 400rpx;
+
+    .scroll-item {
+      padding: 14rpx 0;
+      background-color: #fff;
+    }
+
+    .item-1,
+    .item-2,
+    .item-3 {
+      width: 96%;
+      margin: 0 auto;
+      padding: 20rpx 0;
+      border-bottom: 1px solid #eee;
+      display: flex;
+      align-items: center;
+    }
+
+    .item-1 view:first-child {
+      width: 80rpx;
+      height: 56rpx;
+      margin-right: 16rpx;
+      text-align: center;
+      line-height: 56rpx;
+      background: url('../../../static/realName/serial.png') no-repeat;
+      background-size: 100% 100%;
+      color: #fff;
+      font-weight: bold;
+      font-size: 28rpx;
+    }
+
+    .item-2,
+    .item-3 {
+      justify-content: space-around;
+    }
+  }
+
+  .bottom-content {
+    height: 45vh;
+
+    h1,
+    h2 {
+      padding: 15rpx 0;
+      font-size: 32rpx;
+    }
+    h1 {
+      margin-top: 10rpx;
+      border-top: 1px solid #ccc;
+      text-align: center;
+    }
+    h2 {
+      padding-left: 16rpx;
+      border-top: 1px solid #ccc;
+      border-bottom: 1px solid #ccc;
+    }
+
+    .company-container {
+      width: 100%;
+      height: 400rpx;
+      .company-items {
+        width: 100%;
+        padding: 0 16rpx;
+        display: flex;
+        flex-wrap: wrap;
+
+        view {
+          width: 49%;
+          height: 48rpx;
+          margin-top: 10rpx;
+          line-height: 48rpx;
+          border-radius: 10rpx;
+          text-align: center;
+          background-color: #eee;
+          color: #656565;
+        }
+
+        .active {
+          background-color: #3f9dfd;
+          color: #fff;
+        }
+      }
+
+      .company-items view:nth-child(2n + 1) {
+        margin-right: 10rpx;
+      }
+    }
+
+    .bottom-btn {
+      width: 100%;
+      position: fixed;
+      display: flex;
+      bottom: 0;
+      z-index: 9;
+
+      button {
+        flex: 1;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-weight: normal;
+        border-radius: 20rpx;
+        border: 1rpx solid #00337a;
+      }
+    }
+  }
+}
+</style>
diff --git a/static/realName/screen.png b/static/realName/screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..787f6f555ae7d7384282b376c4fadd002f1ce5de
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#=t)FDR5(wqlT8u<K@5fSdTbQVVBA0z)>BTxTmn1na0zZ=>}TNyxC3QDB`WAK
z#&0XxCi&{Umu@tA+qMX%<XA$qhR_VP?rsGl-*G<~N4>M_6KL=Y0FV&6Snch7Pk8>V
zlCykp7>`QP8DJqf=GI3wLW6ix7}~uA@EIi05ni|)<=1Ju4}e6C@airXa8o5`vvLA}
z;IkmG5Cd5_0d!Fz7H}Z%7GheOUM2U!g7)mJ=HaG*O_08l5Y3zbe+f|-<;1RG_Yg^K
zTnk1vPc3La`$vv2mFy$BT;)yOAQHvnV)NPP3C@gwtqJbd;s5{u07*qoM6N<$g3#`K
AnE(I)

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index 13c9f63..96e3c9f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,7 +5,7 @@ import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
 let timeout = 10000
-const baseUrl  = config.loginBaseUrl
+const baseUrl = config.loginBaseUrl
 console.log('baseUrl-请求', baseUrl)
 
 const request = config => {
@@ -21,6 +21,7 @@ const request = config => {
     url = url.slice(0, -1)
     config.url = url
   }
+
   if (config.method === 'post') {
     config.header = {
       ...config.header,

From f218b3c2cb1360d5b30102cd592745958001564e Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 17 Oct 2024 14:00:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                |  7 +++++++
 pages/realName/workPlan-details/index.vue |  9 +++++++++
 pages/realName/workPlan/index.vue         | 11 ++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pages/realName/workPlan-details/index.vue

diff --git a/pages.json b/pages.json
index f7a5753..f267a3e 100644
--- a/pages.json
+++ b/pages.json
@@ -226,6 +226,13 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      //首页二级跳转页面 -- 作业计划--详情
+      "path": "pages/realName/workPlan-details/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       //工作台
       "path": "pages/realName/workbench/index",
diff --git a/pages/realName/workPlan-details/index.vue b/pages/realName/workPlan-details/index.vue
new file mode 100644
index 0000000..891355c
--- /dev/null
+++ b/pages/realName/workPlan-details/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <view>作业计划详情---</view>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style></style>
diff --git a/pages/realName/workPlan/index.vue b/pages/realName/workPlan/index.vue
index 2f9c343..c142842 100644
--- a/pages/realName/workPlan/index.vue
+++ b/pages/realName/workPlan/index.vue
@@ -26,7 +26,12 @@
     </view>
     <view style="padding: 0 20rpx">
       <scroll-view class="data-container" scroll-y="true">
-        <view class="scroll-item" v-for="(item, index) in companyInfoList" :key="item.proId">
+        <view
+          class="scroll-item"
+          v-for="(item, index) in companyInfoList"
+          :key="item.proId"
+          @tap="onViewWorkDetails(item)"
+        >
           <view class="item-1">
             <view>{{ index + 1 }}</view>
             <view>{{ item.proName }}</view>
@@ -154,6 +159,10 @@ export default {
       this.getWorkPlantData().then(() => {
         this.$refs.popup.close()
       })
+    },
+    /* 点击跳转作业计划详情 */
+    onViewWorkDetails(row) {
+      uni.navigateTo({ url: '/pages/realName/workPlan-details/index' })
     }
   }
 }