Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-02-11 4eab5ef1384d0024a605109e558b703014f8496c

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

 uniapps/work-wx/src/pages/equipmentManagement/index.vue

@@ -4,7 +4,11 @@
    <view class="content">
      <view class="title">飞行设备</view>
      <u-list :style="{ height: 'calc(100vh - 160rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
        <view class="card" v-for="(item, index) in equipmentList" :key="index" @click="handleClick(item)">
        <u-empty v-if="equipmentList.length === 0"
                 text="暂无数据"
                 icon="http://cdn.uviewui.com/uview/empty/car.png">
        </u-empty>
        <view v-else class="card" v-for="(item, index) in equipmentList" :key="index" @click="handleClick(item)">
          <view class="left">
            <u-image :src="droneSvg" mode="aspectFill" :width="70" :height="90"></u-image>
          </view>

 uniapps/work-wx/src/pages/page/index.vue

@@ -147,8 +147,8 @@
// 获取轮播图
  async function getLBListTest() {
    const res = await getLBList({})
    console.log(res, '8898')
    lbList.value = res.data.data.map(item => ({
    // 排除annexUrl为空的项
    lbList.value = res.data.data.filter(item => item.annexUrl).map(item => ({
      ...item,
      image: item.annexUrl,
      title: item.bannerTitle,

 uniapps/work-wx/src/static/images/lb_bottom.png

 uniapps/work-wx/src/static/images/lbt.png

 uniapps/work-wx/src/static/images/logo1.png

 uniapps/work-wx/src/static/images/user/department.png

 uniapps/work-wx/src/static/images/user/info.png

 uniapps/work-wx/src/static/images/user/password.png

 uniapps/work-wx/src/static/images/user/rightBtn.png

 uniapps/work-wx/src/subPackages/flightApplication/index.vue

@@ -18,8 +18,13 @@
            <view class="sp-title">
                审批记录
            </view>

            <u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
                <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
              <u-empty v-if="approvalRecords.length === 0"
                       text="暂无数据"
                       icon="http://cdn.uviewui.com/uview/empty/car.png">
              </u-empty>
                <view v-else class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
                    <view class="name-status">
                        <view class="name-image">
                            <u-image :src="spSvg" class="icon" width="16" height="16"></u-image>
@@ -297,7 +302,7 @@
            color: #FFFFFF;
            padding: 0 6rpx;

            

        }

    }