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

package/src/components/pc/CheckBookCompany.vue

@@ -69,7 +69,7 @@ export default {
         orgid:this.$login.f.orgid,
         orgstr:this.$login.f.orgs,
       },
-      model: new PagedList('rs/sql/getCheckBookCompany', 50),
+      model: new PagedList('api/af-safecheck/sql/getCheckBookCompany', 50),
       checkAll:false,
       checkes:[],
       addcondata:'',

package/src/components/pc/CheckBookDetails.vue

@@ -167,7 +167,7 @@ export default {
       this.checkBook.f_create_date = Util.toStandardDateString()
       console.log('checkbook', this.checkBook)
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
+      http.load('POST', 'api/af-safecheck/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
         {resolveMsg: '保存片区信息成功', rejectMsg: '保存片区信息失败'}).then(res => {
         if (res.data.code === 200) {
           this.$showMessage('保存片区信息成功',['confirm']).then(res=>{

package/src/components/pc/CheckBookList.vue

@@ -218,7 +218,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result': '安检结果'
       },
-      model: new PagedList('rs/sql/QueryCheckBook', 20),
+      model: new PagedList('api/af-safecheck/sql/QueryCheckBook', 20),
       checkBookRow:{},
       checkBook :{
         f_check_book_name: '',
@@ -268,7 +268,7 @@ export default {
     },
     freshCheckBook () {
       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',
           tablename: 't_check_book',
@@ -297,7 +297,7 @@ export default {
     ok (){
       //tag
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
+      http.load('POST', 'api/af-safecheck/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
         {resolveMsg: '更新片区信息成功', rejectMsg: '保存片区信息成功'}).then(res=>{
           if (res.data.code===200){
             this.$showMessage('修改成功')
@@ -331,9 +331,9 @@ export default {
         let http = new HttpResetClass()
         let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
         let delCheckBook= `delete from t_check_book where id ='${val.id}'`
-        await http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
+        await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
-        await http.load('POST', 'rs/logic/runSQL', {data: {sql: delCheckBook}},
+        await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delCheckBook}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('删除成功')
         this.$refs.paged.$refs.criteria.search()

package/src/components/pc/CheckBookSearchArea.vue

@@ -197,7 +197,7 @@ import bus from "../../bus";
 export default {
   title: '片区管理',
   data () {
-    let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20,{
+    let model = new PagedList('api/af-safecheck/sql/safe_singleTable_OrderBy', 20,{
         items: "'ta.*,tcb.f_check_book_name'",
         tablename: "'t_area ta left join t_check_book tcb on ta.f_check_book_id=tcb.id'",
         orderitem: "'id desc'"
@@ -287,7 +287,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: addUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
           {resolveMsg: null, rejectMsg: '添加用户失败'})
         this.$showMessage('添加用户成功')
         this.selectBook = ''
@@ -324,7 +324,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: upUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upUser}},
           {resolveMsg: null, rejectMsg: '调整用户失败'})
         this.$showMessage('调整用户成功')
         this.selectBook = ''
@@ -399,7 +399,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: delUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delUser}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('从片区删除所选用户成功')
         this.selectBook = ''
@@ -451,7 +451,7 @@ export default {
         checkBook: this.checkBook,
         sqlStr: condition
       }
-      new HttpResetClass().load('post', 'rs/logic/AddCheckBook', {data}).then(res => {
+      new HttpResetClass().load('post', 'api/af-safecheck/logic/AddCheckBook', {data}).then(res => {
         //tag)
         if (res.data.id) {
           this.$showMessage('创建成功')
@@ -523,7 +523,7 @@ export default {
     },
     freshCheckBook () {
       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',
           tablename: 't_check_book',

package/src/components/pc/CheckBookSearchUnit.vue

@@ -87,7 +87,7 @@ import bus from "../../bus";
 export default {
   title: '片区管理',
   data () {
-    let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20,{
+    let model = new PagedList('api/af-safecheck/sql/safe_singleTable_OrderBy', 20,{
       items: "'tc.*,tcb.f_check_book_name'",
       tablename: "'t_company tc left join t_check_book tcb on tc.f_check_book_id=tcb.id'",
       orderitem: "'id desc'"
@@ -190,7 +190,7 @@ export default {
     },
     // freshCheckBook () {
     //   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',
     //       tablename: 't_check_book',

package/src/components/pc/CheckBookSearchUser.vue

@@ -235,7 +235,7 @@ import bus from "../../bus";
 export default {
   title: '片区管理',
   data () {
-    let model = new PagedList('rs/sql/getUserByCheckBookuser', 20)
+    let model = new PagedList('api/af-safecheck/sql/getUserByCheckBookuser', 20)
     return {
       model: model,
       criteriaShow: false,
@@ -319,7 +319,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-       await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: addUser}},
+       await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
          {resolveMsg: null, rejectMsg: '添加用户失败'})
        this.$showMessage('添加用户成功')
        this.selectBook = ''
@@ -356,7 +356,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: upUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upUser}},
           {resolveMsg: null, rejectMsg: '调整用户失败'})
         this.$showMessage('调整用户成功')
         this.selectBook = ''
@@ -431,7 +431,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: delUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delUser}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('从片区删除所选用户成功')
         this.selectBook = ''
@@ -483,7 +483,7 @@ export default {
         checkBook: this.checkBook,
         sqlStr: condition
       }
-      new HttpResetClass().load('post', 'rs/logic/AddCheckBook', {data}).then(res => {
+      new HttpResetClass().load('post', 'api/af-safecheck/logic/AddCheckBook', {data}).then(res => {
         //tag)
         if (res.data.id) {
           this.$showMessage('创建成功')
@@ -556,7 +556,7 @@ export default {
     },
     freshCheckBook () {
       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',

package/src/components/pc/CheckBookSearchUserList.vue

@@ -284,7 +284,7 @@ export default {
       yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
       monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
       showCreatePlan:false,
-      model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
+      model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
         "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
         "f_usertype": "''",
         "month": "''",
@@ -357,7 +357,7 @@ export default {
           param:this.checkes,
           columnName: "ua.id"
       }
-      new HttpResetClass().load("POST",'/rs/logic/createAndAddPlan',{createPlan:this.createPlan,addPlan}).then(res=>{
+      new HttpResetClass().load("POST",'/api/af-safecheck/logic/createAndAddPlan',{createPlan:this.createPlan,addPlan}).then(res=>{
         if(res.data.code==200){
           this.$showMessage("计划下发成功！"+(res.data.result.length>0?"有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
           this.cancelCreatePlan()
@@ -509,7 +509,7 @@ export default {
         }
 
       }
-      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)
         this.areaList=[]
         this.areaList.push({label:"全部",value:""})
@@ -527,7 +527,7 @@ export default {
       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: ''}]
@@ -616,7 +616,7 @@ export default {
       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/components/pc/CheckBookUser.vue

@@ -51,17 +51,17 @@ export default {
   data () {
     return {
       rowdata: this.row,
-      model: new PagedList('rs/sql/getUserByCheckBook', 50)
+      model: new PagedList('api/af-safecheck/sql/getUserByCheckBook', 50)
     }
   },
   ready(){
     if(this.row){
       let condition=''
       if(this.row.f_check_book_type1=='小区'){
-        this.model.url = 'rs/sql/getUserByCheckBook'
+        this.model.url = 'api/af-safecheck/sql/getUserByCheckBook'
         condition  = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
       }else{
-        this.model.url = 'rs/sql/getUserByCheckBookCompany'
+        this.model.url = 'api/af-safecheck/sql/getUserByCheckBookCompany'
         condition  = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
       }
       this.model.search(condition)

package/src/components/pc/CheckNoDetail.vue

@@ -35,11 +35,11 @@
                 </div>
                 <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="noplanItem"
+                                         sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="noplanItem"
                                          template-name='无计划安检单明细' :choose-col="true">
-                    </export-excel-safe>
+                    </export-excel>
 
                 </div>
             </div>
@@ -81,7 +81,7 @@ export default {
   title: '无计划安检单列表',
   data () {
     return {
-        model: new PagedList('rs/sql/noplanItem', 20),
+        model: new PagedList('api/af-safecheck/sql/noplanItem', 20),
         checkState:[{label:'全部',value:''},{label:'入户',value:'入户'},{label:'未入户',value:'未入户'}],
         noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
         excelHeaders: {

package/src/components/pc/CheckPlanCountChart.vue

@@ -57,7 +57,7 @@ export default {
       }
       //CheckPlanCountChart
       let http = new HttpResetClass()
-      http.load('POST', '/rs/sql/CheckPlanCountChart', {data: valdata}, {
+      http.load('POST', '/api/af-safecheck/sql/CheckPlanCountChart', {data: valdata}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/components/pc/DefectDeal.vue

@@ -29,10 +29,10 @@
                           condition="f_is_repaired = '{}'"></v-select>
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
-                <export-excel-safe :data="$parent.$parent.searchData"
+                <export-excel :data="$parent.$parent.searchData"
                               :field="$parent.$parent.excelHeaders"
                               progress="safeGetExportProgress"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="defectDetails" template-name='隐患处置'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="defectDetails" template-name='隐患处置'></export-excel>
                 <button style="margin-left: 4px" class="button_search button_spacing" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
                 <button style="margin-left: 4px" class="button_search button_spacing"  @click="$parent.$parent.toRepair" v-if="$parent.$parent.canToRepair == '是'">转维修</button>
                 <button style="margin-left: 4px" class="button_search button_spacing" @click="search()">查询</button>
@@ -430,7 +430,7 @@
   export default {
     title: '隐患处置',
     data() {
-      let model = new PagedList('rs/sql/DefectDetailsYC', 20,{
+      let model = new PagedList('api/af-safecheck/sql/DefectDetailsYC', 20,{
       })
       model.f_plan_id = ''
       model.f_approved = ''
@@ -525,7 +525,7 @@
     },
     methods: {
       async getDefectOption() {
-        let res = await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_GroupBy`, {
+        let res = await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
           data: {
             items: "pd.f_device_type",
             tablename: "t_paper_devices pd left join t_devices_items di on pd.id = di.f_device_id",
@@ -538,7 +538,7 @@
           device_types.push({label: item.f_device_type, value: item.f_device_type})
         })
         this.device_types = device_types
-        res = await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_GroupBy`, {
+        res = await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
           data: {
             items: "di.f_item_name",
             tablename: "t_paper_devices pd left join t_devices_items di on pd.id = di.f_device_id",
@@ -556,7 +556,7 @@
         console.log('row=', JSON.stringify(row))
         let res = await this.$showMessage('确认修改到期时间吗？', ['confirm', 'cancel'])
         if (res == 'confirm'){
-          await new HttpResetClass().http('post', '/rs/logic/updateDefectTime', {
+          await new HttpResetClass().http('post', '/api/af-safecheck/logic/updateDefectTime', {
             defect: {
               f_defect_id: row.f_defect_id,
               f_handle_date: row.f_handle_date
@@ -574,7 +574,7 @@
         console.log('this.solveModal.uploadData=', JSON.stringify(this.solveModal.uploadData))
         this.solveModal.uploadData.f_repairman = this.$login.f.name
         this.solveModal.uploadData.f_repair_date = Util.getNowDate()
-        let res = await this.$resetpost('/rs/logic/pcRepairDefectNew', this.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+        let res = await this.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', this.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
         if (res.data.code === 200) {
           this.$showMessage('操作成功')
         }else {
@@ -674,7 +674,7 @@
 
           })
           let http1 = new HttpResetClass()
-          http1.load('POST', 'rs/sql/safe_singleTable_OrderBy', {
+          http1.load('POST', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
             data: {
               items: 'id,f_user_telephone',
               tablename: 't_user',
@@ -786,7 +786,7 @@
           }
           console.log('data=', JSON.stringify(data))
           try {
-            let result =await new HttpResetClass().load('post','/rs/logic/phoneUploadRectification', data, {resolveMsg: null, rejectMsg: null})
+            let result =await new HttpResetClass().load('post','/api/af-safecheck/logic/phoneUploadRectification', data, {resolveMsg: null, rejectMsg: null})
             if (result.data.code==200) {
               successCount += result.data.successcon
               this.progressbarWidth=Math.ceil((i+1)*100/(this.dangerGroups.length))
@@ -872,7 +872,7 @@
         ////tag
         this.sliceArea=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
@@ -897,7 +897,7 @@
         ////tag
         this.cbcs=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,

package/src/components/pc/DefectList.vue

@@ -267,7 +267,7 @@
   export default {
     title: '隐患明细',
     data() {
-      let model = new PagedList('rs/sql/defectList', 20,{orderitem: `'f_offsite_time desc'`})
+      let model = new PagedList('api/af-safecheck/sql/defectList', 20,{orderitem: `'f_offsite_time desc'`})
       return {
         loading: false,
         model: model,
@@ -429,7 +429,7 @@
 
           })
           let http1 = new HttpResetClass()
-          http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+          http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
             data: {
               items: 'id,f_user_telephone',
               tablename: 't_user',
@@ -541,7 +541,7 @@
           }
           console.log('data=', JSON.stringify(data))
           try {
-            let result =await new HttpResetClass().load('post','/rs/logic/phoneUploadRectification', data, {resolveMsg: null, rejectMsg: null})
+            let result =await new HttpResetClass().load('post','/api/af-safecheck/logic/phoneUploadRectification', data, {resolveMsg: null, rejectMsg: null})
             if (result.data.code==200) {
               successCount += result.data.successcon
               this.progressbarWidth=Math.ceil((i+1)*100/(this.dangerGroups.length))
@@ -616,7 +616,7 @@
         ////tag
         this.sliceArea=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
@@ -641,7 +641,7 @@
         ////tag
         this.cbcs=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,

package/src/components/pc/DepSelector.vue

@@ -33,7 +33,7 @@
     methods: {
       async search() {
         const departments = []
-        const res = await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`, {data:{
+        const res = await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{
             items:"dep.id, dep.name",
             tablename:"t_department dep left join t_organization org on dep.parentid = org.id",
             orderitem:"dep.name",

package/src/components/pc/DeviceChange.vue

@@ -227,7 +227,7 @@ export default {
     getorg(val) {
       this.f_filialeid = val[0]
      if (val[0]){
-       new HttpResetClass().load('post','rs/sql/tel_singleTable_OrderBy',{data: {
+       new HttpResetClass().load('post','api/af-safecheck/sql/tel_singleTable_OrderBy',{data: {
            items: 'f_dir',
            tablename: 't_organization',
            condition: `id  = '${val[0]}'`,

package/src/components/pc/Edit.vue

@@ -78,7 +78,7 @@ export default {
           title: param.title,
           sketchId: param.sketchId
         }
-        new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata}).then(res => {
+        new HttpResetClass().load('POST', 'api/af-safecheck/logic/savePaperEdit', {data: reqdata}).then(res => {
           if (res.data.code === 200) {
             this.$showMessage('保存成功')
           } else {

package/src/components/pc/HiddenChart.vue

@@ -62,7 +62,7 @@
     title: '隐患分析图表',
     data () {
       return {
-        // model: new PagedList('rs/sql/getCheckPlanList', 20),
+        // model: new PagedList('api/af-safecheck/sql/getCheckPlanList', 20),
         // filialeid: '${this.$login.f.orgid}',
         // startDate: '2020-01-01',
         startDate: '',
@@ -114,7 +114,7 @@
         condition += this.startDate ? ` and cp.f_onsite_time >= '${this.startDate}'` : ' and 1=1 '
         condition += this.endDate ? ` and cp.f_onsite_time <= '${this.endDate}'` : ' and 1=1 '
         //tag
-        http.load('POST', '/rs/logic/hiddenchart', {condition: condition},
+        http.load('POST', '/api/af-safecheck/logic/hiddenchart', {condition: condition},
           {resolveMsg: '获取数据成功！！！', rejectMsg: '获取数据失败！！！'}).then((res) => {
             //tag
             this.leveldata = res.data.piedengji

package/src/components/pc/NewCheckpaper.vue

@@ -894,11 +894,12 @@ import Vue from 'vue'
 import * as Util from '../Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {forEach} from "mocha/lib/utils";
 
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -909,41 +910,44 @@ let asyncReady = async function (self) {
     //tag
     //tag)
     console.log(res)
-    if (!res.data[0].f_dir) {
-      self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    } else {
-      //this.f_dir=res.data[0].f_dir
-      let url = self.newConfig == '是' ? '/safecheck/rs/safe_vue' : '/safecheck/rs/vue'
-      try {
-        let res1 = await new HttpResetClass().load('GET', `${url}/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取居民配置项成功！',
-          rejectMsg: '获取居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        if (!Vue.config.safecheck) {
-          Vue.config = {safecheck: {}}
-        }
-        Vue.config.safecheck.DevicesConfig = res1.data
-        console.log(Vue.config.safecheck.DevicesConfig)
-        /*})*/
-        let res2 = await new HttpResetClass().load('GET', `${url}/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取非居民配置项成功！',
-          rejectMsg: '获取非居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig = res2.data
-        /*}).then(res=> {
-        })*/
+    // 兼容旧版分公司获取
+    if(res.data.length>0){
+      if (!res.data[0].f_dir) {
+        self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
+      } else {
+        //this.f_dir=res.data[0].f_dir
+        let url = self.newConfig == '是' ? '/safecheck/rs/safe_vue' : '/safecheck/rs/vue'
+        try {
+          let res1 = await new HttpResetClass().load('GET', `${url}/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })/*.then(res=>{*/
+          //tag
+          //this.safeConfig["民用配置项"]=Object.assign({},res.data)
+          if (!Vue.config.safecheck) {
+            Vue.config = {safecheck: {}}
+          }
+          Vue.config.safecheck.DevicesConfig = res1.data
+          console.log(Vue.config.safecheck.DevicesConfig)
+          /*})*/
+          let res2 = await new HttpResetClass().load('GET', `${url}/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })/*.then(res=>{*/
+          //tag
+          //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
+          Vue.config.safecheck.DevicesSetConfig = res2.data
+          /*}).then(res=> {
+          })*/
 
-      } catch (e) {
-        self.$showMessage("获取配置文件失败" + e)
-        self.loading = false
+        } catch (e) {
+          // self.$showMessage("获取配置文件失败" + e)
+          self.loading = false
+        }
       }
     }
     if (self.data.f_recheck_id) {
-      let res3 = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+      let res3 = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
         data: {
           items: '*',
           tablename: 't_check_paper',
@@ -1116,7 +1120,7 @@ export default {
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }
-      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+      new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
         resolveMsg: '安检审核成功！',
         rejectMsg: '安检审核出错！'
       }).then((res) => {
@@ -1141,7 +1145,7 @@ export default {
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }
-      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+      new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
         resolveMsg: '安检审核成功！',
         rejectMsg: '安检审核出错！'
       }).then((res) => {
@@ -1293,6 +1297,9 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
+      this.deviceconfig2 = this.deviceconfig2.filter(row => {
+        return !(row.checkname == '$configProp' || row.checkname == '$globalProp');
+      })
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path
@@ -1824,7 +1831,7 @@ export default {
         } else if (this.role == 'androidview') {
           id = this.item.f_paper_id
         }
-        this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
+        this.$resetpost(`api/af-safecheck/logic/path_getCheckPaper`, {data: {id:id}}).then((respanse) => {
             //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组
@@ -1873,18 +1880,17 @@ export default {
               //tag
               //tag)
               console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
-              if (this.data.f_check_type == '民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
-                //tag)
-              } else if (this.data.f_check_type == '非民用') {
+              // 如果没有用户类型 默认按民用配置走
+              if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
                 if (typeof this.deviceconfig === 'string') {
                   this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
-                //tag)
+              }else{
+                  this.deviceconfig = Vue.config.safecheck.DevicesConfig
+                  if (typeof this.deviceconfig === 'string') {
+                    this.deviceconfig = JSON.parse(this.deviceconfig)
+                  }
               }
               if (this.data.f_collection_type == '按金额') {
                 if (this.deviceconfig["燃气表"]){