Merge remote-tracking branch 'origin/master'

张含笑

2025-10-15 b642a20e0cc04ae0b7b1a803439411f49fe0b576

 src/pages.json

@@ -7,7 +7,8 @@
      "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
    }
  },
  "pages": [{
  "pages": [
    {
      "path": "pages/map/index",
      "style": {
        "navigationBarTitleText": "地图"
@@ -18,7 +19,8 @@
      "style": {
        "navigationBarTitleText": "巡检任务"
      }
    }, {
    },
    {
      "path": "pages/work/index",
      "style": {
        "navigationBarTitleText": "事件工单"
@@ -31,7 +33,14 @@
      }
    },
    {
      "path": "pages/droneConsole/index",
      "path": "pages/inspectionTask/TaskDetails/TaskDetails",
      "style": {
        "navigationBarTitleText": "执行中",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/inspectionTask/TaskDetails/DroneConsole/DroneConsole",
      "style": {
        "navigationBarTitleText": "控制台",
        "navigationStyle": "custom"
@@ -44,107 +53,106 @@
      }
    }
  ],
  "subPackages": [{
    "root": "subPackages",
    "pages": [
      {
        "path": "404/index",
        "style": {
          "navigationBarTitleText": "404",
          "navigationStyle": "custom"
  "subPackages": [
    {
      "root": "subPackages",
      "pages": [
        {
          "path": "404/index",
          "style": {
            "navigationBarTitleText": "404",
            "navigationStyle": "custom"
          }
        },
        {
          "path": "theme/index",
          "style": {
            "navigationBarTitleText": "主题设置"
          }
        },
        {
          "path": "taskDetail/index",
          "style": {
            "navigationBarTitleText": "任务详情"
          }
        },
        {
          "path": "taskDetail/addTask/index",
          "style": {
            "navigationBarTitleText": "新建任务"
          }
        },
        {
          "path": "taskDetail/execution/index",
          "style": {
            "navigationBarTitleText": "任务详情"
          }
        },
        {
          "path": "taskDetail/inExecution/index",
          "style": {
            "navigationBarTitleText": "执行中"
          }
        },
        {
          "path": "workDetail/index",
          "style": {
            "navigationBarTitleText": "工单详情"
          }
        },
        {
          "path": "workDetail/addWork/index",
          "style": {
            "navigationBarTitleText": "新建工单"
          }
        },
        {
          "path": "workDetail/mapWork/index",
          "style": {
            "navigationBarTitleText": "地图展示"
          }
        },
        {
          "path": "workDetail/photoMagnify/index",
          "style": {
            "navigationBarTitleText": "照片放大"
          }
        },
        {
          "path": "userDetail/infos/index",
          "style": {
            "navigationBarTitleText": "个人资料"
          }
        },
        {
          "path": "userDetail/password/index",
          "style": {
            "navigationBarTitleText": "修改密码"
          }
        },
        {
          "path": "browser/index",
          "style": {
            "navigationBarTitleText": "地图"
          }
        },
        {
          "path": "qrCode/index",
          "style": {
            "navigationBarTitleText": "扫码",
            "navigationBarTextStyle": "black"
          }
        }
      },
      {
        "path": "theme/index",
        "style": {
          "navigationBarTitleText": "主题设置"
        }
      },
      {
        "path": "taskDetail/index",
        "style": {
          "navigationBarTitleText": "任务详情"
        }
      },

      {
        "path": "taskDetail/addTask/index",
        "style": {
          "navigationBarTitleText": "新建任务"
        }
      },

      {
        "path": "taskDetail/execution/index",
        "style": {
          "navigationBarTitleText": "任务详情"
        }
      },

      {
        "path": "taskDetail/inExecution/index",
        "style": {
          "navigationBarTitleText": "执行中"
        }
      },

      {
        "path": "workDetail/index",
        "style": {
          "navigationBarTitleText": "工单详情"
        }
      },

      {
        "path": "workDetail/addWork/index",
        "style": {
          "navigationBarTitleText": "新建工单"
        }
      },

      {
        "path": "workDetail/mapWork/index",
        "style": {
          "navigationBarTitleText": "地图展示"
        }
      },

      {
        "path": "workDetail/photoMagnify/index",
        "style": {
          "navigationBarTitleText": "照片放大"
        }
      },

      {
        "path": "userDetail/infos/index",
        "style": {
          "navigationBarTitleText": "个人资料"
        }
      },

      {
        "path": "userDetail/password/index",
        "style": {
          "navigationBarTitleText": "修改密码"
        }
      },

      {
        "path": "browser/index",
        "style": {
          "navigationBarTitleText": "地图"
        }
      }
    ]
  }],

      ]
    }
  ],
  "tabBar": {
    "color": "#1b233b",
    "selectedColor": "#21d59d",
    "borderStyle": "black",
    "backgroundColor": "#ffffff",
    "list": [{
    "list": [
      {
        "iconPath": "static/images/tabbar/icon_home.png",
        "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
        "pagePath": "pages/map/index",
@@ -155,7 +163,8 @@
        "selectedIconPath": "static/images/tabbar/icon_list_selected.png",
        "pagePath": "pages/inspectionTask/index",
        "text": "巡检任务"
      }, {
      },
      {
        "iconPath": "static/images/tabbar/icon_home.png",
        "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
        "pagePath": "pages/work/index",
@@ -175,4 +184,4 @@
    "navigationBarBackgroundColor": "#F8F8F8",
    "backgroundColor": "#F8F8F8"
  }
}
}