From 9af8ccf328d72eac83f5a6e8ac87f156e8bafe60 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Jul 2022 15:17:37 +0800 Subject: [PATCH] 0728 --- App.vue | 14 +- common/http.api.js | 26 + components/applyInfoItem/applyInfoItem.vue | 203 ++ components/customTitle/customTitle.vue | 549 ++++++ package.json | 2 +- pages.json | 164 +- pages/home/detail/addNode.vue | 41 + pages/home/detail/ticketHandle.vue | 948 ++++++++++ pages/home/detail/warningHandle.vue | 8 + pages/home/home_.vue | 343 +++- pages/home/list/ticket.vue | 269 +++ pages/home/list/warning.vue | 369 ++++ pages/login/login_.vue | 524 ++++-- pages/my/my.vue | 497 +++-- pages/my/myInfo.vue | 233 +++ pages/my/my_.vue | 101 + pages/workSpace/newWork/relevant.vue | 1624 ++++++++++++++++ pages/workSpace/newWork/visit.vue | 1640 ++++++++++++++++ pages/workSpace/newWork/work.vue | 1656 +++++++++++++++++ pages/workSpace/workSpace.vue | 784 ++++++++ static/home/bgimg-top.jpg | Bin 0 -> 25995 bytes static/home/daiban.png | Bin 0 -> 533 bytes static/home/gonggao02.png | Bin 0 -> 1173 bytes static/home/index-top-img.png | Bin 0 -> 35966 bytes static/home/searchIcon.png | Bin 0 -> 1561 bytes static/home/tongzhi.png | Bin 0 -> 506 bytes static/login/avatar.png | Bin 0 -> 568 bytes static/login/my-bg.jpg | Bin 0 -> 133911 bytes static/login/my-code.png | Bin 0 -> 4228 bytes static/login/password.png | Bin 0 -> 596 bytes static/login/weixin.png | Bin 0 -> 1759 bytes static/my/changjianwenti.png | Bin 0 -> 1751 bytes static/my/my-bg.jpg | Bin 0 -> 46496 bytes static/my/my_apply/blue-time.png | Bin 0 -> 1620 bytes static/my/my_apply/orange-time.png | Bin 0 -> 1624 bytes static/my/my_apply/return.png | Bin 0 -> 1717 bytes static/my/my_apply/tongguo.png | Bin 0 -> 1697 bytes static/my/my_apply/zuofei.png | Bin 0 -> 1746 bytes static/my/wodeshenpi.png | Bin 0 -> 1541 bytes static/my/wodeshenqing.png | Bin 0 -> 1377 bytes static/my/wodeziliao.png | Bin 0 -> 1833 bytes static/tabbar/gongzuotai-select.png | Bin 0 -> 898 bytes static/tabbar/gongzuotai.png | Bin 0 -> 886 bytes static/tabbar/shouye-select.png | Bin 0 -> 1129 bytes static/tabbar/shouye.png | Bin 0 -> 1112 bytes static/tabbar/wode-select.png | Bin 0 -> 1131 bytes static/tabbar/wode.png | Bin 0 -> 1119 bytes static/workSpace/bgimg-top.jpg | Bin 0 -> 25995 bytes static/workSpace/bgimg.png | Bin 0 -> 74051 bytes static/workSpace/hetong.png | Bin 0 -> 5802 bytes static/workSpace/new_apply/del.png | Bin 0 -> 465 bytes static/workSpace/new_apply/update.png | Bin 0 -> 1553 bytes static/workSpace/renli.png | Bin 0 -> 6456 bytes static/workSpace/specialmatter.png | Bin 0 -> 5515 bytes static/workSpace/tongzhi.png | Bin 0 -> 6711 bytes static/workSpace/tongzhigonggao.png | Bin 0 -> 5454 bytes store/index.js | 5 +- uni_modules/uni-data-picker/changelog.md | 64 + .../components/uni-data-picker/keypress.js | 45 + .../uni-data-picker/uni-data-picker.vue | 554 ++++++ .../uni-data-pickerview/uni-data-picker.js | 563 ++++++ .../uni-data-pickerview.vue | 333 ++++ uni_modules/uni-data-picker/package.json | 93 + uni_modules/uni-data-picker/readme.md | 22 + uni_modules/uni-data-select/changelog.md | 16 + .../uni-data-select/uni-data-select.vue | 426 +++++ uni_modules/uni-data-select/package.json | 88 + uni_modules/uni-data-select/readme.md | 8 + uni_modules/uni-file-picker/changelog.md | 25 + .../uni-file-picker/choose-and-upload-file.js | 142 ++ .../uni-file-picker/uni-file-picker.vue | 706 +++++++ .../uni-file-picker/upload-file.vue | 324 ++++ .../uni-file-picker/upload-image.vue | 289 +++ uni_modules/uni-file-picker/package.json | 82 + uni_modules/uni-file-picker/readme.md | 301 +++ uni_modules/uni-icons/changelog.md | 18 + .../uni-icons/components/uni-icons/icons.js | 1297 +++++++++++-- .../components/uni-icons/uni-icons.vue | 39 +- .../components/uni-icons/uniicons.css | 663 +++++++ .../components/uni-icons/uniicons.ttf | Bin 0 -> 35760 bytes uni_modules/uni-icons/package.json | 10 +- uni_modules/uni-icons/readme.md | 42 +- uni_modules/uni-load-more/changelog.md | 19 + .../components/uni-load-more/i18n/en.json | 5 + .../components/uni-load-more/i18n/index.js | 8 + .../uni-load-more/i18n/zh-Hans.json | 5 + .../uni-load-more/i18n/zh-Hant.json | 5 + .../uni-load-more/uni-load-more.vue | 399 ++++ uni_modules/uni-load-more/package.json | 86 + uni_modules/uni-load-more/readme.md | 14 + uni_modules/uni-nav-bar/changelog.md | 37 + .../components/uni-nav-bar/uni-nav-bar.vue | 363 ++++ .../components/uni-nav-bar/uni-status-bar.vue | 28 + uni_modules/uni-nav-bar/package.json | 89 + uni_modules/uni-nav-bar/readme.md | 15 + uni_modules/uni-scss/changelog.md | 8 + uni_modules/uni-scss/index.scss | 1 + uni_modules/uni-scss/package.json | 82 + uni_modules/uni-scss/readme.md | 4 + uni_modules/uni-scss/styles/index.scss | 7 + .../uni-scss/styles/setting/_border.scss | 3 + .../uni-scss/styles/setting/_color.scss | 66 + .../uni-scss/styles/setting/_radius.scss | 55 + .../uni-scss/styles/setting/_space.scss | 56 + .../uni-scss/styles/setting/_styles.scss | 167 ++ .../uni-scss/styles/setting/_text.scss | 24 + .../uni-scss/styles/setting/_variables.scss | 146 ++ .../uni-scss/styles/tools/functions.scss | 19 + uni_modules/uni-scss/theme.scss | 31 + uni_modules/uni-scss/variables.scss | 62 + utils/dateTimePicker.js | 87 + 111 files changed, 17507 insertions(+), 534 deletions(-) create mode 100644 components/applyInfoItem/applyInfoItem.vue create mode 100644 components/customTitle/customTitle.vue create mode 100644 pages/home/detail/addNode.vue create mode 100644 pages/home/detail/ticketHandle.vue create mode 100644 pages/home/detail/warningHandle.vue create mode 100644 pages/home/list/ticket.vue create mode 100644 pages/home/list/warning.vue create mode 100644 pages/my/myInfo.vue create mode 100644 pages/my/my_.vue create mode 100644 pages/workSpace/newWork/relevant.vue create mode 100644 pages/workSpace/newWork/visit.vue create mode 100644 pages/workSpace/newWork/work.vue create mode 100644 pages/workSpace/workSpace.vue create mode 100644 static/home/bgimg-top.jpg create mode 100644 static/home/daiban.png create mode 100644 static/home/gonggao02.png create mode 100644 static/home/index-top-img.png create mode 100644 static/home/searchIcon.png create mode 100644 static/home/tongzhi.png create mode 100644 static/login/avatar.png create mode 100644 static/login/my-bg.jpg create mode 100644 static/login/my-code.png create mode 100644 static/login/password.png create mode 100644 static/login/weixin.png create mode 100644 static/my/changjianwenti.png create mode 100644 static/my/my-bg.jpg create mode 100644 static/my/my_apply/blue-time.png create mode 100644 static/my/my_apply/orange-time.png create mode 100644 static/my/my_apply/return.png create mode 100644 static/my/my_apply/tongguo.png create mode 100644 static/my/my_apply/zuofei.png create mode 100644 static/my/wodeshenpi.png create mode 100644 static/my/wodeshenqing.png create mode 100644 static/my/wodeziliao.png create mode 100644 static/tabbar/gongzuotai-select.png create mode 100644 static/tabbar/gongzuotai.png create mode 100644 static/tabbar/shouye-select.png create mode 100644 static/tabbar/shouye.png create mode 100644 static/tabbar/wode-select.png create mode 100644 static/tabbar/wode.png create mode 100644 static/workSpace/bgimg-top.jpg create mode 100644 static/workSpace/bgimg.png create mode 100644 static/workSpace/hetong.png create mode 100644 static/workSpace/new_apply/del.png create mode 100644 static/workSpace/new_apply/update.png create mode 100644 static/workSpace/renli.png create mode 100644 static/workSpace/specialmatter.png create mode 100644 static/workSpace/tongzhi.png create mode 100644 static/workSpace/tongzhigonggao.png create mode 100644 uni_modules/uni-data-picker/changelog.md create mode 100644 uni_modules/uni-data-picker/components/uni-data-picker/keypress.js create mode 100644 uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue create mode 100644 uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js create mode 100644 uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue create mode 100644 uni_modules/uni-data-picker/package.json create mode 100644 uni_modules/uni-data-picker/readme.md create mode 100644 uni_modules/uni-data-select/changelog.md create mode 100644 uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue create mode 100644 uni_modules/uni-data-select/package.json create mode 100644 uni_modules/uni-data-select/readme.md create mode 100644 uni_modules/uni-file-picker/changelog.md create mode 100644 uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js create mode 100644 uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue create mode 100644 uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue create mode 100644 uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue create mode 100644 uni_modules/uni-file-picker/package.json create mode 100644 uni_modules/uni-file-picker/readme.md create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.css create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.ttf create mode 100644 uni_modules/uni-load-more/changelog.md create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/en.json create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/index.js create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json create mode 100644 uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue create mode 100644 uni_modules/uni-load-more/package.json create mode 100644 uni_modules/uni-load-more/readme.md create mode 100644 uni_modules/uni-nav-bar/changelog.md create mode 100644 uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue create mode 100644 uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue create mode 100644 uni_modules/uni-nav-bar/package.json create mode 100644 uni_modules/uni-nav-bar/readme.md create mode 100644 uni_modules/uni-scss/changelog.md create mode 100644 uni_modules/uni-scss/index.scss create mode 100644 uni_modules/uni-scss/package.json create mode 100644 uni_modules/uni-scss/readme.md create mode 100644 uni_modules/uni-scss/styles/index.scss create mode 100644 uni_modules/uni-scss/styles/setting/_border.scss create mode 100644 uni_modules/uni-scss/styles/setting/_color.scss create mode 100644 uni_modules/uni-scss/styles/setting/_radius.scss create mode 100644 uni_modules/uni-scss/styles/setting/_space.scss create mode 100644 uni_modules/uni-scss/styles/setting/_styles.scss create mode 100644 uni_modules/uni-scss/styles/setting/_text.scss create mode 100644 uni_modules/uni-scss/styles/setting/_variables.scss create mode 100644 uni_modules/uni-scss/styles/tools/functions.scss create mode 100644 uni_modules/uni-scss/theme.scss create mode 100644 uni_modules/uni-scss/variables.scss create mode 100644 utils/dateTimePicker.js diff --git a/App.vue b/App.vue index 2093d48..75c5d91 100644 --- a/App.vue +++ b/App.vue @@ -15,7 +15,7 @@ */ //var that=this // 小程序自动登录 - uni.showLoading({ + /* uni.showLoading({ title: '微信自动登录中...', mask: true }) @@ -54,7 +54,17 @@ }) } }); - + */ + let accessToken = this.$store.state.vuex_token; + if(accessToken){ + uni.reLaunch({ + url:'/pages/home/home_' + }) + }else{ + uni.reLaunch({ + url:'/pages/login/login_' + }) + } }, } diff --git a/common/http.api.js b/common/http.api.js index 8c47a49..65e32e2 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -17,6 +17,7 @@ const install = (Vue, vm) => { let codeLogin = (data = {}) => vm.$u.post('/auth/login_sms_code/', data); //短信验证码登录 let login = (data = {}) => vm.$u.post('auth/token/', data); //账户密码登录 + let loginOut = () => vm.$u.post('/auth/logout/'); //账户密码退出 // 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下 let wxmplogin = (data = {}) => vm.$u.post('auth/login_wxmp/', data); //微信登录 @@ -25,14 +26,39 @@ const install = (Vue, vm) => { let unbindmp = (data = {}) => vm.$u.post('/system/user/unbind_wxmp/', data); //微信小程序解绑 let getDickey = (params={})=>vm.$u.get('/system/dict/', params);//查询字典 + let getTickets = (params={})=>vm.$u.get('/wf/ticket/', params);//工单查询/wf/ticket/{id}/ + let getTicketItem = (id)=>vm.$u.get(`/wf/ticket/${id}/`);//工单详情 + let getTicketTransitions = (id)=>vm.$u.get(`/wf/ticket/${id}/transitions/`);//工单按钮查询 + let getVisit = (id)=>vm.$u.get(`/vm/visit/${id}/`);//visit查询 + + let getRpj = (id)=>vm.$u.get(`/rpm/rpj/${id}`);//rpj查询 + let getOpreation = (id)=>vm.$u.get(`/opm/operation/${id}/`);//rpj查询 + let getOpl = (id)=>vm.$u.get(`/opm/opl/${id}/`);//opl作业许可证查询 + + + + + + + + + vm.$u.api = {getUserInfo, getCode, codeLogin, login, + loginOut, wxmplogin, bindmp, unbindmp, getDickey, + getTickets, + getTicketItem, + getTicketTransitions, + getVisit, + getRpj, + getOpreation, + getOpl }; } diff --git a/components/applyInfoItem/applyInfoItem.vue b/components/applyInfoItem/applyInfoItem.vue new file mode 100644 index 0000000..3f7e233 --- /dev/null +++ b/components/applyInfoItem/applyInfoItem.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/components/customTitle/customTitle.vue b/components/customTitle/customTitle.vue new file mode 100644 index 0000000..c3659a9 --- /dev/null +++ b/components/customTitle/customTitle.vue @@ -0,0 +1,549 @@ + + + + + diff --git a/package.json b/package.json index 7929b77..a01ec6c 100644 --- a/package.json +++ b/package.json @@ -10,4 +10,4 @@ "UI框架", "uni-app" ] -} \ No newline at end of file +} diff --git a/pages.json b/pages.json index a5c2c2e..d2a00f0 100644 --- a/pages.json +++ b/pages.json @@ -10,71 +10,141 @@ // "query": "uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1" //启动参数,在页面的onLoad函数里面得到 // }] // }, - "pages": [ - { - "path" : "pages/login/login_password", - "style" : - { - "navigationBarTitleText": "密码登录", - "enablePullDownRefresh": false - } - + "pages": [{ + "path": "pages/login/login_", + "style": { + "navigationBarTitleText": "密码登录", + "enablePullDownRefresh": false + } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "验证码登录", - "enablePullDownRefresh": false - } - + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "验证码登录", + "enablePullDownRefresh": false + } }, { - "path" : "pages/home/home", - "style" : - { - "navigationBarTitleText": "曲阳金隅智慧安全", - "enablePullDownRefresh": false - } - + "path": "pages/home/home_", + "style": { + "navigationBarTitleText": "主页", + "enablePullDownRefresh": false + } }, - { - "path" : "pages/my/my", - "style" : - { - "navigationBarTitleText": "个人中心", - "enablePullDownRefresh": false - } - - } - ], + { + "path": "pages/home/list/ticket", + "style": { + "navigationBarTitleText": "代办事件", + "navigationStyle": "custom" + } + }, + { + "path": "pages/home/list/warning", + "style": { + "navigationBarTitleText": "实时报警", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/home/detail/ticketHandle", + "style": { + "navigationBarTitleText": "工作流审批", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/home/detail/addNode", + "style": { + "navigationBarTitleText": "加签", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/home/detail/warningHandle", + "style": { + "navigationBarTitleText": "报警处理", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/workSpace/workSpace", + "style": { + "navigationBarTitleText": "工作台", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/workSpace/newWork/work", + "style": { + "navigationBarTitleText": "作业管理", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/workSpace/newWork/relevant", + "style": { + "navigationBarTitleText": "入厂项目", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/workSpace/newWork/visit", + "style": { + "navigationBarTitleText": "来访项目", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/my/my", + "style": { + "navigationBarTitleText": "个人中心", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/my/myInfo", + "style": { + "navigationBarTitleText": "个人信息", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "曲阳金隅智慧安全", "navigationBarBackgroundColor": "#F8F8F8", + // "navigationStyle": "custom", "backgroundColor": "#F8F8F8" }, "tabBar": { - "color": "#909399", - "selectedColor": "#909399", - "backgroundColor": "#FFFFFF", + "color": "#a6a6a6", + "selectedColor": "#2c6fd9", "borderStyle": "black", + "backgroundColor": "#ffffff", "list": [{ - "pagePath": "pages/home/home", - "iconPath": "static/common/home.png", - "selectedIconPath": "static/common/homec.png", + "pagePath": "pages/home/home_", + "iconPath": "static/tabbar/shouye.png", + "selectedIconPath": "static/tabbar/shouye-select.png", "text": "主页" }, - /* { - "pagePath": "pages/vod/video", - "iconPath": "static/common/play.png", - "selectedIconPath": "static/common/playc.png", - "text": "点播" - }, */ + { + "pagePath": "pages/workSpace/workSpace", + "iconPath": "static/tabbar/gongzuotai.png", + "selectedIconPath": "static/tabbar/gongzuotai-select.png", + "text": "工作台" + }, { "pagePath": "pages/my/my", - "iconPath": "static/common/me.png", - "selectedIconPath": "static/common/mec.png", + "iconPath": "static/tabbar/wode.png", + "selectedIconPath": "static/tabbar/wode-select.png", "text": "个人中心" } ] diff --git a/pages/home/detail/addNode.vue b/pages/home/detail/addNode.vue new file mode 100644 index 0000000..9e1e5b1 --- /dev/null +++ b/pages/home/detail/addNode.vue @@ -0,0 +1,41 @@ +