safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/filiale/qianneng/pc/PlanManage.vue

@@ -479,7 +479,7 @@
           return Vue.$appdata.getParam('安检类型')
         },*/
         async loadpage(){
-          //await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"('"+this.userlogin.orgid+"')",orderitem:"f_create_time desc"})
+          //await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发", {},{groupitem:"",f_filialeids:"('"+this.userlogin.orgid+"')",orderitem:"f_create_time desc"})
           await this.loadCheckPlan()
           await this.searchChecker(this.userlogin.id)
         },
@@ -522,7 +522,7 @@
             return
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST","/rs/sql/getCheckplan", {data: {condition:"f_plan_name='"+this.createPlan.f_plan_name+"'",sortfield:'f_create_time desc'}})
+          let res=await new HttpResetClass().load("POST","/api/af-safecheck/sql/getCheckplan", {data: {condition:"f_plan_name='"+this.createPlan.f_plan_name+"'",sortfield:'f_create_time desc'}})
           console.log("结果-"+res.data.length)
           if(res.data.length>0){
             Vue.showMessage("计划名称不能重复！")
@@ -542,7 +542,7 @@
           this.createPlan.f_filialeid=this.userlogin.orgid
           this.createPlan.f_create_operator=this.userlogin.name
           this.createPlan.f_create_time=Util.toStandardTimeString()
-          await new HttpResetClass().load('POST',"/rs/logic/createCheckPlan", {"data": this.createPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'})
+          await new HttpResetClass().load('POST',"/api/af-safecheck/logic/createCheckPlan", {"data": this.createPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'})
           //await this.loadCheckPlan('',()=>{})
           this.createPlan={
             f_plan_name:'',
@@ -633,7 +633,7 @@
             }
 
           }
-          await this.checkplan.searchList("/rs/sql/预约计划下发",
+          await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发",
             {"f_plan_name": "f_plan_name like '%{}%'",
               "f_plan_year":"f_plan_year={}",
               "f_plan_month":"f_plan_month={}",
@@ -698,7 +698,7 @@
             this.upCheckPlan.f_checker=this.upCheckPlan.checker.name
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/updateCheckPlan", {
             data:{
               f_checker:this.upCheckPlan.f_checker,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
@@ -725,7 +725,7 @@
             return
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST", "/rs/logic/NewBespeakCheckPlan", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/NewBespeakCheckPlan", {
             data:{
               f_issued:'是',
               f_issue_time:Util.toStandardTimeString(),
@@ -749,7 +749,7 @@
             return
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST", "/rs/logic/deleteCheckPlan", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/deleteCheckPlan", {
             data:{
               f_operator:this.userlogin.orgstr,//global.login.name,
               condition:"",

package/src/filiale/qianneng/pc/UserInfoAudit.vue

@@ -113,7 +113,7 @@ export default {
   components: {InfoModifyModal},
   title: '档案审核',
   data () {
-    let model = new PagedList('rs/sql/用户档案审核查询', 20, {
+    let model = new PagedList('api/af-safecheck/sql/用户档案审核查询', 20, {
       groupitem: '""', orderitem: '"f_time desc"', f_approved: 'this.f_approved[0]', filialestr: 'this.filialestr'
     })
     model.filialestr = this.$login.f.orgid
@@ -138,7 +138,7 @@ export default {
     change (row) {
 
       //tag)
-      new HttpResetClass().load('post', `/rs/logic/filemanage_getFilesDetail`, {
+      new HttpResetClass().load('post', `/api/af-safecheck/logic/filemanage_getFilesDetail`, {
 
         //f_userinfo_code:'12381344',
         f_userinfo_id: row.f_userinfoid
@@ -197,7 +197,7 @@ export default {
         useraddressms.f_operator = row.f_modifier
         useraddressms.f_operatorid = row.f_modifier_id
       try{
-        let res1 = await new HttpResetClass().load('POST', '/rs/logic/filemanage_fileSave', {
+        let res1 = await new HttpResetClass().load('POST', '/api/af-safecheck/logic/filemanage_fileSave', {
           data: {
             userinfo: userinfoms,
             modifyReason: this.f_source ? `${this.f_source}审核通过更改档案信息` : '',
@@ -206,7 +206,7 @@ export default {
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         if (res1.data.status == 200) {
-          let res2 = await new HttpResetClass().load('POST', '/rs/logic/address_updateuseraddress', useraddressms, {
+          let res2 = await new HttpResetClass().load('POST', '/api/af-safecheck/logic/address_updateuseraddress', useraddressms, {
             resolveMsg: null,
             rejectMsg: null
           })
@@ -217,7 +217,7 @@ export default {
             this.info.f_approved_by = this.$login.f.name
             this.info.f_approved_time = Util.toStandardTimeString()
             //tag)
-            let res3 = await new HttpResetClass().load('POST', '/rs/logic/SaveEntity', {
+            let res3 = await new HttpResetClass().load('POST', '/api/af-safecheck/logic/SaveEntity', {
               data: {
                 row: this.info,
                 tablename: 't_modify_userinfo'
@@ -266,7 +266,7 @@ export default {
     this.info.f_approved = '未通过'
     this.info.f_approved_by = this.$login.f.name
     this.info.f_approved_time = Util.toStandardTimeString()
-    new HttpResetClass().load('POST', '/rs/logic/SaveEntity', {
+    new HttpResetClass().load('POST', '/api/af-safecheck/logic/SaveEntity', {
       data: {
         row: this.info,
         tablename: 't_modify_userinfo'

package/src/filiale/qianneng/pc/checkPlanList.vue

@@ -39,14 +39,14 @@
               </button>
               <button class="button_search" style="margin-right: 10px" @click="search()">查询</button>
               <button class="button_search" @click="$parent.$parent.clearCondition()">清除</button>
-              <export-excel-safe :data="$parent.$parent.exportParameter"
+              <export-excel :data="$parent.$parent.exportParameter"
                                  :field="$parent.$parent.exportExcelField"
                                  style="margin-left: 0"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                  :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'"
                                  :header="[[($parent.$parent.selectplan.f_plan_name + ($parent.$parent.selectplan.f_checker && $parent.$parent.selectplan.f_checker!= null ? (':' + $parent.$parent.selectplan.f_checker+'___________') : ':______________________________')) + ('共享:' + ($parent.$parent.selectplan.f_checker ? '否' : '是'))]]"
                                  :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
             </div>
             <div class="form-group col-sm-2 safe_p">
               <label class="font_normal_body"
@@ -130,11 +130,11 @@
             </modal>
             <!--<div class="form-group col-sm-4 button-range" >
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
+              <export-excel   :data="$parent.$parent.exportParameter"
                                    :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                    template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
 
             </div>-->
           </div>
@@ -221,7 +221,7 @@
     title: '计划管理',
     data() {
       return {
-        model: new PagedList('/rs/sql/planItem', 100, {}),
+        model: new PagedList('/api/af-safecheck/sql/planItem', 100, {}),
         a: '1',
         opt: [{label: "测试", value: "测试"}],
         showCondtion: false,
@@ -273,7 +273,7 @@
         }
         this.$parent.isSend = true
         try {
-          let res = await new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItem", {
+          let res = await new HttpResetClass().load("POST", "/api/af-safecheck/logic/UpCheckPlanItem", {
             data: {
               f_operator: this.userlogin.name,
               f_plan_id: this.$refs.modalp.$children[0].selectedRow.id,
@@ -366,7 +366,7 @@
         }
         this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？", ['confirm', 'cancel']).then((button) => {
           if (button == 'confirm') {
-            let resu = new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItemState", {
+            let resu = new HttpResetClass().load("POST", "/api/af-safecheck/logic/UpCheckPlanItemState", {
               data: {
                 f_operator: this.userlogin.name,
                 condition: this.model.condition,

package/src/filiale/qianneng/pc/checkUserList.vue

@@ -46,12 +46,12 @@
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.clearUserInfoId()">清空编号</button>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
               <button class="button_search" @click="$parent.$parent.clear()">清除</button>
-              <export-excel-safe :data="$parent.$parent.exportParameter"
+              <export-excel :data="$parent.$parent.exportParameter"
                                  :field="$parent.$parent.exportExcelField"
                                  style="margin-left: 0"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ"
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ"
                                  :template-name="'安检计划用户信息导出'" :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
             </div>
             <div class="form-group col-sm-1" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.dragtoPlanItem()">添入计划</button>
@@ -372,11 +372,11 @@
             <!--<div class="form-group col-sm-4 button-range" >
 
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
+              <export-excel   :data="$parent.$parent.exportParameter"
                                    :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                    template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
 
             </div>-->
           </div>
@@ -425,7 +425,7 @@
     title: '计划管理',
     data() {
       return {
-        model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
+        model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
           "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
           "f_usertype": "''",
           "month": "''",
@@ -526,7 +526,7 @@
         Vue.showMessage("已清空用户编号")
       },
       getpricename() {
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`,
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,
           {
             data: {
               items: "f_price_name",
@@ -549,7 +549,7 @@
 
       getCheckBook(){
         this.checkBooks=[]
-        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'id,f_check_book_name,f_check_book_type',
             tablename: 't_check_book',
@@ -653,7 +653,7 @@
       select_search(text){
         //tag
         let pcdText=text?` and f_residential_area like '%${text}%'`:''
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
           //tag)
           if(res.data.length>0){
             this.areaList=[]
@@ -670,7 +670,7 @@
         this.cbc=[]
         this.sliceArea=[]
         let http = new HttpResetClass()
-        let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
+        let getMeterReadingBooks = await http.load('POST','api/af-safecheck/logic/getMeterBooksData',
           {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'})
         this.cbc = [{label: '全部', value: ''}]
@@ -758,7 +758,7 @@
         if(this.selectplan && this.selectplan.id){
           this.$parent.isSend=true
           try{
-            let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
+            let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/AddCheckPlanItem", {
               data:{
                 f_operator:this.userlogin.name,
                 f_plan_id:this.selectplan.id,
@@ -812,7 +812,7 @@
         let data = {
           filepath: res.f_downloadpath
         }
-        new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+        new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_GetUserInfoFromExcel', {data: data}, {
           resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
           rejectMsg: '导入失败'
         }).then((res) => {

package/src/filiale/qingjian/android/PhoneUpUserinfo.vue

@@ -297,13 +297,15 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备品牌:</label>
-            <v-select class="rightipt" :value.sync="row.f_brand"
+<!--            <v-select class="rightipt" :value.sync="row.f_brand"
                       v-model="row.f_brand"
                       placeholder='请选择'
                       :width='wid'
                       readonly
                       :options="deviceBrandOption[row.f_devices_type]"
-                      close-on-select value-single></v-select>
+                      close-on-select value-single></v-select>-->
+            <input type="text" class="form-control rightipt"
+                   v-model="row.f_brand"/>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备型号:</label><input type="text" class="form-control rightipt"
@@ -354,9 +356,9 @@
             <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"
                                                         v-model="row.f_devices_num"/>
           </div>
-          <!--<div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">管道类型:</label><input type="text" class="form-control rightipt" readonly  v-model="row.f_pipe_type"  />
-          </div>-->
+          <div class="row auto" style="margin: 5px 0">
+            <label class="righttxt">管道类型:</label><input type="text" class="form-control rightipt"   v-model="row.f_pipe_type"  />
+          </div>
           <!--<div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备状态:</label><input type="text" class="form-control rightipt" readonly  v-model="row.f_userinfodevices_state"  />
           </div>-->
@@ -550,7 +552,7 @@ export default {
       //tag
       if (this.selectStreet.id) {
         let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_area",
@@ -663,7 +665,7 @@ export default {
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
           console.log(address)
-          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/fileSave`, {
+          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/fileSave`, {
             data: {
               userinfo: userinfoms,
               modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -674,7 +676,7 @@ export default {
               let data = this.userinfo.addressinfo
               data.f_address = this.userinfo.addressinfo.f_address ? this.userinfo.addressinfo.f_address : this.userinfo_old.addressinfo.f_address
               data.f_operator = Vue.user.name
-              new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
+              new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/address_updateuseraddress`, {data: data}).then((res2) => {
                 this.$showMessage("修改用户信息成功！")
               }).catch(error => {
                 this.$showMessage("修改用户信息！")
@@ -747,7 +749,7 @@ export default {
           //tag)
           console.log(address,'dizhi')
           console.log(userinfoms,'dangan')
-          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/fileSave`, {
+          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/fileSave`, {
             data: {
               userinfo: userinfoms,
               modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -866,7 +868,7 @@ export default {
         this.selectArea = {id: ''}
         this.area = []
         let pcdText = ` and f_street_id=${this.selectStreet.id}`
-        let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_area",
@@ -902,7 +904,7 @@ export default {
         this.userinfo.addressinfo.f_slice_area = ''
         this.streets = []
         let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_street",
@@ -993,7 +995,7 @@ export default {
       if (this.selectStreet.id) {
         this.area = []
         let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-        let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_area",
@@ -1023,7 +1025,7 @@ export default {
         //tag
         this.streets = []
         let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_street",
@@ -1117,7 +1119,7 @@ export default {
       this.excessive = true
       //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
 
-      let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "*",
           tablename: "t_pcd",
@@ -1130,7 +1132,7 @@ export default {
         this.pcds.push({label: result.f_pcd, value: result})
       })
       ////tag)
-      let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+      let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
         //f_userinfo_code:'12381344',
         f_userinfo_id: this.f_userinfo_id
       }, {resolveMsg: null, rejectMsg: null})
@@ -1174,7 +1176,7 @@ export default {
     console.log(this.showBox)
     if (this.showBox) {
       // 获取调压箱
-      new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
+      new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/qingjian/android/SafecheckDevices.vue

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag