diff --git a/.env.development b/.env.development index 935a2b1..03557e9 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ #调用后台地址 # 贝英斯公司 -# VITE_APP_BASE_URL = 'http://118.186.13.120:31302' +VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" @@ -13,4 +13,4 @@ # 友晟线上内网 # VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app' # 友晟线上外网网 -VITE_APP_BASE_URL = 'https://app.718yousheng.com/app' +# VITE_APP_BASE_URL = 'https://app.718yousheng.com/app' diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index c3b0787..e0324c6 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,6 +2,8 @@ "version" : "1.0", "configurations" : [ { + "customPlaygroundType" : "local", + "packageName" : "com.ys718.app", "playground" : "custom", "type" : "uni-app:app-android" }, diff --git a/src/components/customHeader.vue b/src/components/customHeader.vue index db8dfb9..c0956af 100644 --- a/src/components/customHeader.vue +++ b/src/components/customHeader.vue @@ -7,7 +7,9 @@ - {{ title }} + {{ title }} + + diff --git a/src/pages.json b/src/pages.json index fe4bc06..4bceb87 100644 --- a/src/pages.json +++ b/src/pages.json @@ -605,7 +605,30 @@ }, { "path": "pages/business/EQF/components/gkQualityFeedbackDetailComponent", - + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/polling/index", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/polling/searchList", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/polling/issueTracking", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/polling/taskList", "style": { "navigationBarTitleText": "" } diff --git a/src/pages/business/business.vue b/src/pages/business/business.vue index 70bb464..b1ee199 100644 --- a/src/pages/business/business.vue +++ b/src/pages/business/business.vue @@ -142,7 +142,7 @@ const mescrollInit = (mescroll) => { mescrollRef.value = mescroll; }; const downOption = ref({ - auto: true, + auto: false, textInOffset: '下拉刷新', textOutOffset: '释放更新', textLoading: '刷新中...' @@ -151,10 +151,10 @@ const downOption = ref({ // 下拉刷新 const downCallback = async (mescroll) => { try { - getList(); - // setTimeout(async ()=>{ - // // mescroll.resetUpScroll(); - // },500); + setTimeout(async ()=>{ + getList(); + mescroll.resetUpScroll(); + },500); } catch (error) { mescroll.endErr(); } finally { diff --git a/src/pages/business/polling/index.vue b/src/pages/business/polling/index.vue new file mode 100644 index 0000000..13cbdf8 --- /dev/null +++ b/src/pages/business/polling/index.vue @@ -0,0 +1,460 @@ + + + \ No newline at end of file diff --git a/src/pages/business/polling/issueTracking.vue b/src/pages/business/polling/issueTracking.vue new file mode 100644 index 0000000..e18efea --- /dev/null +++ b/src/pages/business/polling/issueTracking.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/pages/business/polling/searchList.vue b/src/pages/business/polling/searchList.vue new file mode 100644 index 0000000..5833238 --- /dev/null +++ b/src/pages/business/polling/searchList.vue @@ -0,0 +1,536 @@ + + + \ No newline at end of file diff --git a/src/pages/business/polling/taskList.vue b/src/pages/business/polling/taskList.vue new file mode 100644 index 0000000..04959c2 --- /dev/null +++ b/src/pages/business/polling/taskList.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index ac7189a..f919a52 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -266,7 +266,7 @@ const submitForm = () => { //h5测试用 内网-sn123456 //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429 //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' - param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2'; + param.uniqCode = '4d8489b7-78cd-4db2-9227-d7c2ab2093d8'; let res = await login(param); userStore.login(res); uni.switchTab({ url: '/pages/home/home' }) diff --git a/src/static/common.css b/src/static/common.css index a039075..a32fb45 100644 --- a/src/static/common.css +++ b/src/static/common.css @@ -288,6 +288,21 @@ page { padding: 30rpx; border-radius: 8px; } +.white-bg .blue-title{ + color:#3384DF; + font-size:38rpx; + font-weight: bold; +} +.white-bg .green-title{ + color:#12BC36; + font-size:38rpx; + font-weight: bold; +} +.white-bg .red-title{ + color:#FF687A; + font-size:38rpx; + font-weight: bold; +} .white-bg .w-b-title { display: flex; @@ -485,6 +500,14 @@ uni-button[type='primary'][plain] { color: #919191; font-size: 28rpx; } +.report-list .r-list .r-blue{ + color: #05A3F4; + font-size: 28rpx; +} +.report-list .r-list .r-red{ + color: #FF2B44; + font-size: 28rpx; +} .report-list .r-list .r-right { margin-left: auto; @@ -529,6 +552,24 @@ uni-button[type='primary'][plain] { font-weight: normal; } +.report-list .r-list .btn-green{ + background-color: #09BC48; + color:#fff; + text-align: center; + padding:5rpx 20rpx; + font-size:28rpx; + border-radius: 10rpx; +} +.report-list .r-list .btn-red{ + background-color: #FF687A; + color:#fff; + text-align: center; + padding:5rpx 20rpx; + font-size:28rpx; + border-radius: 10rpx; +} + + .form-con { padding: 0 30rpx; } @@ -647,4 +688,56 @@ uni-button[type='primary'][plain] { .mescroll-empty .empty-tip{ color: #fff !important; font-size:28rpx !important; -} \ No newline at end of file +} + +/* 日历修改 begin */ +.calender-con{ + box-shadow: 0px 0px 15px 0px rgba(4, 0, 0, 0.15); + padding-bottom:30rpx; +} +.calender-con .uni-calendar__header-text{ + color:#333333 !important; + font-weight: bold !important; + font-size: 34rpx !important; +} +.calender-con .uni-calendar__weeks-day{ + border:none !important; +} +.calender-con .uni-calendar__weeks-day-text{ + color:#333333 !important; + font-weight: bold !important; + font-size: 34rpx !important; +} +.calender-con .uni-calendar__weeks{ + padding:0 20rpx !important; +} + +.calender-con .uni-calendar-item__weeks-box-item{ + width:auto !important; + height:80rpx !important; +} +.calender-con .uni-calendar-item--isDay{ + background-color: transparent !important; +} +.calender-con .uni-calendar-item__weeks-box-text{ + background-color: #EEEEEE !important; + width:60rpx !important; + height:60rpx !important; + line-height: 55rpx !important; + border-radius: 50% !important; + text-align: center !important; + font-size:34rpx !important; + color:#333333 !important; +} +.calender-con .uni-calendar-item--disable{ + background-color: transparent !important; + color:#E3E3E3 !important; +} +.calender-con .uni-calendar-item--isDay-text{ + background-color: #FF9638 !important; + color:#fff !important; +} +.calender-con .uni-calendar-item__weeks-lunar-text.uni-calendar-item--isDay-text span{ + display: none !important; +} +/* 日历修改 end */ \ No newline at end of file diff --git a/src/static/images/polling/icon-Expired.png b/src/static/images/polling/icon-Expired.png new file mode 100644 index 0000000..0c9e587 Binary files /dev/null and b/src/static/images/polling/icon-Expired.png differ diff --git a/src/static/images/polling/icon-calendar.png b/src/static/images/polling/icon-calendar.png new file mode 100644 index 0000000..6558895 Binary files /dev/null and b/src/static/images/polling/icon-calendar.png differ diff --git a/src/static/images/polling/icon-complete.png b/src/static/images/polling/icon-complete.png new file mode 100644 index 0000000..c270d47 Binary files /dev/null and b/src/static/images/polling/icon-complete.png differ diff --git a/src/static/images/polling/icon-pending.png b/src/static/images/polling/icon-pending.png new file mode 100644 index 0000000..c444052 Binary files /dev/null and b/src/static/images/polling/icon-pending.png differ diff --git a/src/static/images/polling/icon-start.png b/src/static/images/polling/icon-start.png new file mode 100644 index 0000000..dc7c5d3 Binary files /dev/null and b/src/static/images/polling/icon-start.png differ diff --git a/src/static/images/polling/pic-NoResult.png b/src/static/images/polling/pic-NoResult.png new file mode 100644 index 0000000..9cda3b0 Binary files /dev/null and b/src/static/images/polling/pic-NoResult.png differ diff --git a/src/utils/status.js b/src/utils/status.js index 1d3cb5c..7a59773 100644 --- a/src/utils/status.js +++ b/src/utils/status.js @@ -18,3 +18,14 @@ export function formatLevel(type){ return result[type]; } +// 任务(巡检)状态 1=未发布 2=已发布 3 进行中or执行中 4 已完成 5 已过期 +export function formatTaskStatus(status){ + const result = { + 1:'未发布', + 2:'已发布', + 3:'执行中', + 4:'已完成', + 5:'已过期', + } + return result[status]; +} diff --git a/uniCloud-aliyun/cloudfunctions/testUnipush2/index.js b/uniCloud-aliyun/cloudfunctions/testUnipush2/index.js index a12e975..21c3bb8 100644 --- a/uniCloud-aliyun/cloudfunctions/testUnipush2/index.js +++ b/uniCloud-aliyun/cloudfunctions/testUnipush2/index.js @@ -1,31 +1,9 @@ -// 'use strict'; -// const uniPush = uniCloud.getPushManager({appId:"__UNI__4C459F4"}) //注意这里需要传入你的应用appId -// exports.main = async (event) => { -// console.log(event) -// if(event.cid){ -// let obj = JSON.parse(event.body); -// console.log(obj) -// const res = await uniPush.sendMessage({ -// "push_clientid": obj.cids, // 设备id，支持多个以数组的形式指定多个设备，如["cid-1","cid-2"]，数组长度不大于1000 -// "title": obj.title, // 标题 -// "content": obj.content, // 内容 -// "settings": obj.settings, // 消息有效期 -// "payload": obj.payload, // 数据 -// "category": obj.category, // HarmonyOS NEXT系统（纯血鸿蒙、非安卓鸿蒙）的消息分类，要给鸿蒙设备推送时才必传 -// "force_notification": true, //填写true，客户端就会对在线消息自动创建“通知栏消息”，不填写则需要客户端自己处理。 -// "request_id": obj.request_id ,//请求唯一标识号，10-32位之间；如果request_id重复，会导致消息丢失 -// "options":obj.options //消息分类，没申请可以不传这个参数 -// }) -// return res; -// } -// return {} -// }; - -// 简单的使用示例 appId: "__UNI__4C459F4" +// 我的 appId: "__UNI__4C459F4" +// 718的 appId: __UNI__0B682E1 'use strict'; const uniPush = uniCloud.getPushManager({ - appId: "__UNI__0B682E1" + appId: "__UNI__4C459F4" }) exports.main = async (event) => { console.log(event)