safecheck-client 3.0.33-gongyi → 3.0.34-11

package/src/plugins/LocalPagedList.js

@@ -44,7 +44,7 @@ export default class LocalPagedList {
 
     let result = HostApp._executeTask({'type':'sql', 'data':{'alias': this.alias, 'criteria': this.params, count: true, pageNo: 1, pageSize: this.pageSize}})
     if(result.code == 200) {
-      console.log(result.data.sum.n)
+      //tag
       if(result.data.sum.n == 0) {
         this.state = '错误'
         this.error = '没有符合条件的记录'
@@ -56,7 +56,7 @@ export default class LocalPagedList {
       }
     }
     else {
-      console.log(result.data)
+      //tag
       this.state = '错误'
       this.error = '提取数据出错，请重试'
     }
@@ -77,7 +77,7 @@ export default class LocalPagedList {
       this.rows = result.data.rows
     }
     else {
-      console.log(result.data)
+      //tag
       this.state = '错误'
       this.error = '提取数据出错，请重试'
     }

package/src/plugins/LocalPathList.js

@@ -57,7 +57,7 @@ export default class LocalPathList {
       }
     }
     else {
-      console.log(result.data)
+      //tag
       this.state = '错误'
       this.error = '提取数据出错，请重试'
     }
@@ -78,7 +78,7 @@ export default class LocalPathList {
       this.rows = result.data
     }
     else {
-      console.log(result.data)
+      //tag
       this.state = '错误'
       this.error = '提取数据出错，请重试'
     }

package/src/rongcheng-android.js

@@ -37,6 +37,12 @@ export default function () {
   Vue.component('paper-user', (resolve) => { require(['./components/android/PaperUser'], resolve) })
 // 安检单-用户基本信息
   Vue.component('safecheck-user', (resolve) => { require(['./components/android/SafecheckUser'], resolve) })
+  Vue.component('PhoneUpUserinfo', (resolve) => {
+    require(['./components/rongcheng/PhoneUpUserinfo.vue'], resolve)
+  })
+  Vue.component('datepicker', (resolve) => {
+    require(['./components/rongcheng/Datepicker.vue'], resolve)
+  })
 // 安检单-安检设备
   Vue.component('paper-device', (resolve) => { require(['./components/android/PaperDevice'], resolve) })
 // 安检单-安检设备
@@ -152,7 +158,7 @@ export default function () {
   Vue.component('repair-query', (resolve) => { require(['./components/android/RepairQuery'], resolve) })
   // 安检项
 
-  Vue.component('check-plan-result', (resolve) => { require(['./components/android/CheckPlanResult'], resolve) })
+  Vue.component('check-plan-result', (resolve) => { require(['./components/android/checkPlanResult'], resolve) })
   // go-wasm测试页面
   //抽单查询计划
   Vue.component('extract-check-plan', (resolve) => { require(['./components/android/ExtractCheckPlan'], resolve) })
@@ -161,7 +167,7 @@ export default function () {
   // go-wasm测试页面
   Vue.component('phone-safe-plan', (resolve) => { require(['./components/android/wasm/PhoneSafePlan'], resolve) })
   // 安检用户信息查看
-  Vue.component('safecheck-userinfo', (resolve) => { require(['./components/rongcheng/SafecheckUserinfo'], resolve) })
+  Vue.component('safecheck-userinfo', (resolve) => { require(['./components/rongcheng/SafecheckUserInfo'], resolve) })
  /* // 在线用户档案核对
    Vue.component('user-safe-app', (resolve) => { require(['../examples/UserFiles/App'], resolve) })*/
 
@@ -169,6 +175,8 @@ export default function () {
   Vue.component('CheckCurrentCreate', (resolve) => { require(['./components/rongcheng/CheckCurrentCreate.vue'], resolve) })
   // 荣城-送气待办
   Vue.component('AspiratedCurrentCreate', (resolve) => { require(['./components/rongcheng/AspiratedCurrentCreate.vue'], resolve) })
+  //荣城-送气派发
+  Vue.component('aspirated-distribute', (resolve) => { require(['./components/rongcheng/AspiratedDistribute.vue'], resolve) })
   //蓉城手机端送气页面
   Vue.component('AspiratedDevices', (resolve) => { require(['./components/rongcheng/AspiratedDevices.vue'], resolve) })
   Vue.component('AspiratedOrderV', (resolve) => { require(['./components/rongcheng/AspiratedOrderV.vue'], resolve) })
@@ -188,6 +196,10 @@ export default function () {
   Vue.component('inspectionUserInfo', (resolve) => { require(['./components/inspections/inspectionUserInfo'], resolve) })
   Vue.component('inspectionFeedback', (resolve) => { require(['./components/inspections/inspectionFeedback'], resolve) })
   Vue.component('inspectionDevices', (resolve) => { require(['./components/inspections/inspectionDevices'], resolve) })
+  Vue.component('DailyworkloadQuery', (resolve) => { require(['./components/android/DailyworkloadQuery'], resolve) })
+  Vue.component('current-create-online', (resolve) => { require(['./components/rongcheng/CurrentCreateOnline'], resolve) })
+  Vue.component('check-plan-list', (resolve) => { require(['./components/rongcheng/CheckPlanList'], resolve) })
+
 }
 
 

package/src/rongcheng.js

@@ -154,8 +154,8 @@ export default function () {
 // 隐患处理
   Vue.component('defect-modal', (resolve) => { require(['./components/defects/DefectModal'], resolve) })
 // 全局统计
-  Vue.component('splash', (resolve) => { require(['./components/cockpit/Splash'], resolve) })
-  Vue.component('splash-detail', (resolve) => { require(['./components/cockpit/SplashDetail'], resolve) })
+//   Vue.component('splash', (resolve) => { require(['./components/cockpit/Splash'], resolve) })
+//   Vue.component('splash-detail', (resolve) => { require(['./components/cockpit/SplashDetail'], resolve) })
 //用户档案修改
   Vue.component('user-entry', (resolve) => { require(['./components/metterfiles/UserFiles'], resolve) })
   Vue.component('metter-files', (resolve) => { require(['./components/metterfiles/MetterFiles'], resolve) })
@@ -262,7 +262,9 @@ export default function () {
     require(['./components/rongcheng/report/CheckPlanUserList'], resolve)
   })
 
-
+  Vue.component('safecheck-file-upload', (resolve) => {
+    require(['./components/Util/SafecheckUpload'], resolve)
+  })
 
   //隐患报表
   Vue.component('hiddensituation', (resolve) => { require(['./components/report/HiddenSituation'], resolve) })
@@ -298,6 +300,16 @@ export default function () {
   //组织安检员下拉
   Vue.component('right-tree-safe', (resolve) => { require(['./components/Util/RightTreeSafe'], resolve) })
   Vue.component('role-selector-safe', (resolve) => { require(['./components/pc/RoleSelector'], resolve) })
+  Vue.component('img-self', (resolve) => { require(['./components/rongcheng/ImgSelf'], resolve) })
+
+  //小区安检率汇总总页面
+  Vue.component('check-paper-area-user', (resolve) => { require(['./components/rongcheng/CheckPaperAreaUser'], resolve) })
+  //小区安检率查询
+  Vue.component('check-search-area', (resolve) => { require(['./components/rongcheng/CheckSearchArea'], resolve) })
+  //小区安检率用户详情查询
+  Vue.component('check-user-list', (resolve) => { require(['./components/rongcheng/CheckUserList'], resolve) })
+
+
   Vue.component('export-excel-safe', (resolve) => {
     require(['./components/ExportExcel'], resolve)
   })

package/src/safecheck-android.js

@@ -5,6 +5,9 @@ export default function (filiale) {
   // register check-paper asynchronosly
 // 登录
   Vue.component('android_login', (resolve) => { require(['./components/android/Login'], resolve) })
+  Vue.component('img-self-android', (resolve) => {
+    require(['./components/android/ImgSelfAndroid'], resolve)
+  })
 // 安检员导航
   Vue.component('checker', (resolve) => { require(['./components/android/Checker'], resolve) })
 // 维修员
@@ -124,6 +127,10 @@ export default function (filiale) {
   Vue.component('upload-page', (resolve) => { require(['./components/android/UploadPage'], resolve) })
 // 无计划安检
   Vue.component('add-plan-item', (resolve) => { require(['./components/android/AddPlanItem'], resolve) })
+  // 在线复检
+  Vue.component('reload-check', (resolve) => { require(['./components/android/recheck/Recheck'], resolve) })
+  //记录查看
+  Vue.component('phone-record-info', (resolve) => { require(['./components/android/PhoneRecordInfo'], resolve) })
 // 总界面头样式
   Vue.component('back-page', (resolve) => { require(['./components/android/ToolsPage'], resolve) })
 // 导航栏
@@ -144,6 +151,16 @@ export default function (filiale) {
   Vue.component('device-item', (resolve) => { require(['./components/android/DevicesItem'], resolve) })
   // 临时安检计划
   Vue.component('current-create', (resolve) => { require(['./components/android/CurrentCreate'], resolve) })
+  // 安检待办---民用
+  Vue.component('civil-current-create', (resolve) => { require(['./components/android/CivilCurrentCreate'], resolve) })
+  // 安检待办---非民用
+  Vue.component('no-civil-current-create', (resolve) => { require(['./components/android/NoCivilCurrentCreate'], resolve) })
+  //  解除限购
+  Vue.component('relieve-restrict', (resolve) => { require(['./components/android/RelieveRestrict'], resolve) })
+  //  限购管理
+  Vue.component('restriction', (resolve) => { require(['./components/android/Restriction'], resolve) })
+  // 新安检待办：增加可以在此页面看到 到访不遇和拒检的用户
+  Vue.component('current-create-new', (resolve) => { require(['./components/android/CurrentCreate_new'], resolve) })
   Vue.component('right-tree', (resolve) => { require(['./components/android/RightTree'], resolve) })
   //安检计划下载
   Vue.component('check-plan-down', (resolve) => { require(['./components/android/CheckPlanDown'], resolve) })
@@ -162,7 +179,7 @@ export default function (filiale) {
 
 
 
-  Vue.component('check-plan-result', (resolve) => { require(['./components/android/CheckPlanResult'], resolve) })
+  Vue.component('check-plan-result', (resolve) => { require(['./components/android/checkPlanResult'], resolve) })
   //抽单
   Vue.component('extract-plan-item', (resolve) => { require(['./components/android/ExtractPlanItem'], resolve) })
   // go-wasm测试页面
@@ -173,7 +190,7 @@ export default function (filiale) {
   // go-wasm测试页面
   Vue.component('phone-safe-plan', (resolve) => { require(['./components/android/wasm/PhoneSafePlan'], resolve) })
   // 安检用户信息查看
-  Vue.component('safecheck-userinfo', (resolve) => { require(['./components/android/userinfo/SafecheckUserinfo'], resolve) })
+  Vue.component('safecheck-userinfo', (resolve) => { require(['./components/android/userinfo/SafecheckUserInfo'], resolve) })
   Vue.component('android-defect-deal', (resolve) => { require(['./components/android/AndroidDefectDeal'], resolve) })
   // 在线用户档案核对
    //Vue.component('user-safe-app', (resolve) => { require(['../examples/UserFiles/App'], resolve) })
@@ -188,6 +205,9 @@ export default function (filiale) {
   Vue.component('Announcement', (resolve) => { require(['./components/android/Announcement'], resolve) })
   // 手机端安检情况在线查看
   Vue.component('DailyworkloadQuery', (resolve) => { require(['./components/android/DailyworkloadQuery'], resolve) })
+  Vue.component('safe-history-look', (resolve) => { require(['./components/android/safeHistoryLook'], resolve) })
+  // 手机端安检情况在线查看
+  Vue.component('new-check-paper-android', (resolve) => { require(['./components/android/NewCheckpaperAndroid'], resolve) })
   // 手机在线开关阀
   Vue.component('switch-valve', (resolve) => { require(['./components/android/SwitchValve'], resolve) })
 
@@ -213,6 +233,57 @@ export default function (filiale) {
   Vue.component('PhoneUpUserinfo', (resolve) => {
     require(['./components/android/PhoneUpUserinfo.vue'], resolve)
   })
+      //购气记录
+    Vue.component('phone-sell-info', (resolve) => {
+        require(['./components/android/PhoneSellInfo'], resolve)
+    })
+
+  //中盛点火信息
+  // Vue.component('ignition-information', (resolve) => { require(['./components/android/IgnitionInformation'], resolve) })
+  // Vue.component('buy-records', (resolve) => { require(['./components/android/BuyRecords'], resolve) })
+  //专项安检
+  Vue.component('addspecial-planitem', (resolve) => {
+    require(['./components/android/AddSpecialPlanItem'], resolve)
+  })
+  //物联网表  功能名称：指令查看
+  Vue.component('iot-instruction', (resolve) => { require(['./components/android/Iotinstructionsview/IoTinstruction'], resolve) })
+  //安检计划列表
+  Vue.component('check-plan-list', (resolve) => { require(['./components/android/CheckPlanList'], resolve) })
+
+  // 在线复检稽查
+  Vue.component('safe-plan-item', (resolve) => { require(['./components/android/SafePlanItem'], resolve) })
+  // 在线维护
+  Vue.component('online-vindicate', (resolve) => { require(['./components/android/OnlineVindicate'], resolve) })
+
+  Vue.component('clock-in', (resolve) => {require(['./components/android/ClockIn'], resolve)})
+
+  Vue.component('online-query-check', (resolve) => { require(['./components/android/OnlineCheckByArea'], resolve) })
+
+  // 保险管理页面
+  Vue.component('phone-insurance-manage', (resolve) => { require(['./components/android/Insurance/PhoneInsuranceManage'], resolve) })
+  // 保险登记页面
+  Vue.component('phone-insurance-purchase', (resolve) => { require(['./components/android/Insurance/PhoneInsurancePurchase'], resolve) })
+  // 保险登记详情页面
+  Vue.component('phone-insurance-purchase-detail', (resolve) => { require(['./components/android/Insurance/PhoneInsurancePurchaseDetail'], resolve) })
+  // 保险记录页面
+  Vue.component('phone-insurance-record-list', (resolve) => { require(['./components/android/Insurance/PhoneInsuranceRecordList'], resolve) })
+  Vue.component('PhoneUpDetail', (resolve) => { require(['./components/android/PhoneUpDetail'], resolve) })
+  Vue.component('blackUserOnline', (resolve) => { require(['./components/android/BlackUserOnLine'], resolve) })
+  // 预约安检待办界面
+  Vue.component('yuyue-add-planitem', (resolve) => { require(['./components/android/YuYueAddPlanItem'], resolve) })
+
+
+  Vue.component('reload-check-n', (resolve) => { require(['./components/safecheckNew/android/Recheck'], resolve) })
+  Vue.component('area-plan-n', (resolve) => { require(['./components/safecheckNew/android/AreaPlan'], resolve) })
+  Vue.component('add-plan-item-n', (resolve) => { require(['./components/safecheckNew/android/AddPlanItem'], resolve) })
+  Vue.component('current-create-n', (resolve) => { require(['./components/safecheckNew/android/CurrentCreate.vue'], resolve) })
+  Vue.component('safecheck-order-n', (resolve) => { require(['./components/safecheckNew/android/SafecheckOrderV.vue'], resolve) })
+  Vue.component('safecheck-devices-n', (resolve) => { require(['./components/safecheckNew/android/SafecheckDevices.vue'], resolve) })
+  Vue.component('safecheck-order-temp', (resolve) => { require(['./components/android/SafecheckOrderVTemp'], resolve) })
+  Vue.component('safecheck-devices-temp', (resolve) => { require(['./components/android/SafecheckDevicesTemp'], resolve) })
+  Vue.component('paper-feedback-temp', (resolve) => { require(['./components/android/PaperFeedbackTemp'], resolve) })
+  Vue.component('online-repair-safe', (resolve) => {require(['./components/android/OnlineRepairSafe'], resolve)})
+  Vue.component('phone-other-info', (resolve) => {require(['./components/android/PhoneotherInfo'], resolve)})
   //特殊目录给这里加
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/android`).specialComp

package/src/safecheck.js

@@ -1,8 +1,12 @@
 import Vue from 'vue'
-
+import GetCheckParam from './plugins/GetCheckParams'
+import LoadCheckParam from './plugins/LoadCheckParams'
 
 // 安检用组件注册
 export default function (filiale) {
+
+  Vue.use(GetCheckParam)
+  Vue.use(LoadCheckParam)
   // Vue.component('login', (resolve) => { require(['./components/Login'], resolve) })
   // 安检计划相关
   Vue.component('check-page', (resolve) => {
@@ -30,6 +34,10 @@ export default function (filiale) {
   Vue.component('select-check-plan', (resolve) => {
     require(['./components/checkplan/SelectCheckPlan'], resolve)
   })
+  //安检员考核 计划+无计划
+  Vue.component('select-check-plan-and-no-plan', (resolve) => {
+    require(['./components/pc/SelectCheckPlanAndNoPLan'], resolve)
+  })
 // Vue.component('home-page', (resolve) => { require(['./components/Main'], resolve) })
   Vue.component('adjust-plan', (resolve) => {
     require(['./components/levelplan/AdjustPlan'], resolve)
@@ -37,13 +45,23 @@ export default function (filiale) {
   Vue.component('issue-plan', (resolve) => {
     require(['./components/issueplan/IssuePlanMain'], resolve)
   })
-// 安检单查看paper-main
+// 安检单查看paper-main ps:安检结果查看
   Vue.component('paper-main', (resolve) => {
     require(['./components/paper/PaperList'], resolve)
   })
+  Vue.component('paper-main-n', (resolve) => {
+    require(['./components/safecheckNew/PaperList'], resolve)
+  })
   //资料修改审核
   Vue.component('UserInfoAudit', (resolve) => {
     require(['./components/userfile/UserInfoAudit'], resolve)
+  })  //安装转单审核
+  Vue.component('SecurityAudit', (resolve) => {
+    require(['./components/userfile/SecurityAudit'], resolve)
+  })
+  //资料修改审核-新
+  Vue.component('UserInfoAuditNew', (resolve) => {
+    require(['./components/userfileNew/UserInfoAuditNew'], resolve)
   })
   // 巡检单查看
   Vue.component('inspectionList', (resolve) => {
@@ -269,6 +287,9 @@ export default function (filiale) {
   Vue.component('new-check-paper', (resolve) => {
     require(['./components/pc/NewCheckpaper'], resolve)
   })
+  Vue.component('new-check-paper-temp', (resolve) => {
+    require(['./components/pc/NewCheckpaperTemp'], resolve)
+  })
   //附件上传1
   Vue.component('safecheck-file-upload', (resolve) => {
     require(['./components/Util/SafecheckUpload'], resolve)
@@ -302,8 +323,8 @@ export default function (filiale) {
   Vue.component('img-self-safe', (resolve) => {
     require(['./components/Util/ImgSelfSafe'], resolve)
   })
-  Vue.component('check-plan-list', (resolve) => {
-    require(['./components/plancheck/CheckPlanList'], resolve)
+  Vue.component('img-self-plus', (resolve) => {
+    require(['./components/Util/ImgSelfSafePlus'], resolve)
   })
 
 // 年度维修任务追踪分解
@@ -326,13 +347,6 @@ export default function (filiale) {
   Vue.component('defect-modal', (resolve) => {
     require(['./components/defects/DefectModal'], resolve)
   })
-// 全局统计
-  Vue.component('splash', (resolve) => {
-    require(['./components/cockpit/Splash'], resolve)
-  })
-  Vue.component('splash-detail', (resolve) => {
-    require(['./components/cockpit/SplashDetail'], resolve)
-  })
 //用户档案修改
   Vue.component('user-entry', (resolve) => {
     require(['./components/metterfiles/UserFiles'], resolve)
@@ -455,10 +469,16 @@ export default function (filiale) {
   Vue.component('check-paper-search-user', (resolve) => {
     require(['./components/querycheckpaper/CheckPaperSearchUser'], resolve)
   })
+  Vue.component('check-paper-search-user-new', (resolve) => {
+    require(['./components/querycheckpaper/CheckPaperSearchUserNew'], resolve)
+  })
   //安检综合查询
   Vue.component('check-search-user', (resolve) => {
     require(['./components/querycheckpaper/CheckSearchUser'], resolve)
   })
+  Vue.component('check-search-user-new', (resolve) => {
+    require(['./components/querycheckpaper/CheckSearchUserNew'], resolve)
+  })
   // 安检查询表
   Vue.component('paper-search', (resolve) => {
     require(['./components/querycheckpaper/PaperSearch'], resolve)
@@ -529,6 +549,10 @@ export default function (filiale) {
   Vue.component('safeplanstatistics', (resolve) => {
     require(['./components/report/SafePlanStatistics'], resolve)
   })
+  //无计划安检情况报表
+  Vue.component('no-checkplan-safecheck', (resolve) => {
+    require(['./components/report/NoCheckplanSafecheck'], resolve)
+  })
   // 安检情况汇总-总组件
   Vue.component('check-plan-area-manage', (resolve) => {
     require(['./components/report/CheckPlanAreaManage'], resolve)
@@ -541,6 +565,15 @@ export default function (filiale) {
   Vue.component('check-plan-user-list', (resolve) => {
     require(['./components/report/CheckPlanUserList'], resolve)
   })
+  // 根据安检员去查看计划安检的数据
+  Vue.component('check-by-plan', (resolve) => {
+    require(['./components/report/CheckByPlan'], resolve)
+  })
+
+  // 根据安检员去查看计划安检的数据
+  Vue.component('check-by-area-report', (resolve) => {
+    require(['./components/report/CheckPlanAreaReport'], resolve)
+  })
 
 
 //安检员考核
@@ -556,6 +589,9 @@ export default function (filiale) {
   Vue.component('export-excel-safe', (resolve) => {
     require(['./components/ExportExcel'], resolve)
   })
+  Vue.component('export-excel-old', (resolve) => {
+    require(['./components/ExportExcelOld'], resolve)
+  })
 
 
   //隐患报表
@@ -582,7 +618,7 @@ export default function (filiale) {
 
   // 隐患单查看
   Vue.component('defect-paper-weixiu', (resolve) => {
-    require(['./components/defect/DefectPaperWeixiu'], resolve)
+    require(['./components/defect/DefectPaperWeiXiu'], resolve)
   })
   // 隐患列表
   Vue.component('defect-list-weixiu', (resolve) => {
@@ -604,6 +640,9 @@ export default function (filiale) {
   Vue.component('img-button', (resolve) => {
     require(['./components/defect/ImgButton'], resolve)
   })
+  Vue.component('img-buttons', (resolve) => {
+    require(['./components/defect/ImgButtons'], resolve)
+  })
   // go-wasm测试页面
   Vue.component('phone-safe-plan', (resolve) => {
     require(['./components/android/wasm/PhoneSafePlan'], resolve)
@@ -644,6 +683,20 @@ export default function (filiale) {
   Vue.component('circle-list', (resolve) => {
     require(['./components/filialCircle/CircleList'], resolve)
   })
+  //最新的隐患查看-后续都维护这个
+  Vue.component('defect-main-new', (resolve) => {
+    require(['./components/NewDefectList/DefectMainNew'], resolve)
+  })
+  Vue.component('safe-defect-list-new', (resolve) => {
+    require(['./components/NewDefectList/DefectListNew'], resolve)
+  })
+  Vue.component('safe-defect-paper-new', (resolve) => {
+    require(['./components/NewDefectList/DefectPaperNew'], resolve)
+  })
+
+  Vue.component('defect-main-new2', (resolve) => {
+    require(['./components/DefectDealMain/DefectMainNew'], resolve)
+  })
 
   //周口安检员考核
   Vue.component('zhoukou-checkcount', (resolve) => {
@@ -660,9 +713,18 @@ export default function (filiale) {
   Vue.component('role-selector-safe', (resolve) => {
     require(['./components/pc/RoleSelector'], resolve)
   })
+  Vue.component('role-selector-safe-dep', (resolve) => {
+    require(['./components/pc/RoleSelectorDep'], resolve)
+  })
+  Vue.component('CheckPlanCountChartArea', (resolve) => {
+    require(['./components/report/CheckPlanCountChartArea'], resolve)
+  })
   Vue.component('right-tree-safe', (resolve) => {
     require(['./components/Util/RightTreeSafe'], resolve)
   })
+  Vue.component('right-tree-safe-dep', (resolve) => {
+    require(['./components/Util/RightTreeSafeDep'], resolve)
+  })
 
   Vue.component('AnnouncementPC', (resolve) => {
     require(['./components/pc/AnnouncementPC'], resolve)
@@ -685,6 +747,18 @@ export default function (filiale) {
   Vue.component('amap-trail-show-zk', (resolve) => {
     require(['./components/map/AMapTrailShowZk'], resolve)
   })
+  //  人员轨迹页面(新)
+  Vue.component('person-track', (resolve) => {
+    require(['./components/map/PersonTrack'], resolve)
+  })
+  //  轨迹地图展示(新)
+  Vue.component('a-map-trajectory-new', (resolve) => {
+    require(['./components/map/AMapTrajectoryNew.vue'], resolve)
+  })
+  //  轨迹地图展示(新)
+  Vue.component('amap-trajectory-safe', (resolve) => {
+    require(['./components/map/AMapTrajectory.vue'], resolve)
+  })
 
   Vue.component('PhoneUpUserinfo', (resolve) => {
     require(['./components/android/PhoneUpUserinfo.vue'], resolve)
@@ -695,8 +769,14 @@ export default function (filiale) {
   Vue.component('test', (resolve) => {
     require(['./components/Test'], resolve)
   })
-  Vue.component('check-book-manage', (resolve) => {
-    require(['./components/pc/CheckBookManage'], resolve)
+  Vue.component('check-book-search-user', (resolve) => {
+    require(['./components/pc/CheckBookSearchUser'], resolve)
+  })
+  Vue.component('check-book-search-area', (resolve) => {
+    require(['./components/pc/CheckBookSearchArea'], resolve)
+  })
+  Vue.component('check-book-search-unit', (resolve) => {
+    require(['./components/pc/CheckBookSearchUnit'], resolve)
   })
   Vue.component('check-book', (resolve) => {
     require(['./components/pc/CheckBook'], resolve)
@@ -704,15 +784,107 @@ export default function (filiale) {
   Vue.component('check-book-user', (resolve) => {
     require(['./components/pc/CheckBookUser'], resolve)
   })
+  Vue.component('check-book-area', (resolve) => {
+    require(['./components/pc/CheckBookArea'], resolve)
+  })
+  Vue.component('check-book-company', (resolve) => {
+    require(['./components/pc/CheckBookCompany'], resolve)
+  })
   Vue.component('check-book-list', (resolve) => {
     require(['./components/pc/CheckBookList'], resolve)
   })
-  //
-  //
-  // // JSON编辑器总
-  // Vue.component('safe-json-editor', (resolve) => { require(['./components/json-editor/SafeJsonEditor'], resolve) })
-  // // JSON编辑器vue组件
-  // Vue.component('json-editor-safe', (resolve) => { require(['./components/json-editor/vue-json-editor'], resolve) })
+  Vue.component('check-book-details', (resolve) => {
+    require(['./components/pc/CheckBookDetails'], resolve)
+  })
+
+  Vue.component('check-book-entry', (resolve) => {
+    require(['./components/pc/CheckBookEntry'], resolve)
+  })
+  Vue.component('add-to-check-book', (resolve) => {
+    require(['./components/pc/AddToCheckBook'], resolve)
+  })
+  Vue.component('print-material-bill', (resolve) => {
+    require(['./components/pc/PrintMaterialBill'], resolve)
+  })
+  Vue.component('safecheck-tree', (resolve) => {
+    require(['./components/pc/SafeCheckTree'], resolve)
+  })
+  Vue.component('check-book-search-user-list', (resolve) => {
+    require(['./components/pc/CheckBookSearchUserList'], resolve)
+  })
+  // HazardStatistics.vue
+  Vue.component('HazardStatistics', (resolve) => {
+    require(['./components/report/HazardStatistics'], resolve)
+  })
+  Vue.component('select-check-noplan', (resolve) => {
+    require(['./components/pc/SelectCheckNoPlan'], resolve)
+  })
+  Vue.component('check-nodetail', (resolve) => {
+    require(['./components/pc/CheckNoDetail'], resolve)
+  })
+  Vue.component('check-noplan', (resolve) => {
+    require(['./components/pc/CheckNoPlan'], resolve)
+  })
+  Vue.component('check-plan-count-chart', (resolve) => {
+    require(['./components/pc/CheckPlanCountChart'], resolve)
+  })
+
+  Vue.component('no-plan-user-info', (resolve) => {
+    require(['./components/noplan/NoPlanUserInfo'], resolve)
+  })
+  Vue.component('no-plan-search-user', (resolve) => {
+    require(['./components/noplan/NoPlanSearchUser'], resolve)
+  })
+  Vue.component('no-plan-paper-list', (resolve) => {
+    require(['./components/noplan/NoPlanPaperList'], resolve)
+  })
+  //  安检预约核心页面
+  Vue.component('safe-check-order', (resolve) => {
+    require(['./components/pc/SafeCheckOrder/SafeCheckOrder'], resolve)
+  })
+  Vue.component('safe-check-order-list', (resolve) => {
+    require(['./components/pc/SafeCheckOrder/SafeCheckOrderList'], resolve)
+  })
+  Vue.component('safe-check-order-apply-dispose-basics', (resolve) => {
+    require(['./components/pc/SafeCheckOrder/SafeCheckOrderApplyDisposeBasics'], resolve)
+  })
+  Vue.component('old-paper-list', (resolve) => {
+    require(['./components/olddata/OldPaperList'], resolve)
+  })
+  Vue.component('yin-huan-bi-huan', (resolve) => {
+    require(['./components/report/YinHuanBiHuan'], resolve)
+  })
+  Vue.component('safecheck-device-list', (resolve) => {
+    require(['./components/pc/SafecheckDeviceList'], resolve)
+  })
+  Vue.component('dep-selector', (resolve) => {
+    require(['./components/pc/DepSelector'], resolve)
+  })
+  Vue.component('defect-list-export', (resolve) => {
+    require(['./components/pc/DefectList'], resolve)
+  })
+  Vue.component('safe-visit-history', (resolve) => {
+    require(['./components/pc/SafeVisitHistory'], resolve)
+  })
+  Vue.component('paper-visit-main', (resolve) => {
+    require(['./components/pc/PaperVisitMain'], resolve)
+  })
+  Vue.component('defect-deal', (resolve) => {
+    require(['./components/pc/DefectDeal'], resolve)
+  })
+  Vue.component('paper-edit', (resolve) => {
+    require(['./components/pc/PaperEdit'], resolve)
+  })
+  Vue.component('edit', (resolve) => {
+    require(['./components/pc/Edit'], resolve)
+  })
+  Vue.component('print-data-safe', (resolve) => {
+    require(['./components/pc/PrintData'], resolve)
+  })
+  Vue.component('print-table-safe', (resolve) => {
+    require(['./components/pc/PrintTable'], resolve)
+  })
+
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
     for (let key in filialeComp) {

package/src/shaoguan.js

@@ -141,8 +141,8 @@ export default function () {
 // 隐患处理
   Vue.component('defect-modal', (resolve) => { require(['./components/defects/DefectModal'], resolve) })
 // 全局统计
-  Vue.component('splash', (resolve) => { require(['./components/cockpit/Splash'], resolve) })
-  Vue.component('splash-detail', (resolve) => { require(['./components/cockpit/SplashDetail'], resolve) })
+//   Vue.component('splash', (resolve) => { require(['./components/cockpit/Splash'], resolve) })
+//   Vue.component('splash-detail', (resolve) => { require(['./components/cockpit/SplashDetail'], resolve) })
 //用户档案修改
   Vue.component('user-entry', (resolve) => { require(['./components/metterfiles/UserFiles'], resolve) })
   Vue.component('metter-files', (resolve) => { require(['./components/metterfiles/MetterFiles'], resolve) })

package/src/tongchengsafe-android.js

@@ -150,9 +150,9 @@ export default function () {
   //维修查询
   Vue.component('repair-query', (resolve) => { require(['./components/android/RepairQuery'], resolve) })
   // 安检项
-  Vue.component('check-plan-result', (resolve) => { require(['./components/android/CheckPlanResult'], resolve) })
+  Vue.component('check-plan-result', (resolve) => { require(['./components/android/checkPlanResult'], resolve) })
   // 安检用户信息查看
-  Vue.component('safecheck-userinfo', (resolve) => { require(['./components/android/userinfo/SafecheckUserinfo'], resolve) })
+  Vue.component('safecheck-userinfo', (resolve) => { require(['./components/android/userinfo/SafecheckUserInfo'], resolve) })
   //反馈意见
   Vue.component('advise-commit', (resolve) => { require(['./components/android/AdviseCommit'], resolve) })
   Vue.component('export-excel-safe', (resolve) => {

package/src/tongchengsafecheck.js

@@ -138,8 +138,8 @@ export default function () {
 // 隐患处理
   Vue.component('defect-modal', (resolve) => { require(['./components/defects/DefectModal'], resolve) })
 // 全局统计
-  Vue.component('splash', (resolve) => { require(['./components/cockpit/Splash'], resolve) })
-  Vue.component('splash-detail', (resolve) => { require(['./components/cockpit/SplashDetail'], resolve) })
+//   Vue.component('splash', (resolve) => { require(['./components/cockpit/Splash'], resolve) })
+//   Vue.component('splash-detail', (resolve) => { require(['./components/cockpit/SplashDetail'], resolve) })
 //用户档案修改
   Vue.component('user-entry', (resolve) => { require(['./components/metterfiles/UserFiles'], resolve) })
   Vue.component('metter-files', (resolve) => { require(['./components/metterfiles/MetterFiles'], resolve) })

package/src/utils/GerJsonObjectConfig.js

@@ -26,7 +26,7 @@ let ObjConfig = {
   },
   // 将object转成数组
   getChangeObject(obj){
-    console.log('1111===>' +JSON.stringify(obj))
+    //tag)
     var getconfig = []
     for(var key in obj){
       var fig = {