diff --git a/pages.json b/pages.json
index b2a9f7c..9450372 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,7 @@
"pages": [
// pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
// {
- // "path": "pages/YNEduApp/index/index",
+ // "path": "pages/YNEduApp/index/index",
// "style": {
// "navigationStyle" : "custom"
// }
@@ -200,375 +200,437 @@
}
},
{
- "path" : "pages/YNEduApp/index/notices",
- "style" :
- {
- "navigationBarTitleText": "通知公告"
- }
+ "path": "pages/YNEduApp/index/notices",
+ "style": {
+ "navigationBarTitleText": "通知公告"
+ }
},
{
- "path" : "pages/YNEduApp/learnProj/imageStudy",
- "style" :
- {
- "navigationBarTitleText" : "图片学习"
- }
+ "path": "pages/YNEduApp/learnProj/imageStudy",
+ "style": {
+ "navigationBarTitleText": "图片学习"
+ }
},
- ////实名制二期-移动端
- {//首页
- "path": "pages/realName/index/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//工作台
- "path": "pages/realName/workbench/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- //人员录入
- {//人员录入
- "path": "pages/realName/workbench/personEnter/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//新增人员
- "path": "pages/realName/workbench/personEnter/addPeople",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//查询人员列表
- "path": "pages/realName/workbench/personEnter/searchPeople",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//查询人员列表
- "path": "pages/realName/workbench/personEnter/editPeople",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员识别
- "path": "pages/realName/workbench/personEnter/facePeople",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员库
- "path": "pages/realName/workbench/peopleLibrary/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员库-详情
- "path": "pages/realName/workbench/peopleLibrary/detail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- //合同见证
- {//合同见证-首页
- "path": "pages/realName/workbench/contractWitness/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- //工资卡见证
- {//工资卡见证-首页
- "path": "pages/realName/workbench/wageWitness/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- //工资查看
- {//工资查看
- "path": "pages/realName/workbench/wageRecord/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//工资查看-详情
- "path": "pages/realName/workbench/wageRecord/detail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- //电子合同
- {//电子合同-视频
- "path": "pages/realName/workbench/electronicContract/contractVideo",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同-pdf预览
- "path": "pages/realName/workbench/electronicContract/contractPdf",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同-填写
- "path": "pages/realName/workbench/electronicContract/contractFill",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同-pdf确认
- "path": "pages/realName/workbench/electronicContract/contractPdfConfirm",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同签署
- "path": "pages/realName/workbench/electronicContractSign/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同签署-详情
- "path": "pages/realName/workbench/electronicContractSign/contractPdf",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同签署-视频查看
- "path": "pages/realName/workbench/electronicContractSign/contractVideo",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同审核
- "path": "pages/realName/workbench/electronicContractExam/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//电子合同审核详情
- "path": "pages/realName/workbench/electronicContractExam/contractPdf",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//欠薪维权申诉
- "path": "pages/realName/workbench/safeguarding/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//欠薪维权申诉-详情
- "path": "pages/realName/workbench/safeguarding/detail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//准入信息查询
- "path": "pages/realName/workbench/dayPlan/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//准入信息-详情
- "path": "pages/realName/workbench/dayPlan/detail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//安全教育培训
- "path": "pages/realName/workbench/exam/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//安全教育培训-培训列表
- "path": "pages/realName/workbench/exam/train",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//安全教育培训-学习文件
- "path": "pages/realName/workbench/exam/trainPdf",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//安全教育培训-学习视频
- "path": "pages/realName/workbench/exam/trainVideo",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//安全教育培训-考试说明
- "path": "pages/realName/workbench/exam/examInfo",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//安全教育培训-考试
- "path": "pages/realName/workbench/exam/exam",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//出场申请
- "path": "pages/realName/workbench/appearApply/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//出场申请-人员评价
- "path": "pages/realName/workbench/appearApply/evaluate",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//出场审核
- "path": "pages/realName/workbench/appearExam/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//作业计划与实名制管控情况
- "path": "pages/realName/workbench/workPlan/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员资质检查
- "path": "pages/realName/workbench/qualifications/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员资质检查-查询
- "path": "pages/realName/workbench/qualifications/search",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员资质检查-详情
- "path": "pages/realName/workbench/qualifications/detail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员资质检查-查看文件
- "path": "pages/realName/workbench/qualifications/listCertificatePdf",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员暂退-首页
- "path": "pages/realName/workbench/outPerson/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员暂退-暂退人员选择
- "path": "pages/realName/workbench/outPerson/outList",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员转场
- "path": "pages/realName/workbench/cutToPlace/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//人员转场-记录
- "path": "pages/realName/workbench/cutToPlace/record",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤
- "path": "pages/realName/workAttendance/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-考勤打卡
- "path": "pages/realName/workAttendance/clock/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-考勤打卡-地图
- "path": "pages/realName/workAttendance/clock/bMap",
- "style": {
- "navigationStyle": "custom"
- }
- },{//考勤-考勤打卡-作业点申请
- "path": "pages/realName/workAttendance/clock/workLocation",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-考勤打卡-作业点地图
- "path": "pages/realName/workAttendance/clock/checkMap",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-临时人员打卡
- "path": "pages/realName/workAttendance/tempClock/index",
- "style": {
- "navigationStyle": "custom"
- }
- }, {//考勤-临时人员信息
- "path": "pages/realName/workAttendance/tempClock/tempPeopleList",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-临时人员信息
- "path": "pages/realName/workAttendance/tempClock/tempPeopleList",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-管理人员打卡
- "path": "pages/realName/workAttendance/managementClock/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-考勤统计-首页
- "path": "pages/realName/workAttendance/statistics/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//考勤-考勤统计-详情
- "path": "pages/realName/workAttendance/statistics/detail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {//我的
- "path": "pages/realName/my/my",
- "style": {
- "navigationStyle": "custom"
- }
- },{//我的-消息
- "path": "pages/realName/my/news",
- "style": {
- "navigationStyle": "custom"
- }
- },{//我的-上传情况
- "path": "pages/realName/my/myUpload",
- "style": {
- "navigationStyle": "custom"
- }
- },{//我的-下载情况
- "path": "pages/realName/my/myDownload",
- "style": {
- "navigationStyle": "custom"
- }
- },
+ ////实名制二期-移动端
+ {
+ //首页
+ "path": "pages/realName/index/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //工作台
+ "path": "pages/realName/workbench/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ //人员录入
+ {
+ //人员录入
+ "path": "pages/realName/workbench/personEnter/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //新增人员
+ "path": "pages/realName/workbench/personEnter/addPeople",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //查询人员列表
+ "path": "pages/realName/workbench/personEnter/searchPeople",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //查询人员列表
+ "path": "pages/realName/workbench/personEnter/editPeople",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员识别
+ "path": "pages/realName/workbench/personEnter/facePeople",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员库
+ "path": "pages/realName/workbench/peopleLibrary/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员库-详情
+ "path": "pages/realName/workbench/peopleLibrary/detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ //合同见证
+ {
+ //合同见证-首页
+ "path": "pages/realName/workbench/contractWitness/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ //工资卡见证
+ {
+ //工资卡见证-首页
+ "path": "pages/realName/workbench/wageWitness/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ //工资查看
+ {
+ //工资查看
+ "path": "pages/realName/workbench/wageRecord/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //工资查看-详情
+ "path": "pages/realName/workbench/wageRecord/detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ //电子合同
+ {
+ //电子合同-视频
+ "path": "pages/realName/workbench/electronicContract/contractVideo",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同-pdf预览
+ "path": "pages/realName/workbench/electronicContract/contractPdf",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同-填写
+ "path": "pages/realName/workbench/electronicContract/contractFill",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同-pdf确认
+ "path": "pages/realName/workbench/electronicContract/contractPdfConfirm",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同签署
+ "path": "pages/realName/workbench/electronicContractSign/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同签署-详情
+ "path": "pages/realName/workbench/electronicContractSign/contractPdf",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同签署-视频查看
+ "path": "pages/realName/workbench/electronicContractSign/contractVideo",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同审核
+ "path": "pages/realName/workbench/electronicContractExam/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //电子合同审核详情
+ "path": "pages/realName/workbench/electronicContractExam/contractPdf",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //欠薪维权申诉
+ "path": "pages/realName/workbench/safeguarding/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //欠薪维权申诉-详情
+ "path": "pages/realName/workbench/safeguarding/detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //准入信息查询
+ "path": "pages/realName/workbench/dayPlan/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //准入信息-详情
+ "path": "pages/realName/workbench/dayPlan/detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //安全教育培训
+ "path": "pages/realName/workbench/exam/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //安全教育培训-培训列表
+ "path": "pages/realName/workbench/exam/train",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //安全教育培训-学习文件
+ "path": "pages/realName/workbench/exam/trainPdf",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //安全教育培训-学习视频
+ "path": "pages/realName/workbench/exam/trainVideo",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //安全教育培训-考试说明
+ "path": "pages/realName/workbench/exam/examInfo",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //安全教育培训-考试
+ "path": "pages/realName/workbench/exam/exam",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //出场申请
+ "path": "pages/realName/workbench/appearApply/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //出场申请-人员评价
+ "path": "pages/realName/workbench/appearApply/evaluate",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //出场审核
+ "path": "pages/realName/workbench/appearExam/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //作业计划与实名制管控情况
+ "path": "pages/realName/workbench/workPlan/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员资质检查
+ "path": "pages/realName/workbench/qualifications/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员资质检查-查询
+ "path": "pages/realName/workbench/qualifications/search",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员资质检查-详情
+ "path": "pages/realName/workbench/qualifications/detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员资质检查-查看文件
+ "path": "pages/realName/workbench/qualifications/listCertificatePdf",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员暂退-首页
+ "path": "pages/realName/workbench/outPerson/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员暂退-暂退人员选择
+ "path": "pages/realName/workbench/outPerson/outList",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员转场
+ "path": "pages/realName/workbench/cutToPlace/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //人员转场-记录
+ "path": "pages/realName/workbench/cutToPlace/record",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤
+ "path": "pages/realName/workAttendance/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-考勤打卡
+ "path": "pages/realName/workAttendance/clock/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-考勤打卡-地图
+ "path": "pages/realName/workAttendance/clock/bMap",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-考勤打卡-作业点申请
+ "path": "pages/realName/workAttendance/clock/workLocation",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-考勤打卡-作业点地图
+ "path": "pages/realName/workAttendance/clock/checkMap",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-临时人员打卡
+ "path": "pages/realName/workAttendance/tempClock/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-临时人员信息
+ "path": "pages/realName/workAttendance/tempClock/tempPeopleList",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-临时人员信息
+ "path": "pages/realName/workAttendance/tempClock/tempPeopleList",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-管理人员打卡
+ "path": "pages/realName/workAttendance/managementClock/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-考勤统计-首页
+ "path": "pages/realName/workAttendance/statistics/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //考勤-考勤统计-详情
+ "path": "pages/realName/workAttendance/statistics/detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //我的
+ "path": "pages/realName/my/my",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //我的-消息
+ "path": "pages/realName/my/news",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //我的-上传情况
+ "path": "pages/realName/my/myUpload",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ //我的-下载情况
+ "path": "pages/realName/my/myDownload",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/HealthExaminationApp/index/index",
@@ -607,34 +669,37 @@
}
},
{
- "path" : "pages/HealthExaminationApp/myAppointment/bookSuccessfully",
- "style" :
- {
- "navigationBarTitleText" : "体检预约"
- }
+ "path": "pages/HealthExaminationApp/myAppointment/bookSuccessfully",
+ "style": {
+ "navigationBarTitleText": "体检预约"
+ }
},
{
- "path" : "pages/HealthExaminationApp/myAppointment/healthExamDetails",
- "style" :
- {
- "navigationBarTitleText" : "体检预约单"
- }
+ "path": "pages/HealthExaminationApp/myAppointment/healthExamDetails",
+ "style": {
+ "navigationBarTitleText": "体检预约单"
+ }
},
{
- "path" : "pages/HealthExaminationApp/index/userInfo",
- "style" :
- {
- "navigationBarTitleText" : "个人信息"
- }
+ "path": "pages/HealthExaminationApp/index/userInfo",
+ "style": {
+ "navigationBarTitleText": "个人信息"
+ }
},
{
- "path" : "pages/HealthExaminationApp/index/message",
- "style" :
- {
- "navigationBarTitleText" : "消息通知"
- }
- }
+ "path": "pages/HealthExaminationApp/index/message",
+ "style": {
+ "navigationBarTitleText": "消息通知"
+ }
+ },
+ /* 作业计划移动端 */
+ {
+ "path": "pages/workPlan/index/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }
],
"globalStyle": {
"fontFamily": "Helvetica, Arial, sans-serif",
@@ -653,9 +718,9 @@
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#F1F1F1"
},
- "usingComponents": {
- "ly-tree-node": "/components/ly-tree/ly-tree-node"
- }
+ "usingComponents": {
+ "ly-tree-node": "/components/ly-tree/ly-tree-node"
+ }
}
/* "tabBar": {
"color": "#7A7E83",
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index b1c5788..b581417 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -1,517 +1,556 @@
-
-
- 作业管控智慧平台
-
-
-
- 今日消息
-
-
-
-
-
-
-
-
-
-
- 我的应用
-
-
-
-
-
- {{item.appName}}
-
-
-
-
- 全部应用
-
-
-
-
-
- {{item.appName}}
-
-
-
+
+
+ 作业管控智慧平台
+
+
+
+ 今日消息
+
+
+
+
+
+
+
+
+
+
+ 我的应用
+
+
+
+
+
+ {{ item.appName }}
+
+
+
+
+ 全部应用
+
+
+
+
+
+ {{ item.appName }}
+
+
+
+
-
-
-
-
-
-
- 密码修改
-
-
-
-
-
-
+
+
+
+ 密码修改
+
+
+
+
+
+
\ No newline at end of file
+ .yy-img image {
+ width: 150rpx;
+ height: 150rpx;
+ }
+ }
+ }
+ }
+ }
+}
+
diff --git a/pages/realName/index/components/bar-charts-model.vue b/pages/realName/index/components/bar-charts-model.vue
index d763794..6509fab 100644
--- a/pages/realName/index/components/bar-charts-model.vue
+++ b/pages/realName/index/components/bar-charts-model.vue
@@ -10,7 +10,6 @@ export default {
data() {
return {
chartData: {},
- //这里的 opts 是图表类型 type="column" 的全部配置参数,您可以将此配置复制到 config-ucharts.js 文件中下标为 ['column'] 的节点中来覆盖全局默认参数。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式,达到页面简洁的需求。
opts: {
timing: 'easeOut',
duration: 1000,
@@ -143,13 +142,10 @@ export default {
},
methods: {
getServerData() {
- //模拟从服务器获取数据时的延时
-
getHomePageListApi().then(res => {
const { constructionLine, infrastructureSubstation, productionLine, productionSubstation, network, other } =
res.data.proMsgBean
setTimeout(() => {
- //模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接
let data = {
categories: ['基建线路', '基建变电', '生产线路', '生成变电', '配网', '其他'],
series: [
@@ -168,7 +164,6 @@ export default {
diff --git a/pages/realName/index/components/pie-charts-model-ring.vue b/pages/realName/index/components/pie-charts-model-ring.vue
index 69a3470..fa11c90 100644
--- a/pages/realName/index/components/pie-charts-model-ring.vue
+++ b/pages/realName/index/components/pie-charts-model-ring.vue
@@ -5,11 +5,11 @@
diff --git a/pages/workPlan/index/components/home-notice-bar.vue b/pages/workPlan/index/components/home-notice-bar.vue
new file mode 100644
index 0000000..a8cb35a
--- /dev/null
+++ b/pages/workPlan/index/components/home-notice-bar.vue
@@ -0,0 +1,63 @@
+
+
+
+
+ 今日风险
+
+
+
+
+
+
+
+
+
diff --git a/pages/workPlan/index/index.vue b/pages/workPlan/index/index.vue
new file mode 100644
index 0000000..319f56b
--- /dev/null
+++ b/pages/workPlan/index/index.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workPlan/util/chooseFile.js b/pages/workPlan/util/chooseFile.js
new file mode 100644
index 0000000..272af53
--- /dev/null
+++ b/pages/workPlan/util/chooseFile.js
@@ -0,0 +1,94 @@
+export function chooseFile(callback, acceptType) {
+
+ var CODE_REQUEST = 1000;
+ var main = plus.android.runtimeMainActivity();
+ if (plus.os.name == 'Android') {
+ console.log("666");
+ var Intent = plus.android.importClass('android.content.Intent');
+ var intent = new Intent(Intent.ACTION_GET_CONTENT);
+ intent.addCategory(Intent.CATEGORY_OPENABLE);
+ if (acceptType) {
+ intent.setType(acceptType);
+ } else {
+ intent.setType("*/*");
+ }
+ main.onActivityResult = (requestCode, resultCode, data) => {
+ if (requestCode == CODE_REQUEST) {
+ const uri = data.getData();
+ plus.android.importClass(uri);
+ const Build = plus.android.importClass('android.os.Build');
+ const isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+ const DocumentsContract = plus.android.importClass('android.provider.DocumentsContract');
+ if (isKitKat && DocumentsContract.isDocumentUri(main, uri)) {
+ if ("com.android.externalstorage.documents" == uri.getAuthority()) {
+ console.log("6666");
+ var docId = DocumentsContract.getDocumentId(uri);
+ var split = docId.split(":");
+ var type = split[0];
+
+ if ("primary" == type) {
+ var Environment = plus.android.importClass('android.os.Environment');
+ callback(Environment.getExternalStorageDirectory() + "/" + split[1]);
+ } else {
+ var System = plus.android.importClass('java.lang.System');
+ var sdPath = System.getenv("SECONDARY_STORAGE");
+ if (sdPath) {
+ callback(sdPath + "/" + split[1]);
+ }
+ }
+ } else if ("com.android.providers.downloads.documents" == uri.getAuthority()) {
+ var id = DocumentsContract.getDocumentId(uri);
+ var ContentUris = plus.android.importClass('android.content.ContentUris');
+ var contentUri = ContentUris.withAppendedId(
+ // Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+ Uri.parse("content://downloads/public_downloads"), id);
+ callback(getDataColumn(main, contentUri, null, null));
+ } else if ("com.android.providers.media.documents" == uri.getAuthority()) {
+ var docId = DocumentsContract.getDocumentId(uri);
+ var split = docId.split(":");
+ console.log(split);
+ var type = split[0];
+ console.log(type);
+ var MediaStore = plus.android.importClass('android.provider.MediaStore');
+ if ("image" == type) {
+ contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+ } else if ("video" == type) {
+ contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+ } else if ("audio" == type) {
+ contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+ } else {
+ contentUri = MediaStore.Files.getContentUri("external");
+ }
+
+ console.log(contentUri);
+ var selection = "_id=?";
+ var selectionArgs = new Array();
+ selectionArgs[0] = split[1];
+
+ callback(getDataColumn(main, contentUri, selection, selectionArgs));
+ }
+ } else if ("content" == uri.getScheme()) {
+ callback(getDataColumn(main, uri, null, null));
+ } else if ("file" == uri.getScheme()) {
+ callback(uri.getPath());
+ }
+ }
+ }
+ main.startActivityForResult(intent, CODE_REQUEST);
+ }
+}
+
+function getDataColumn(main, uri, selection, selectionArgs) {
+ plus.android.importClass(main.getContentResolver());
+ let cursor = main.getContentResolver().query(uri, ['_data'], selection, selectionArgs,
+ null);
+ plus.android.importClass(cursor);
+ if (cursor != null && cursor.moveToFirst()) {
+ var column_index = cursor.getColumnIndexOrThrow('_data');
+ var result = cursor.getString(column_index)
+ cursor.close();
+ return result;
+ }
+ return null;
+}
+export default chooseFile
\ No newline at end of file
diff --git a/pages/workPlan/util/map.js b/pages/workPlan/util/map.js
new file mode 100644
index 0000000..326fa08
--- /dev/null
+++ b/pages/workPlan/util/map.js
@@ -0,0 +1,16 @@
+export function myBMapGL1() {
+ return new Promise(function(resolve, reject) {
+ if (typeof window.initMyBMapGL1 === 'function') {
+ resolve(window.initMyBMapGL1)
+ return
+ }
+ window.initMyBMapGL1 = function() {
+ resolve(window.initMyBMapGL1)
+ }
+ var script = document.createElement('script')
+ script.type = 'text/javascript'
+ script.src = `https://api.map.baidu.com/api?v=3.0&type=webgl&ak=PM43nB8eDNTBrXkQwGrTQFcmOni3Z9nO&callback=initMyBMapGL1`
+ script.onerror = reject
+ document.head.appendChild(script)
+ })
+}
\ No newline at end of file
diff --git a/pages/workPlan/util/tabbar.js b/pages/workPlan/util/tabbar.js
new file mode 100644
index 0000000..fee747f
--- /dev/null
+++ b/pages/workPlan/util/tabbar.js
@@ -0,0 +1,21 @@
+export default {
+ color: '#161616',
+ selectedColor: '#161616',
+ borderStyle: 'black',
+ backgroundColor: '#ffffff',
+ list: [
+ {
+ pagePath: 'pages/workPlan/index/index',
+ iconPath: '/static/realName/home.png',
+ selectedIconPath: '/static/realName/homeSelected.png',
+ text: '首页'
+ //新版本新增,页面被打开方式,默认为reLaunch
+ },
+ {
+ pagePath: 'pages/realName/workbench/index',
+ iconPath: '/static/realName/work.png',
+ selectedIconPath: '/static/realName/workSelected.png',
+ text: '工作台'
+ }
+ ]
+}
diff --git a/static/images/workPlan/month_img.png b/static/images/workPlan/month_img.png
new file mode 100644
index 0000000..2a30bd6
Binary files /dev/null and b/static/images/workPlan/month_img.png differ
diff --git a/static/images/workPlan/week_img.png b/static/images/workPlan/week_img.png
new file mode 100644
index 0000000..957f751
Binary files /dev/null and b/static/images/workPlan/week_img.png differ