Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-28 e290789c592db88cfbffac7ecbdcd8f998e45796

Merge remote-tracking branch 'origin/master'

 minipro_standard/pages.json

@@ -1,104 +1,92 @@
{

    "pages": [

        // {
        //     "path": "pages/workbench/workbench",
        //     "style": {
        //         "navigationBarTitleText": "工作台",
        //         "enablePullDownRefresh": false
        //     }
        // },
    "pages": [{

            "path": "pages/workbench/workbench",

            "style": {

                "navigationBarTitleText": "工作台",

                "enablePullDownRefresh": false

            }

        },

        {

            "path": "pages/index/index",

            "style": {

                "navigationBarTitleText": "",

                "navigationStyle": "custom"

            }

        }, {

            "path": "pages/mine/mine",

            "style": {

                "navigationBarTitleText": "我的",

                "enablePullDownRefresh": false

            }

        }, {

            "path": "pages/login/login",

            "style": {

                "navigationBarTitleText": "登录",

                "enablePullDownRefresh": false,

                "navigationStyle": "custom"

            }

        }, {

            "path": "pages/personal/personal",

            "style": {

                "navigationBarTitleText": "个人信息",

                "enablePullDownRefresh": false

            }



        }, {

            "path": "pages/changePassword/changePassword",

            "style": {

                "navigationBarTitleText": "修改密码",

                "enablePullDownRefresh": false

            }



        }, {

            "path": "pages/updatePhone/updatePhone",

            "style": {

                "navigationBarTitleText": "更新手机号",

                "enablePullDownRefresh": false

            }



        }, {

            "path": "pages/updateMailbox/updateMailbox",

            "style": {

                "navigationBarTitleText": "更新邮箱号",

                "enablePullDownRefresh": false

            }



        }

        // ,  {

        //     "path": "pages/mine/mine",

        //     "style": {

        //         "navigationBarTitleText": "我的",

        //         "enablePullDownRefresh": false

        //     }

        // }

     //    ,{

  //           "path" : "pages/login/login",
  //           "style" :                                                                                    
  //           {
  //               "navigationBarTitleText": "登录",
  //               "enablePullDownRefresh": false,
        //         "navigationStyle": "custom"
  //           }

  //       }

  //       ,{

  //           "path" : "pages/personal/personal",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "个人信息",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

  //       ,{

  //           "path" : "pages/changePassword/changePassword",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "修改密码",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

  //       ,{

  //           "path" : "pages/updatePhone/updatePhone",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "更新手机号",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

  //       ,{

  //           "path" : "pages/updateMailbox/updateMailbox",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "更新邮箱号",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

    ],

    ],

    "globalStyle": {

        "navigationBarTextStyle": "black",

        "navigationBarTitleText": "uni-app",
        "navigationBarTitleText": "uni-app",

        "navigationBarBackgroundColor": "#ffffff",

        "backgroundColor": "#ffffff",

        "navigationStyle": "custom"

    },
    // "tabBar": {
    //     "color": "#666666",
    //     "selectedColor": "#222222",
    //     "borderStyle": "black",
    //     "backgroundColor": "#fff",
    //     "list": [
    //         {
    //             "pagePath": "pages/index/index",
    //             "iconPath": "static/nav_daiban@2x.png",
    //             "selectedIconPath": "static/nav_daiban_sel@2x.png",
    //             "text": "待办"
    //         },
    //         {
    //             "pagePath": "pages/workbench/workbench",
    //             "iconPath": "static/nav_gongzuotai@2x.png",
    //             "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
    //             "text": "工作台"
    //         },
    //         {
    //             "pagePath": "pages/mine/mine",
    //             "iconPath": "static/nav_wode@2x.png",
    //             "selectedIconPath": "static/nav_wode_sel@2x.png",
    //             "text": "我的"
    //         }
    //     ]
    // },

        "backgroundColor": "#ffffff"

        // "navigationStyle": "custom"

    },

    "tabBar": {

        "color": "#666666",

        "selectedColor": "#222222",

        "borderStyle": "black",

        "backgroundColor": "#fff",

        "list": [

            {

                "pagePath": "pages/index/index",

                "iconPath": "static/nav_daiban@2x.png",

                "selectedIconPath": "static/nav_daiban_sel@2x.png",

                "text": "待办"

            },

            {

                "pagePath": "pages/workbench/workbench",

                "iconPath": "static/nav_gongzuotai@2x.png",

                "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",

                "text": "工作台"

            },

            {

                "pagePath": "pages/mine/mine",

                "iconPath": "static/nav_wode@2x.png",

                "selectedIconPath": "static/nav_wode_sel@2x.png",

                "text": "我的"

            }

        ]

    },

    "uniIdRouter": {}

}

 minipro_standard/pages/index/index.vue

@@ -1,16 +1,16 @@
<template>

    <view class="index">

        <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view>

        <!-- <myTabbar :index="0" /> -->

        <!-- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view> -->

        <myTabbar :index="0" />

    </view>

</template>



<script>

    // import myTabbar from "@/components/myTabber.vue"	
    import myTabbar from "@/components/myTabber.vue"	
    export default {

        // components: {

        //     myTabbar

        // },

        components: {

            myTabbar

        },

        data() {

            return {

                code: '',


 screen_standard/vite.config.js

@@ -53,20 +53,8 @@
          changeOrigin: true,
          ws: false,  // 允许websocket代理
          secure: false,
<<<<<<< HEAD
          rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
        }
=======
          rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
          // rewrite: (path) => path.replace(/^\api/, ''), // 将api替换为空
        },
        /*'/api' : {
          target: env.VITE_BASE_URL, // 通过代理接口访问实际地址。这里是实际访问的地址。vue会通过代理服务器来代理请求
          changeOrigin: true,
          ws: false,  // 允许websocket代理
          rewrite: (path) => path.replace(/^\api/, ''), // 将api替换为空
        }*/
>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
      }
    }
  }

 server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java

@@ -44,12 +44,14 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:unqualifiedRecord:create")
    public ApiResponse<PageData<UnqualifiedRecord>> findJoinPage (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap) {
        return ApiResponse.success(unqualifiedRecordService.findJoinPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:unqualifiedRecord:exportExcel")
    public void exportExcel (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap, HttpServletResponse response) throws Exception{
        List<UnqualifiedRecord> list  = unqualifiedRecordService.findJoinPage(pageWrap).getRecords();
        List<UnqualifiedRecordVO> voList = new ArrayList<>();

 server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java

@@ -63,7 +63,7 @@


    @ApiModelProperty(value = "检验类型 0巡线、1巡检、2终检", example = "1")
    @ExcelColumn(name="检验类型" ,valueMapping = "0=巡线;1=巡检;2=终检",index = 9,width =15)
    @ExcelColumn(name="检验类型" ,valueMapping = "0=巡线;1=巡检;2=完工检",index = 9,width =15)
    private String checkTypename;