工作台页面优化

pages/workPlan/dayPlan/index.vue

@@ -144,10 +144,34 @@
       </view>
     </view>
     <!-- 查看数据 -->
-    <view v-show="activeIndex === 3">查看数据</view>
+    <view v-show="activeIndex === 3" class="common-style">
+      <uni-search-bar
+        bgColor="#efefef"
+        textColor="#000"
+        placeholder="搜索"
+        clearButton="none"
+        cancelButton="none"
+        @confirm="search"
+      />
+
+      <uni-forms ref="form-b" label-position="top" label-width="200">
+        <uni-forms-item label="工程名称" required>
+          <view class="time-container" @tap="onViewSelectProject">
+            <view>请选择</view>
+            <text>&gt;</text>
+          </view>
+        </uni-forms-item>
+        <uni-forms-item label="全部状态" required>
+          <view class="time-container" @tap="onSelectAllType">
+            <view>请选择</view>
+            <text>&gt;</text>
+          </view>
+        </uni-forms-item>
+      </uni-forms>
+    </view>
 
     <uni-popup ref="popup" background-color="#fff">
-      <view class="popup-content">
+      <view class="popup-content" v-if="popupType === 'center'">
         <view class="flex-style" style="justify-content: space-between">
           <text>选择工程</text>
           <text>X</text>
@@ -161,6 +185,20 @@
         </view>
         <view class="project-content">暂无数据</view>
       </view>
+
+      <view v-else class="popup-bottom-content">
+        <view class="bottom-title">
+          <text>请选择</text>
+          <text>请选择</text>
+          <uni-icons type="closeempty" size="20" @tap="onClosePopup"></uni-icons>
+        </view>
+
+        <view v-if="isType">
+          <view class="select-item" v-for="item in isAUditingList" :key="item.title" @tap="onCheckAuditing(item.value)">
+            {{ item.title }}
+          </view>
+        </view>
+      </view>
     </uni-popup>
   </view>
 </template>
@@ -205,7 +243,13 @@ export default {
         dj: {
           rules: [{ required: true, errorMessage: '请填写' }]
         }
-      }
+      },
+      popupType: 'center',
+      isType: false,
+      isAUditingList: [
+        { title: '未审核', value: 0 },
+        { title: '已审核', value: 1 }
+      ]
     }
   },
   methods: {
@@ -223,6 +267,7 @@ export default {
     },
     onSelectProject() {
       this.$refs.popup.open('center')
+      this.popupType = 'center'
     },
     onProjectChange() {
       console.log('选择---')
@@ -251,6 +296,24 @@ export default {
     },
     onBackToday() {
       this.currentTime = this.$moment().format('YYYY-MM-DD')
+    },
+    onViewSelectProject() {
+      this.$refs.popup.open('bottom')
+      this.popupType = 'bottom'
+    },
+    onSelectAllType() {
+      this.$refs.popup.open('bottom')
+      this.popupType = 'bottom'
+      this.isType = true
+    },
+    onClosePopup() {
+      this.$refs.popup.close()
+      if (this.isType) {
+        this.isType = !this.isType
+      }
+    },
+    onCheckAuditing(val) {
+      console.log(val, '----')
     }
   },
   onLoad(options) {
@@ -374,4 +437,29 @@ export default {
 .view-time {
   margin: 0 35rpx;
 }
+.popup-bottom-content {
+  height: 50vh;
+
+  .bottom-title {
+    height: 90rpx;
+    padding-right: 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #ccc;
+  }
+  .bottom-title text:first-child {
+    color: transparent;
+  }
+
+  .select-item {
+    height: 90rpx;
+    line-height: 90rpx;
+    text-align: center;
+    border-bottom: 1px solid #ccc;
+  }
+  .select-item:hover {
+    background-color: rgb(224, 239, 249);
+  }
+}
 </style>

pages/workPlan/workbench/components/infrastructure-model.vue

@@ -4,7 +4,7 @@
     <h4>基建-计划审核</h4>
     <view class="infrastructure-content">
       <view class="icon-box" v-for="(icon, index) in iconList" :key="index" @tap="onOpenPlanPage(icon.url)">
-        <image src="@/static/realName/attendance_statistics.png" mode="scaleToFill" />
+        <image :src="icon.img_src" mode="scaleToFill" />
         {{ icon.icon_title }}
       </view>
     </view>
@@ -16,11 +16,19 @@ export default {
   data() {
     return {
       iconList: [
-        { icon_title: '日计划', url: '/pages/workPlan/dayPlan/index' },
-        { icon_title: '周计划', url: 'xxx' },
-        { icon_title: '月计划', url: 'xxx' },
-        { icon_title: '涉网计划', url: 'xxx' },
-        { icon_title: '临时计划', url: 'xxx' }
+        {
+          icon_title: '日计划',
+          url: '/pages/workPlan/dayPlan/index',
+          img_src: require('../../../../static/images/workPlan/day_plan.png')
+        },
+        { icon_title: '周计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/week_plan.png') },
+        { icon_title: '月计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/month_plan.png') },
+        { icon_title: '涉网计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/web_plan.png') },
+        {
+          icon_title: '临时计划',
+          url: 'xxx',
+          img_src: require('../../../../static/images/workPlan/temporary_plan.png')
+        }
       ]
     }
   },

pages/workPlan/workbench/components/production-model.vue

@@ -4,7 +4,7 @@
     <h4>生产-计划审核</h4>
     <view class="production-content">
       <view class="icon-box" v-for="(icon, index) in iconList" :key="index" @tap="onOpenPlanPage(icon.url)">
-        <image src="@/static/realName/attendance_statistics.png" mode="scaleToFill" />
+        <image :src="icon.img_src" mode="scaleToFill" />
         {{ icon.icon_title }}
       </view>
     </view>
@@ -16,11 +16,19 @@ export default {
   data() {
     return {
       iconList: [
-        { icon_title: '日计划', url: '/pages/workPlan/dayPlan/index' },
-        { icon_title: '周计划', url: 'xxx' },
-        { icon_title: '月计划', url: 'xxx' },
-        { icon_title: '涉网计划', url: 'xxx' },
-        { icon_title: '临时计划', url: 'xxx' }
+        {
+          icon_title: '日计划',
+          url: '/pages/workPlan/dayPlan/index',
+          img_src: require('../../../../static/images/workPlan/day_plan.png')
+        },
+        { icon_title: '周计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/week_plan.png') },
+        { icon_title: '月计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/month_plan.png') },
+        { icon_title: '涉网计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/web_plan.png') },
+        {
+          icon_title: '临时计划',
+          url: 'xxx',
+          img_src: require('../../../../static/images/workPlan/temporary_plan.png')
+        }
       ]
     }
   },