From a8703aad8618c20f89ac0f1ae1ba434f47e71db9 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 21 Aug 2024 11:29:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=9B=B2=E9=98=B3=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?u-upload=E4=BE=9D=E8=B5=96=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 21 - common/http.api.js | 18 +- manifest.json | 7 +- package.json | 13 - pages.json | 88 ++-- pages/exam/detail.vue | 341 +++++++++++++++ pages/exam/erroRrecord.vue | 8 + pages/exam/exam.vue | 226 ++++++++++ pages/exam/index.vue | 126 ++++++ pages/exam/main.vue | 393 ++++++++++++++++++ pages/exam/preview.vue | 136 ++++++ pages/exam/question.vue | 75 ++++ pages/exam/record.vue | 210 ++++++++++ pages/exam/result.vue | 107 +++++ pages/exam/test.vue | 56 +++ pages/exam/testDetail.vue | 294 +++++++++++++ pages/home/detail/ticketHandle.vue | 113 ++++- pages/home/home_.vue | 138 +++++- pages/my/my.vue | 21 +- pages/workSpace/operation/oplDetail.vue | 220 +++++++++- static/exam/cross.png | Bin 0 -> 6330 bytes static/exam/error.png | Bin 0 -> 5345 bytes static/home/fafang.png | Bin 0 -> 6270 bytes static/home/kaoqin.png | Bin 0 -> 5403 bytes store/index.js | 9 +- uni.scss | 10 + uview-ui/components/u-calendar/u-calendar.vue | 6 +- .../u-collapse-item/u-collapse-item.vue | 3 +- uview-ui/components/u-image/u-image.vue | 1 + uview-ui/components/u-input/u-input.vue | 11 +- .../components/u-number-box/u-number-box.vue | 2 +- uview-ui/components/u-select/u-select.vue | 7 +- uview-ui/components/u-tabs/u-tabs.vue | 4 +- uview-ui/components/u-th/u-th.vue | 2 +- uview-ui/components/u-upload/u-upload.vue | 29 +- uview-ui/components/uview-v1/uview-v1.vue | 0 uview-ui/libs/config/config.js | 6 +- uview-ui/libs/function/guid.js | 4 +- uview-ui/libs/function/test.js | 4 +- uview-ui/libs/mixin/mixin.js | 2 +- uview-ui/libs/util/async-validator.js | 2 +- uview-ui/package.json | 68 ++- 42 files changed, 2596 insertions(+), 185 deletions(-) delete mode 100644 LICENSE delete mode 100644 package.json create mode 100644 pages/exam/detail.vue create mode 100644 pages/exam/erroRrecord.vue create mode 100644 pages/exam/exam.vue create mode 100644 pages/exam/index.vue create mode 100644 pages/exam/main.vue create mode 100644 pages/exam/preview.vue create mode 100644 pages/exam/question.vue create mode 100644 pages/exam/record.vue create mode 100644 pages/exam/result.vue create mode 100644 pages/exam/test.vue create mode 100644 pages/exam/testDetail.vue create mode 100644 static/exam/cross.png create mode 100644 static/exam/error.png create mode 100644 static/home/fafang.png create mode 100644 static/home/kaoqin.png create mode 100644 uview-ui/components/uview-v1/uview-v1.vue diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8e39ead..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 www.uviewui.com - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/common/http.api.js b/common/http.api.js index 5b05a61..2553e49 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -121,6 +121,14 @@ const install = (Vue, vm) => { let tdevice = (data={}) => vm.$u.get(`/third/tdevice/`, data); //设备列表 let eventCateList = (data={}) => vm.$u.get(`/ecm/event_cate/`, data); //算法列表 let algoCreate = (data={}) => vm.$u.post(`/ecm/algo_vchannel/`, data); //算法列表 + + let getExamList = (data={})=>vm.$u.get('/edu/exam/', data);//考试列表 + let startExam = (id)=>vm.$u.post(`/edu/exam/${id}/attend/`);//开始考试 + let submitExam = (id,data={})=>vm.$u.post(`/edu/examrecord/${id}/submit/`,data);//提交 + let examRecord = (data={})=>vm.$u.get(`/edu/examrecord/`,data);//考试记录 + let examRecordDetail = (id,data={})=>vm.$u.get(`/edu/examrecord/${id}/`,data);//考试记录详情 + let paperDetail = (id,data={})=>vm.$u.get(`/edu/paper/${id}/`,data);//测试 + let questionList = (data={})=>vm.$u.get(`/edu/question/`,data);//题目 vm.$u.api = { getUserInfo , @@ -224,7 +232,15 @@ const install = (Vue, vm) => { tdevice, eventCateList, - algoCreate + algoCreate, + + getExamList, + startExam, + submitExam, + examRecord, + paperDetail, + questionList, + examRecordDetail, }; } diff --git a/manifest.json b/manifest.json index 79ace97..bf66a2e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "曲阳金隅EHS", "appid" : "__UNI__B00D419", "description" : "曲阳金隅EHS", - "versionName" : "2.01.03", - "versionCode" : 200103, + "versionName" : "2.01.11", + "versionCode" : 200104, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -128,7 +128,8 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://222.222.144.147:6013/api/", + "target" : "http://49.232.14.174:2226/api/", + // "target" : "http://222.222.144.147:6013/api/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/package.json b/package.json deleted file mode 100644 index a01ec6c..0000000 --- a/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "uView-UI", - "name": "uView UI已发布Sketch和Axure设计资源", - "version": "1.8.4", - "description": "uView正在研发2.0版本，将会全面兼容Nvue，并引入大量激动人心的创新功能", - "keywords": [ - "uView", - "uViewUI", - "UI", - "UI框架", - "uni-app" - ] -} diff --git a/pages.json b/pages.json index 00dede6..4642f95 100644 --- a/pages.json +++ b/pages.json @@ -2,46 +2,24 @@ "easycom": { "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, - // "condition": { //模式配置，仅开发期间生效 - // "current": 0, //当前激活的模式(list 的索引项) - // "list": [{ - // "name": "test", //模式名称 - // "path": "pages/componentsC/test/index", //启动页面，必选 - // "query": "uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1" //启动参数，在页面的onLoad函数里面得到 - // }] - // }, + "pages": [{ "path": "pages/login/login_", "style": { - "navigationBarTitleText": "曲阳金隅EHS-密码登录", + "navigationBarTitleText": "密码登录", "enablePullDownRefresh": false } }, { "path": "pages/login/userRegister", "style": { - "navigationBarTitleText": "曲阳金隅EHS-新用户注册", + "navigationBarTitleText": "新用户注册", "enablePullDownRefresh": false } }, - // { - // "path" : "pages/login/login", - // "style" : - // { - // "navigationBarTitleText": "验证码登录", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/login/login_password", - // "style": { - // "navigationBarTitleText": "密码登录", - // "enablePullDownRefresh": false - // } - // }, { "path": "pages/home/home_", "style": { - "navigationBarTitleText": "曲阳金隅EHS主页", + "navigationBarTitleText": "主页", "enablePullDownRefresh": false } }, @@ -350,7 +328,7 @@ { "path": "pages/my/my", "style": { - "navigationBarTitleText": "曲阳金隅EHS-个人中心", + "navigationBarTitleText": "个人中心", "enablePullDownRefresh": false } }, @@ -444,6 +422,62 @@ } } + ,{ + "path" : "pages/exam/exam", + "style" : + { + "navigationBarTitleText": "考试列表", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/exam/preview", + "style" : + { + "navigationBarTitleText": "考前须知", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + },{ + "path" : "pages/exam/main", + "style" : + { + "navigationBarTitleText": "考试", + // "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + },{ + "path" : "pages/exam/record", + "style" : + { + "navigationBarTitleText": "考试记录", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + },{ + "path" : "pages/exam/result", + "style" : + { + "navigationBarTitleText": "考试结果", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + },{ + "path" : "pages/exam/detail", + "style" : + { + "navigationBarTitleText": "考试详情", + // "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } ,{ "path" : "pages/my/suanfa", "style" : diff --git a/pages/exam/detail.vue b/pages/exam/detail.vue new file mode 100644 index 0000000..977c3a8 --- /dev/null +++ b/pages/exam/detail.vue @@ -0,0 +1,341 @@ + + + + + \ No newline at end of file diff --git a/pages/exam/erroRrecord.vue b/pages/exam/erroRrecord.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/pages/exam/erroRrecord.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/pages/exam/exam.vue b/pages/exam/exam.vue new file mode 100644 index 0000000..ac30926 --- /dev/null +++ b/pages/exam/exam.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/pages/exam/index.vue b/pages/exam/index.vue new file mode 100644 index 0000000..cf60dc8 --- /dev/null +++ b/pages/exam/index.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/pages/exam/main.vue b/pages/exam/main.vue new file mode 100644 index 0000000..7a3dd7f --- /dev/null +++ b/pages/exam/main.vue @@ -0,0 +1,393 @@ + + + + + \ No newline at end of file diff --git a/pages/exam/preview.vue b/pages/exam/preview.vue new file mode 100644 index 0000000..9f97e3c --- /dev/null +++ b/pages/exam/preview.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/pages/exam/question.vue b/pages/exam/question.vue new file mode 100644 index 0000000..1513a2f --- /dev/null +++ b/pages/exam/question.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/pages/exam/record.vue b/pages/exam/record.vue new file mode 100644 index 0000000..6fb3d43 --- /dev/null +++ b/pages/exam/record.vue @@ -0,0 +1,210 @@ + + + + + diff --git a/pages/exam/result.vue b/pages/exam/result.vue new file mode 100644 index 0000000..7348500 --- /dev/null +++ b/pages/exam/result.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/pages/exam/test.vue b/pages/exam/test.vue new file mode 100644 index 0000000..a36599a --- /dev/null +++ b/pages/exam/test.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/pages/exam/testDetail.vue b/pages/exam/testDetail.vue new file mode 100644 index 0000000..95ed8a3 --- /dev/null +++ b/pages/exam/testDetail.vue @@ -0,0 +1,294 @@ + + + + + \ No newline at end of file diff --git a/pages/home/detail/ticketHandle.vue b/pages/home/detail/ticketHandle.vue index 57f2854..2c4156b 100644 --- a/pages/home/detail/ticketHandle.vue +++ b/pages/home/detail/ticketHandle.vue @@ -376,8 +376,24 @@ + + + * + 审批图片 + + + + + + * + 开始图片 + + + - + * 审批意见 @@ -451,8 +467,10 @@ form: { suggestion: '', close_note: '', - close_dos: '' + close_dos: '', }, + audit_imgs:[], + work_imgs:[], ticketId: null, cateType: null, operation: null, @@ -461,7 +479,8 @@ detail: false, isDisabled: false, btnShow: true, - + work_imgs_show:false, + audit_imgs_show:true, ticketDetail: { intervene_type: 0 }, @@ -573,7 +592,10 @@ text: '其他' }, ], + header:{}, dosOption: [], + fileList:[], + fileList2:[], } }, computed: { @@ -594,6 +616,7 @@ that.type = params.type; }, mounted() { + this.getHeader(); this.$u.api.getTicketLog(this.ticketId).then((res) => { this.tLog = res; }); @@ -611,6 +634,13 @@ }, methods: { + getHeader() { + + this.header = { + Authorization: "Bearer " + this.vuex_token + } + console.log('this.header',this.header) + }, addNodeEnd() { this.$u.api.addNodeEnd(this.ticketId, {suggestion: this.form.suggestion}).then((res) => { uni.navigateBack() @@ -651,15 +681,41 @@ //许可证详情 getOpl() { + let that = this; this.$u.api.oplItem(this.projectId).then((res) => { // debugger; this.oplDetail = res; + that.audit_imgs = []; + that.fileList = []; + if(res.audit_imgs_!==null&&res.audit_imgs_.length>0){ + that.audit_imgs = res.audit_imgs; + res.audit_imgs_.forEach(item=>{ + that.fileList.push({ + url: that.vuex_host+item.path, + id:item.id, + }) + }) + } + }); }, //获取应有的流转 getBtns() { - this.$u.api.getTicketTransitions(this.ticketId).then(res => { - this.operationBtn = res; + let that = this; + that.work_imgs_show = false; + that.audit_imgs_show = false; + this.$u.api.getTicketTransitions(that.ticketId).then(res => { + that.operationBtn = res; + if(res.length>0){ + for (let i=0;i0){ + console.log(that.audit_imgs) + params.ticket_data.audit_imgs = that.audit_imgs; + }else{ + uni.showToast({ + title: '请上传审批图片', + icon: "none" + }) + return; + } + } + if(that.work_imgs.length>0){ + params.ticket_data.work_imgs = that.work_imgs; + } + console.log(params); uni.showLoading({ mask: true, title: '正在提交...' }) - this.$u.api.ticketHandle(this.ticketId, params).then(res => { + that.$u.api.ticketHandle(that.ticketId, params).then(res => { uni.hideLoading() uni.navigateBack() }).catch(e => { @@ -822,7 +895,23 @@ } }, - + imgRemove(index,list,inde){ + this.audit_imgs.splice(index,1); + }, + imgUpSuccess(data,index,list){ + console.log(data,index,list) + uni.showToast({ + title:index, + icon: "none", + }) + this.audit_imgs.push(data.id); + }, + imgRemove2(index,list,inde){ + this.work_imgs.splice(index,1); + }, + imgUpSuccess2(data,index,list){ + this.work_imgs.push(data.id); + }, } } @@ -939,7 +1028,7 @@ height: 179rpx; background-color: #f6f8fc; border: solid 1rpx #e5e5e5; - margin-top: 21rpx; + margin-top: 0; padding: 14rpx 24rpx; font-size: 26rpx; box-sizing: border-box; diff --git a/pages/home/home_.vue b/pages/home/home_.vue index a36eb2e..523c8ab 100644 --- a/pages/home/home_.vue +++ b/pages/home/home_.vue @@ -21,7 +21,48 @@ 事件提醒 - + + @@ -30,13 +71,18 @@ 待审批 + + + + + 查看更多 - + {{item.title}} @@ -71,7 +117,10 @@ - + + 展开查看 + + 暂无待办工单 @@ -85,13 +134,17 @@ 抄送我 + + + + 查看更多 - + {{item.title}} @@ -109,7 +162,10 @@ - + + 展开查看 + + 暂无待办工单 @@ -122,13 +178,17 @@ 最近发生 + + + + 查看更多 - + 事件类型: {{cate.name}} @@ -145,7 +205,10 @@ - + + 展开查看 + + 今日暂无事件 @@ -155,12 +218,6 @@ 下载中 请勿退出 {{percentVal}}% - @@ -190,6 +247,8 @@ eventCount: 0, ticketCount: 0, copyCount:0, + examCount:0, + recordCount:0, act_states: { 0: "草稿中", 1: "进行中", @@ -198,7 +257,9 @@ 4: "已完成", 5: "已关闭", }, - // 2022年2月18日 + daibanShow:true, + copyShow:true, + tongzhiShow:true, mytopimg: require("@/static/home/bgimg-top.jpg"), } }, @@ -220,11 +281,47 @@ this.getcopy(); this.getEventAgg(); this.getEvent(); + this.getExams(); + this.getExamRecord(); } }, methods: { closeP(){}, + getExams(){ + let that = this; + that.$u.api.getExamList({ + can_attend:true, + is_my:true, + page:1, + page_size:1, + }).then(res=>{ + if(res.count){ + that.examCount = res.count; + } + }) + }, + getExamRecord(){ + let that = this; + that.$u.api.examRecord({ + page:1, + page_size:1, + is_my:true, + }).then(res=>{ + if(res.count){ + that.recordCount = res.count; + } + }) + }, + daibanChange(){ + this.daibanShow = !this.daibanShow; + }, + copyChange(){ + this.copyShow = !this.copyShow; + }, + tongzhiChange(){ + this.tongzhiShow = !this.tongzhiShow; + }, checkVersion() { let that = this; uni.getSystemInfo({ @@ -351,6 +448,16 @@ }) }, goIntoTargetPage(type) { + if (type == "exam") { + uni.navigateTo({ + url: "/pages/exam/exam" + }) + } + if (type == "record") { + uni.navigateTo({ + url: "/pages/exam/record" + }) + } if(this.limitedVisit==true){ }else{ let params = `?type=${type}`; @@ -460,9 +567,6 @@ background-color: #ffffff; border-radius: 10rpx; margin: 0 auto; - margin-top: 88rpx; - } - .copy01{ margin-top: 20upx; } .title { diff --git a/pages/my/my.vue b/pages/my/my.vue index 078f450..70010ea 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -29,17 +29,23 @@ - - - 我的证书 - - 我的资料 + + + + 我的证书 + + @@ -152,6 +158,11 @@ url: '/pages/my/suanfa' }) } + else if (type == "exam") { + uni.navigateTo({ + url: '/pages/exam/record' + }) + } }, getUserInfo() { var promise; diff --git a/pages/workSpace/operation/oplDetail.vue b/pages/workSpace/operation/oplDetail.vue index a7f2e9a..db67445 100644 --- a/pages/workSpace/operation/oplDetail.vue +++ b/pages/workSpace/operation/oplDetail.vue @@ -75,11 +75,23 @@ - 现场照片 + 申请照片 + + 审批照片 + + + + + + 开始照片 + + + + 关闭照片 @@ -120,7 +132,9 @@ - 气体检测记录： + 气体检测记录： + 新增 + @@ -203,7 +217,74 @@ - + + + + 气体检测记录 + + +
+ + 检测时间： + + + + 检测部位： + + + + O2(%)： + + + + CO： + + + + 可燃气体： + + + + h2s： + + + + 45℃： + + + + 检验结论： + + + + + + + 检测人： + + + {{checker_name}} + + + + + + + +
+ + + @@ -226,16 +307,27 @@ mtask_uid:null }, create_imgs_list: [], + audit_imgs: [], + work_imgs:[], close_imgs_list: [], msOptions:{ "REVOKED": "已停止", "STARTED": "进行中", "SUCCESS": "已完成" }, + gasForm: { + opl: '', + check_time: null, + check_place:'', + is_ok:true, + checker:'', + }, + checker_name:'', preImgSrc:'', workerItem:{}, preImg:false, detailLimited:false, + limitedDialog:false, workerList:[], gasList:[], act_states: { @@ -272,10 +364,22 @@ id:item.id, }) }) - res.close_imgs_.forEach(item=>{ + res.audit_imgs_.forEach(item2=>{ + that.audit_imgs.push({ + url: that.vuex_host+item2.path, + id:item2.id, + }) + }) + res.close_imgs_.forEach(item3=>{ that.close_imgs_list.push({ - url: that.vuex_host+item.path, - id:item.id, + url: that.vuex_host+item3.path, + id:item3.id, + }) + }) + res.work_imgs_.forEach(item4=>{ + that.work_imgs.push({ + url: that.vuex_host+item4.path, + id:item4.id, }) }) }); @@ -295,6 +399,34 @@ that.gasList =res; }) }, + gas_add(){ + console.log('gas_add') + this.limitedDialog = true; + }, + gas_add_close() { + this.limitedDialog = false; + }, + showCheckerPicker() { + let params='?type=checker&typeName=checker_name' + uni.navigateTo({ + url:"../../comm/userSelect/index"+params + }) + }, + + timeChange(e){ + this.gasForm.check_time = e.detail.value; + }, + gasformSubmit(val) { + let that = this; + that.gasForm.opl = that.oplId; + that.gasForm.checker = that.formData.checker; + that.$u.api.oplGasCreate(that.gasForm).then(res => { + if (res.err_msg) {} else { + that.getgasList(); + that.limitedDialog = false; + } + }) + }, mtaskStateChange(type){ let that = this; uni.showLoading({ @@ -473,6 +605,7 @@ .wrap-top{ line-height: 60upx; margin-top: 20upx; + position: relative; } .item { margin: 0rpx 32rpx; @@ -633,4 +766,79 @@ left: 50%; transform: translate(-50% ,-50%); } + .gasAdd{ + position: absolute; + right: 15rpx; + top: 26rpx; + } + .dialogWrap { + position: fixed; + width: 100vw; + height: 100vh; + background-color: rgba(0, 0, 0, .3); + top: 0; + left: 0; + z-index: 110; + } + + .dialogCont { + width: 92vw; + position: absolute; + top: 50%; + margin: auto; + background-color: #ffffff; + left: 4vw; + transform: translateY(-50%); + padding: 20rpx; + border-radius: 20rpx; + } + + .dialogTitle { + font-size: 36rpx; + padding-bottom: 20rpx; + border-bottom: 1upx solid #eeeeee; + display: flex; + justify-content: space-between; + } + + .uni-form-item { + padding: 10px 0; + display: flex; + border-bottom: 1upx solid #eeeeee; + } + + .uni-form-item>.title, + >>>uni-input, + >>>.uni-input, + >>>.uni-input-wrapper, + >>>.input-placeholder { + height: 80upx; + line-height: 80upx; + font-size: 32upx; + width: 160upx; + } + + >>>uni-input, + >>>.uni-input, + >>>.uni-input-wrapper, + >>>.input-placeholder { + width: 100%; + } + + .content { + flex: 1; + } + + .uni-btn-v { + text-align: center; + } + + .dialogCloseImg { + width: 52rpx; + height: 52rpx; + background-image: url('../../../static/my/my_apply/zuofei.png'); + background-repeat: no-repeat; + background-size: cover; + } + diff --git a/static/exam/cross.png b/static/exam/cross.png new file mode 100644 index 0000000000000000000000000000000000000000..91c9d9322feb33a4973831e8920863f3f455da48 GIT binary patch literal 6330 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 literal 0 HcmV?d00001 diff --git a/static/exam/error.png b/static/exam/error.png new file mode 100644 index 0000000000000000000000000000000000000000..5de2ceb9bf6ede1fed27f4bccb89ad24be192bb7 GIT binary patch literal 5345 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 literal 0 HcmV?d00001 diff --git a/static/home/fafang.png b/static/home/fafang.png new file mode 100644 index 0000000000000000000000000000000000000000..f948b8cde3e9bcc0da989ac21df282bc75f34da2 GIT binary patch literal 6270 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 v51NeEcZ00+B;^;1-vF_}1083bM5IK6;+7}3 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.uni-navbar__header, + >>>.uni-status-bar{ + background-image: linear-gradient(270deg, + #0ca7ee 0%, + #005aff 100%, + #2a8cff 100%, + #54bdff 100%), + linear-gradient(#e60012, + #e60012); + } \ No newline at end of file diff --git a/uview-ui/components/u-calendar/u-calendar.vue b/uview-ui/components/u-calendar/u-calendar.vue index 2b30184..70059cb 100644 --- a/uview-ui/components/u-calendar/u-calendar.vue +++ b/uview-ui/components/u-calendar/u-calendar.vue @@ -288,6 +288,10 @@ }, init() { let now = new Date(); + let minDate = new Date(this.minDate); + let maxDate = new Date(this.maxDate); + if (now < minDate) now = minDate; + if (now > maxDate) now = maxDate; this.year = now.getFullYear(); this.month = now.getMonth() + 1; this.day = now.getDate(); @@ -636,4 +640,4 @@ } } } - \ No newline at end of file + diff --git a/uview-ui/components/u-collapse-item/u-collapse-item.vue b/uview-ui/components/u-collapse-item/u-collapse-item.vue index 3b66bfa..6656657 100644 --- a/uview-ui/components/u-collapse-item/u-collapse-item.vue +++ b/uview-ui/components/u-collapse-item/u-collapse-item.vue @@ -110,7 +110,8 @@ this.parent = this.$u.$parent.call(this, 'u-collapse'); if(this.parent) { this.nameSync = this.name ? this.name : this.parent.childrens.length; - this.parent.childrens.push(this); + // 不存在时才添加本实例 + !this.parent.childrens.includes(this) && this.parent.childrens.push(this); this.headStyle = this.parent.headStyle; this.bodyStyle = this.parent.bodyStyle; this.arrowColor = this.parent.arrowColor; diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue index c729c3c..8a890be 100644 --- a/uview-ui/components/u-image/u-image.vue +++ b/uview-ui/components/u-image/u-image.vue @@ -172,6 +172,7 @@ export default { this.loading = false; } else { this.isError = false; + this.loading = true; } } } diff --git a/uview-ui/components/u-input/u-input.vue b/uview-ui/components/u-input/u-input.vue index f2aea72..301e800 100644 --- a/uview-ui/components/u-input/u-input.vue +++ b/uview-ui/components/u-input/u-input.vue @@ -50,6 +50,7 @@ :selection-end="uSelectionEnd" :selection-start="uSelectionStart" :show-confirm-bar="showConfirmbar" + :adjust-position="adjustPosition" @focus="onFocus" @blur="handleBlur" @input="handleInput" @@ -213,6 +214,11 @@ export default { showConfirmbar:{ type:Boolean, default:true + }, + // 弹出键盘时是否自动调节高度，uni-app默认值是true + adjustPosition: { + type: Boolean, + default: true } }, data() { @@ -300,11 +306,12 @@ export default { handleBlur(event) { // 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错 // 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时 + let value = event.detail.value; setTimeout(() => { this.focused = false; }, 100) // vue 原生的方法 return 出去 - this.$emit('blur', event.detail.value); + this.$emit('blur', value); setTimeout(() => { // 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理 // #ifdef MP-TOUTIAO @@ -312,7 +319,7 @@ export default { this.lastValue = value; // #endif // 将当前的值发送到 u-form-item 进行校验 - this.dispatch('u-form-item', 'on-form-blur', event.detail.value); + this.dispatch('u-form-item', 'on-form-blur', value); }, 40) }, onFormItemError(status) { diff --git a/uview-ui/components/u-number-box/u-number-box.vue b/uview-ui/components/u-number-box/u-number-box.vue index 54a679e..3b8e8bf 100644 --- a/uview-ui/components/u-number-box/u-number-box.vue +++ b/uview-ui/components/u-number-box/u-number-box.vue @@ -10,7 +10,7 @@ - + {{ item1[labelName] }} @@ -278,12 +278,13 @@ export default { let columnIndex = e.detail.value; // 由于后面是需要push进数组的，所以需要先清空数组 this.selectValue = []; + this.defaultSelector = columnIndex; if(this.mode == 'mutil-column-auto') { // 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化 this.lastSelectIndex.map((val, idx) => { if (val != columnIndex[idx]) index = idx; }); - this.defaultSelector = columnIndex; + for (let i = index + 1; i < this.columnNum; i++) { // 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的 // 默认是队列的第一个为默认选项 @@ -333,6 +334,8 @@ export default { }, close() { this.$emit('input', false); + // 重置default-value默认值 + this.$set(this, 'defaultSelector', [0]); }, // 点击确定或者取消 getResult(event = null) { diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue index 0c59658..3775fcd 100644 --- a/uview-ui/components/u-tabs/u-tabs.vue +++ b/uview-ui/components/u-tabs/u-tabs.vue @@ -3,9 +3,9 @@ background: bgColor }"> - + - + diff --git a/uview-ui/components/u-th/u-th.vue b/uview-ui/components/u-th/u-th.vue index 9fe5a16..c736b9b 100644 --- a/uview-ui/components/u-th/u-th.vue +++ b/uview-ui/components/u-th/u-th.vue @@ -39,7 +39,7 @@ style.padding = this.parent.padding; style.borderBottom = `solid 1px ${this.parent.borderColor}`; style.borderRight = `solid 1px ${this.parent.borderColor}`; - Object.assign(style, this.parent.style); + Object.assign(style, this.parent.thStyle); this.thStyle = style; } } diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue index fc6f2c5..481dc9d 100644 --- a/uview-ui/components/u-upload/u-upload.vue +++ b/uview-ui/components/u-upload/u-upload.vue @@ -21,7 +21,7 @@ { - return val.url == value.url; - }) - // 如果内部没有这个图片(tmp为false)，则添加到内部 - !tmp && this.lists.push({ url: value.url, error: false, progress: 100,id:value.id}); - }else{ - this.lists.push({ url: value, error: false, progress: 100}); - } - + let tmp = this.lists.some(val => { + return val.url == value.url; + }) + // 如果内部没有这个图片(tmp为false)，则添加到内部 + !tmp && this.lists.push({ url: value.url, error: false, progress: 100 }); }); } }, @@ -431,7 +421,11 @@ export default { name: this.name, formData: this.formData, header: this.header, + // #ifdef MP-ALIPAY + fileType:'image', + // #endif success: res => { + console.log(res) // 判断是否json字符串，将其转为json格式 let data = this.toJson && this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data; if (![200, 201, 204].includes(res.statusCode)) { @@ -441,6 +435,7 @@ export default { this.lists[index].response = data; this.lists[index].progress = 100; this.lists[index].error = false; + console.log(this.lists) this.$emit('on-success', data, index, this.lists, this.index); } }, @@ -508,7 +503,7 @@ export default { // 执行移除图片的动作，上方代码只是判断是否可以移除 handlerDeleteItem(index) { // 如果文件正在上传中，终止上传任务，进度在0 < progress < 100则意味着正在上传 - if (this.lists[index].process < 100 && this.lists[index].process > 0) { + if (this.lists[index].progress < 100 && this.lists[index].progress > 0) { typeof this.lists[index].uploadTask != 'undefined' && this.lists[index].uploadTask.abort(); } this.lists.splice(index, 1); diff --git a/uview-ui/components/uview-v1/uview-v1.vue b/uview-ui/components/uview-v1/uview-v1.vue new file mode 100644 index 0000000..e69de29 diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js index 44925a1..d77e971 100644 --- a/uview-ui/libs/config/config.js +++ b/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-03-17 -let version = '1.8.4'; +// 此版本发布于2022-04-19 +let version = '1.8.6'; export default { v: version, @@ -12,4 +12,4 @@ export default { 'error', 'warning' ] -} \ No newline at end of file +} diff --git a/uview-ui/libs/function/guid.js b/uview-ui/libs/function/guid.js index 8497664..e04190a 100644 --- a/uview-ui/libs/function/guid.js +++ b/uview-ui/libs/function/guid.js @@ -6,7 +6,7 @@ * v-for的时候,推荐使用后端返回的id而不是循环的index * @param {Number} len uuid的长度 * @param {Boolean} firstU 将返回的首字母置为"u" - * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制 + * @param {Number} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制 */ function guid(len = 32, firstU = true, radix = null) { let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split(''); @@ -29,7 +29,7 @@ function guid(len = 32, firstU = true, radix = null) { } } } - // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class + // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guid不能用作id或者class if (firstU) { uuid.shift(); return 'u' + uuid.join(''); diff --git a/uview-ui/libs/function/test.js b/uview-ui/libs/function/test.js index fd25e18..1fde462 100644 --- a/uview-ui/libs/function/test.js +++ b/uview-ui/libs/function/test.js @@ -2,7 +2,7 @@ * 验证电子邮箱格式 */ function email(value) { - return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value); + return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value); } /** @@ -37,7 +37,7 @@ function dateISO(value) { * 验证十进制数字 */ function number(value) { - return /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value) + return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value) } /** diff --git a/uview-ui/libs/mixin/mixin.js b/uview-ui/libs/mixin/mixin.js index e388986..cb64545 100644 --- a/uview-ui/libs/mixin/mixin.js +++ b/uview-ui/libs/mixin/mixin.js @@ -48,7 +48,7 @@ module.exports = { uni.$emit('uOnReachBottom') }, beforeDestroy() { - // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况 + // 判断当前页面是否存在parent和children，一般在checkbox和checkbox-group父子联动的场景会有此情况 // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱 if(this.parent && uni.$u.test.array(this.parent.children)) { // 组件销毁时，移除父组件中的children数组中对应的实例 diff --git a/uview-ui/libs/util/async-validator.js b/uview-ui/libs/util/async-validator.js index d7215b9..6183d0a 100644 --- a/uview-ui/libs/util/async-validator.js +++ b/uview-ui/libs/util/async-validator.js @@ -437,7 +437,7 @@ function range(rule, value, source, errors, options) { } if (str) { - // 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3 + // 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".length !== 3 val = value.replace(spRegexp, '_').length; } diff --git a/uview-ui/package.json b/uview-ui/package.json index 431d585..f911d31 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,39 +1,31 @@ { - "name": "uview-ui", - "version": "1.8.4", - "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", - "main": "index.js", - "keywords": [ - "uview", - "uView", - "uni-app", - "uni-app ui", - "uniapp", - "uviewui", - "uview ui", - "uviewUI", - "uViewui", - "uViewUI", - "uView UI", - "uni ui", - "uni UI", - "uniapp ui", - "ui", - "UI框架", - "uniapp ui框架", - "uniapp UI" - ], - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "" - }, - "devDependencies": { - "node-sass": "^4.14.0", - "sass-loader": "^8.0.2" - }, - "author": "uView", - "license": "MIT" -} + "name": "uView", + "version": "1.8.6", + "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", + "main": "index.js", + "keywords": [ + "uview", + "ui", + "uni-app" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "" + }, + "devDependencies": { + "node-sass": "^4.14.0", + "sass-loader": "^8.0.2" + }, + "author": "uView", + "license": "MIT", + "id": "uview-v1", + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + } +} \ No newline at end of file