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

package/src/filiale/yangchunboneng/android/AddPlanItem.vue

@@ -114,6 +114,40 @@
                           close-on-select clear-button></v-select>
               </div>
             </div>
+            <div class="row app-row" >
+              <div class="col-xs-4">
+                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">首次通气时间：</label>
+              </div>
+              <datepicker id="f_start_date"
+                          placeholder= '起始时间'
+                          :value.sync="model.f_start_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="ui.f_subscribe_date > '{}'"
+              >
+              </datepicker>
+            </div>
+            <div class="row app-row" >
+              <div class="col-xs-4">
+                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">首次通气时间：</label>
+              </div>
+              <datepicker id="f_end_date"
+                          placeholder= '结束时间'
+                          :value.sync="model.f_end_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="ui.f_subscribe_date < '{}'"
+              >
+              </datepicker>
+            </div>
 <!--            <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -178,7 +212,14 @@
                   <p class="panel-title col-xs-4 text-left font">用户电话</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}</p>
                 </div>
-
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">备用电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_rent_phone}}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">租户电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_zuhu_phone }}</p>
+                </div>
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font">小区名称</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_residential_area }}</p>
@@ -195,6 +236,10 @@
                   <p class="panel-title col-xs-4 text-left font">最后安检状态</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>
                 </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">首次通气时间</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_uservent_date }}</p>
+                </div>
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font">保费到期时间</p>
                   <p class="panel-title col-xs-8 text-left input-font" :style="$parent.$parent.$parent.compare(row.f_expiration_date)?'color:black':'color: red'">{{ row.f_expiration_date}}</p>
@@ -218,7 +263,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
       model.f_sign = ['']
       model.f_user_type = ''
@@ -257,7 +302,7 @@
       }
     },
     ready () {
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
       //   //tag)
       //   if(res.data.code == 200){
       //     this.model.myCycle = res.data.civil.value
@@ -302,7 +347,7 @@
       },
       getCheckTime(){
         //tag
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`,{data: {
             items: 'f_circle,f_start_time',
             tablename: 't_safe_circle',
             condition: `f_filialeid  = '${Vue.user.orgid}'`,
@@ -346,7 +391,7 @@
               info.f_state = '未检'
               info.f_no_checkplan = '无计划安检'
               //tag
-              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
                 //tag)
                 info['f_plan_meters'] = response.data
                 var pardate = {
@@ -365,7 +410,7 @@
           info.f_state = '未检'
           info.f_no_checkplan = '无计划安检'
           //tag
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
             //tag)
             info['f_plan_meters'] = response.data
             var pardate = {
@@ -382,7 +427,7 @@
       Mreadibook(){
         this.cbc=[]
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterBooksData`,
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
           {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
           this.cbc = [{label: '全部', value: ''}]

package/src/filiale/yangchunboneng/android/AndiroidSecurityAudit.vue

@@ -143,7 +143,7 @@ import * as Util from '../../Util'
 export default {
   title: '安检转单审核',
   data () {
-    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/SecurityAudit`, 20, {})
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/SecurityAudit`, 20, {})
     return {
       model: model,
       cbc:[],
@@ -173,14 +173,14 @@ export default {
       this.model.search(args.condition, args.model)
     },
     Nochange(row){
-      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/NoSecurityPass`, {
+      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/NoSecurityPass`, {
         f_plan_id: row.f_plan_id,
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         this.search()
       })
     },
     change(row) {
-      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/SecurityPass`, {
+      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/SecurityPass`, {
         f_newplan_id: row.f_newplan_id,
         f_plan_id: row.f_plan_id,
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {

package/src/filiale/yangchunboneng/android/CurrentCreate.vue

@@ -204,13 +204,13 @@
               </div>
               <v-select id="f_state"
                         :value.sync="model.f_last_check_state"
+                        :multiple="true"
                         class="input-font"
                         :options='$parent.$parent.last_check_states'
                         placeholder='入户状态'
                         :width="'60%'"
                         v-model="model.f_last_check_state"
-                        condition="f_last_check_state='{}'"
-                        close-on-select clear-button>
+                        condition="f_last_check_state in {}">
               </v-select>
             </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
@@ -260,7 +260,40 @@
               >
               </datepicker>
             </div>
-
+            <div class="row app-row"  v-show="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">首次通气时间：</label>
+              </div>
+              <datepicker id="f_start_date"
+                          placeholder= '起始时间'
+                          :value.sync="model.f_start_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="f_subscribe_date > '{}'"
+              >
+              </datepicker>
+            </div>
+            <div class="row app-row"  v-show="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">首次通气时间：</label>
+              </div>
+              <datepicker id="f_end_date"
+                          placeholder= '结束时间'
+                          :value.sync="model.f_end_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="f_subscribe_date < '{}'"
+              >
+              </datepicker>
+            </div>
 
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
@@ -414,6 +447,10 @@
                   <p class="panel-title col-xs-5 text-left font"><b>到访不遇次数:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_check_version }}</p>
                 </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>首次通气时间:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font ">{{ row.f_subscribe_date}}</p>
+                </div>
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font"><b>保费到期时间:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font " :style="$parent.$parent.$parent.compare(row.f_expiration_date)?'color:black':'color: red'">{{ row.f_expiration_date}}</p>
@@ -604,7 +641,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -625,15 +662,7 @@
           {label: '未检', value: '未检'},
           {label: '已检', value: '已检'},
         ],
-        last_check_states: [
-          {label: '请选择', value: ''},
-          {label: '入户', value: '入户'},
-          {label: '拒检', value: '拒检'},
-          {label: '到访不遇', value: '到访不遇'},
-          {label: '拆除', value: '拆除'},
-          {label: '停用', value: '停用'},
-          {label: '未通气', value: '未通气'}
-        ],
+        last_check_states: Vue.$appdata.getParam('安检状态'),
         upload_states: [
           {label: '请选择上传状态', value: ''},
           {label: '未传', value: '未传'},
@@ -765,7 +794,7 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
             condition:`i.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -778,7 +807,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"i.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -800,7 +829,7 @@
         if(this.plan){
           condition += ` and f_plan_name like '%${this.plan}%'`
         }
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:this.f_filialeids,
             groupitem:'',
@@ -869,7 +898,7 @@
       inspect(row) {
         var _this = this
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: {
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/singleTable`, {data: {
             items: 'id',
             tablename: 't_check_plan_item',
             condition:  `id  = '${row.id}'`
@@ -878,7 +907,7 @@
           this.getcheckplandata = getcheckplan.data[0]
           if(this.getcheckplandata){
             if (row.f_upload_state == '未传' || row.f_last_check_state === '到访不遇' || row.f_last_check_state === '拒检'|| (row.f_upload_state == '已传'  && row.f_no_checkplan != '无计划安检' ) ) {
-              _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
+              _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
                 row['f_plan_meters'] = response.data
                 var pardate = {
                   _this:_this,
@@ -942,7 +971,7 @@
           condition += " and ti.f_last_check_state in ('入户','停用','拆除','未通气')"
         }
         if(this.$refs.paged.$refs.cri.model.f_state[0] =='未检'){
-          condition += " and (ti.f_last_check_state in ('到访不遇','拒检') or ti.f_last_check_state  is null)"
+          condition += " and  ti.f_last_check_state not in ('入户','停用','拆除','未通气')"
         }
         // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
         //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
@@ -961,6 +990,10 @@
           condition += " and ti.f_prearranged_date > '"+this.$refs.paged.$refs.cri.model.f_start_date + "'"
         if(this.$refs.paged.$refs.cri.model.f_end_date)
           condition += " and ti.f_prearranged_date < '"+this.$refs.paged.$refs.cri.model.f_end_date + "'"
+        if(this.$refs.paged.$refs.cri.model.f_start_date1)
+          condition += " and f_subscribe_date > '"+this.$refs.paged.$refs.cri.model.f_start_date1 + "'"
+        if(this.$refs.paged.$refs.cri.model.f_end_date1)
+          condition += " and f_subscribe_date < '"+this.$refs.paged.$refs.cri.model.f_end_date1 + "'"
         if(this.$refs.paged.$refs.cri.model.f_check_version1)
           condition += " and ti.f_check_version <= "+this.$refs.paged.$refs.cri.model.f_check_version1
 
@@ -968,13 +1001,22 @@
           condition += ` and (ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%')`
         }
 
-        if(this.$refs.paged.$refs.cri.model.f_last_check_state !=''){
-          condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_check_state+"'"
+        if(this.$refs.paged.$refs.cri.model.f_last_check_state.length > 0){
+          let last_check_state = ''
+          this.$refs.paged.$refs.cri.model.f_last_check_state.forEach((item) => {
+            last_check_state = last_check_state + `'${item}',`
+          })
+          last_check_state = last_check_state.slice(0, -1)
+          condition += " and ti.f_last_check_state in ("+last_check_state+")"
         }
         if(this.$refs.paged.$refs.cri.model.userinfo){
           condition += ` and (f_userinfo_code like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_name like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_meter_no like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_address like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.userinfo}%')`
         }
-        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成' or f_complete = '已完成') or (f_state = '未检' or f_state = '已检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检' )) and ti.f_no_checkplan = '有计划安检'" + condition)
+        if(this.$refs.paged.$refs.cri.model.f_state[0] ==''){
+          this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成' or f_complete = '已完成') or (f_state = '未检' or f_state = '已检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检' )) and ti.f_no_checkplan = '有计划安检'" + condition)
+        }else{
+          this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成' or f_complete = '已完成') or (f_state = '未检' or f_state = '已检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+        }
       },
       getNewOrder(){
         HostApp.__this__ = this
@@ -1085,7 +1127,7 @@
         criteria = {
           items: 'count(id) count',
           tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          condition: `(f_complete = '' or f_complete is null or f_complete = '未完成') AND f_state = '已检'`,
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})

package/src/filiale/yangchunboneng/android/DailyworkloadQuery.vue

@@ -136,10 +136,10 @@
                         class="input-font"
                         :options='$parent.$parent.check_states'
                         placeholder='安检结果'
+                        :multiple="true"
                         style="width:60%"
                         v-model="model.f_state"
-                        condition="f_state='{}'"
-                        close-on-select clear-button>
+                        condition="f_state in {}">
               </v-select>
             </div>
 
@@ -289,7 +289,7 @@ export default {
       check:'',
       plan:'',
       planid:'',//http://ssl.odc.hk:8300
-      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`}),
+      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`}),
       criteriaShow: false,
       planoption:[],
       condition:'',
@@ -302,15 +302,7 @@ export default {
         {label: '左表', value: '左表'},
         {label: '右表', value: '右表'}
       ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '拒检', value: '拒检'},
-        {label: '停用', value: '停用'},
-        {label: '未通气', value: '未通气'},
-        {label: '拆除', value: '拆除'}
-      ],
+      check_states: Vue.$appdata.getParam('安检状态'),
       last_check_states: [
         {label: '请选择上次安检状态', value: ''},
         {label: '入户', value: '入户'},
@@ -436,10 +428,13 @@ export default {
           condition += " and f_offsite_time < '"+this.$refs.paged.$refs.cri.model.f_end_date +"'"
         }
       }
-      if(this.$refs.paged.$refs.cri.model.f_state){
-        if(this.$refs.paged.$refs.cri.model.f_state.toString().trim()){
-          condition += " and f_entry_status = '"+this.$refs.paged.$refs.cri.model.f_state +"'"
-        }
+      if(this.$refs.paged.$refs.cri.model.f_state.length > 0){
+        let last_check_state = ''
+        this.$refs.paged.$refs.cri.model.f_state.forEach((item) => {
+          last_check_state = last_check_state + `'${item}',`
+        })
+        last_check_state = last_check_state.slice(0, -1)
+        condition += " and f_entry_status in ("+last_check_state+")"
       }
       if(this.$refs.paged.$refs.cri.model.f_user_type){
         if(this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()){
@@ -462,7 +457,7 @@ export default {
       this.ruhu = []
       this.allPlanCount = 0
       let http = new HttpResetClass()
-      http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`,f_checker_id:`'${this.f_checker_id}'`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`,f_checker_id:`'${this.f_checker_id}'`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
         if (row.data.length > 0){
           this.allPlanCount = 0
           this.ruhu = row.data

package/src/filiale/yangchunboneng/android/DailyworkloadQueryNew.vue

@@ -289,7 +289,7 @@ export default {
       check:'',
       plan:'',
       planid:'',//http://ssl.odc.hk:8300
-      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
+      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
       criteriaShow: false,
       planoption:[],
       condition:'',
@@ -363,7 +363,7 @@ export default {
         return
       }
       row.f_upload_state = '已传'
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:row.f_userinfoid}}).then((response)=>{
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:row.f_userinfoid}}).then((response)=>{
         row['f_plan_meters'] = response.data
         let pardate = {
           _this:this,
@@ -465,7 +465,7 @@ export default {
       this.ruhu = []
       this.allPlanCount = 0
       let http = new HttpResetClass()
-      http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`,f_checker_id:`'${this.f_checker_id}'`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`,f_checker_id:`'${this.f_checker_id}'`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
         if (row.data.length > 0){
           this.allPlanCount = 0
           this.ruhu = row.data

package/src/filiale/yangchunboneng/android/NewCheckpaperAndroid.vue

@@ -218,8 +218,8 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 550px;background: #FFFFFF">
                     <div class="img" v-for="img in paperdata.f_overall_imgs">
-                      <img-self :src="getimg(img.f_overall_path)" style="float: left" width="150"
-                                     height="200"></img-self>
+                      <img-self-android :src="getimg(img.f_overall_path)" style="float: left" width="150"
+                                     height="200"></img-self-android>
                     </div>
                   </div>
 
@@ -240,8 +240,8 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
                     <div class="img" style="float: none">
-                      <img-self :src="getimg(paperdata.f_sign_path)" width="150" style="float: left"
-                                height="200"></img-self>
+                      <img-self-android :src="getimg(paperdata.f_sign_path)" width="150" style="float: left"
+                                height="200"></img-self-android>
                     </div>
                   </div>
                 </td>
@@ -259,8 +259,8 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
                     <div class="img" style="float: none">
-                      <img-self :src="getimg(paperdata.f_notified_path)"width="150" style="float: left"
-                                height="200"></img-self>
+                      <img-self-android :src="getimg(paperdata.f_notified_path)"width="150" style="float: left"
+                                height="200"></img-self-android>
                     </div>
                   </div>
                 </td>
@@ -324,13 +324,13 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self v-if="showimg1" :src="getimg(showimg1)" width="240" height="300"></img-self>
+            <img-self-android v-if="showimg1" :src="getimg(showimg1)" width="240" height="300"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="showimg2" :src="getimg(showimg2)" width="240" height="300"></img-self>
+            <img-self-android v-if="showimg2" :src="getimg(showimg2)" width="240" height="300"></img-self-android>
           </div>
           <div class="col-md-6" v-for="item in otherDarginShowImgs">
-            <img-self v-if="item.path" :src="getimg(item.path)" width="240" height="300"></img-self>
+            <img-self-android v-if="item.path" :src="getimg(item.path)" width="240" height="300"></img-self-android>
           </div>
         </div>
       </div>
@@ -347,27 +347,27 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
+            <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
                            height="400"></img-self>
           </div>
         </div>
@@ -391,7 +391,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', `${self.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+    let res = await new HttpResetClass().load('post', `${self.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
       data: {
         items: 'f_dir',
         tablename: 't_organization',