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

package/src/components/android/CurrentCreate_new.vue

@@ -515,7 +515,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,
@@ -651,7 +651,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,
@@ -664,7 +664,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,
@@ -686,7 +686,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:'',
@@ -769,7 +769,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}'`
@@ -778,7 +778,7 @@
           this.getcheckplandata = getcheckplan.data[0]
           if(this.getcheckplandata){
             if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_last_check_state != '入户' ) || (row.f_upload_state == '已传' && row.f_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,

package/src/components/android/DailyworkloadQuery.vue

@@ -288,7 +288,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:'',
@@ -457,7 +457,7 @@ export default {
     },
     getpaperCount(condition){
       let http = new HttpResetClass()
-      http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`}},{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}`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
         if (row.data.length > 0){
           this.allPlanCount = 0
           this.ruhu = row.data

package/src/components/android/Devices.vue

@@ -228,7 +228,7 @@
           //tag
           this.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST',`${this.Url}/rs/sql/tel_singleTable_OrderBy`, {data: {
+          http1.load('POST',`${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'f_user_telephone',
               tablename: 't_user',
               condition: `name  = '${val}'`,

package/src/components/android/Devicesm.vue

@@ -205,7 +205,7 @@
           //tag
           this.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST',`${this.Url}/rs/sql/tel_singleTable_OrderBy`, {data: {
+          http1.load('POST',`${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'f_user_telephone',
               tablename: 't_user',
               condition: `name  = '${val}'`,

package/src/components/android/DoorService.vue

@@ -269,7 +269,7 @@ export default {
     //厂家改变
     changed(val){
       //根据品牌 获取厂家 气表型号
-      this.$resetpost(Vue.dataUrl + 'rs/sql/singleTable_OrderBy', {
+      this.$resetpost(Vue.dataUrl + 'api/af-safecheck/sql/singleTable_OrderBy', {
         data: {
           items: '*',
           tablename: 't_qbnumber',
@@ -305,7 +305,7 @@ export default {
       }
       this.$showMessage('确认后，所有填写内容将上传保存，请确认信息！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-          this.$resetpost(Vue.dataUrl + 'rs/logic/updataUserInfo', data).then((res) => {
+          this.$resetpost(Vue.dataUrl + 'api/af-safecheck/logic/updataUserInfo', data).then((res) => {
             if(res.data.code === 200){
               this.$showMessage('保存成功')
               this.isbuqi = true
@@ -479,7 +479,7 @@ export default {
 
   ready(){
     //获取厂家，表品牌 下拉参数
-    // this.$resetpost(Vue.dataUrl+ 'rs/sql/singleTable_OrderBy', {
+    // this.$resetpost(Vue.dataUrl+ 'api/af-safecheck/sql/singleTable_OrderBy', {
     //   data: {
     //     items: '*',
     //     tablename: 't_qibiao',

package/src/components/android/ExtractCheckPlan.vue

@@ -221,7 +221,7 @@
         plan:'',
         planid:'',
         goplanid:'',
-        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`,20,{groupitem:"''",f_filialeids:"'("+Vue.user.orgid+")'",orderitem:"'f_create_time'"}),
+        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`,20,{groupitem:"''",f_filialeids:"'("+Vue.user.orgid+")'",orderitem:"'f_create_time'"}),
         showModal:false,
         needid:'',
         criteriaShow: true,

package/src/components/android/ExtractPlanItem.vue

@@ -329,7 +329,7 @@
         planid: '',
         goplanid: '',
         checkAll:false,
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/planItem`, 20, {condition: 'this.condition'}),
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/planItem`, 20, {condition: 'this.condition'}),
         showModal: false,
         showModal2: false,
         needid: '',
@@ -352,7 +352,7 @@
     methods: {
       async selectplanmany() {
         this.planoption = []
-        await this.checkplan.searchList(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {}, {
+        await this.checkplan.searchList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {}, {
           condition: "f_checker_id='" + Vue.user.id + "' and f_safecheck_type='年度普检' and f_plan_year=" + new Date().getFullYear(),
           groupitem: "",
           f_filialeids: "(" + Vue.user.orgid + ")",
@@ -404,7 +404,7 @@
           return false
         }
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ExtractCheckPlanItem`, {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/ExtractCheckPlanItem`, {
           data: {
             columnName: "it.id",
             condition: "1=1",
@@ -435,7 +435,7 @@
       },
       async okput() {
         let http = new HttpResetClass()
-        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ExtractCheckPlanItem`, {
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/ExtractCheckPlanItem`, {
           data: {
             condition: "it.id='" + this.needid + "'",
             f_plan_id: this.planid,
@@ -449,7 +449,7 @@
         this.planoption = []
         let condition = "f_checker_id=" + Vue.user.id + " and f_plan_name like '%" + this.plan + "%'"
         let http = new HttpResetClass()
-        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {
           data: {
             condition: condition,
             f_filialeids: "(" + Vue.user.orgid + ")",

package/src/components/android/ImgSelfAndroid.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <img :src="src" :alt="alt" @click="open()" style="width: 100%;height: 100%" title="点击查看图片" :id="'vc-imgself-img-'+attach">
+    <img :src="src" :alt="alt" @click="open()"   :width="width" :height="height"title="点击查看图片" :id="'vc-imgself-img-'+attach">
     <div class="full-img" v-if="show">
       <div @click="on"  draggable="false" >
         <img :src="src" id="image" alt="" style="width: 100%" class="img-state" :alt="alt || ''">

package/src/components/android/Insurance/PhoneInsurancePurchase.vue

@@ -96,7 +96,7 @@
     title: '保险登记',
     data() {
       return {
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getInsuranceList`, 20,
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getInsuranceList`, 20,
           {
             sort: `'asc'`
           }

package/src/components/android/Insurance/PhoneInsurancePurchaseDetail.vue

@@ -163,7 +163,7 @@
       }
     },
     ready() {
-      new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
         data: {
           items: '*',
           tablename: 't_userinfo',
@@ -215,7 +215,7 @@
         commit_data.f_orgname = Vue.user.orgs
         commit_data.f_depid = Vue.user.depids
         commit_data.f_depname = Vue.user.deps
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/saveInsInfo`, { data: commit_data }).then(response => {
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/saveInsInfo`, { data: commit_data }).then(response => {
           this.$showMessage('提交成功')
         }).catch(error => {
           this.$showMessage('提交失败')

package/src/components/android/Insurance/PhoneInsuranceRecordList.vue

@@ -142,7 +142,7 @@
     props: ['data', 'tabname'],
     data() {
       return {
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getInsuranceChargesList`, 20,
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getInsuranceChargesList`, 20,
           {
             sort: `'asc'`
           }

package/src/components/android/Iotinstructionsview/IoTinstruction.vue

@@ -148,7 +148,7 @@ export default {
   data() {
     return {
       f_orgid: Vue.user.orgid,
-      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/insturctDetailQuery`,5,{condition:'this.condition',f_orgid:`'${Vue.user.orgid}'`}),
+      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/insturctDetailQuery`,5,{condition:'this.condition',f_orgid:`'${Vue.user.orgid}'`}),
       criteriaShow: false
     }
   },

package/src/components/android/LcheckUnplan.vue

@@ -87,7 +87,7 @@ export default {
           condition  = condition + ` and ${key} like '%${this.model[key]}%'`
         }
       }
-      let url = `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`
+      let url = `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/singleTable`
       this.$resetpost(url,
         {data: {tablename: 't_userfiles',condition: condition}},
         { resolveMsg: null, rejectMsg: null }

package/src/components/android/Login.vue

@@ -167,7 +167,7 @@
           // HostApp.alert('登录失败, 用户名或密码不能为空！')
           return
         }
-        this.$resetpost(`${getServiceUrl}/rs/logic/phonelogin`, {data: this.model}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
+        this.$resetpost(`${getServiceUrl}/api/af-safecheck/logic/phonelogin`, {data: this.model}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
           //tag
           if (ret.data.state === 0) {
             this.$goto('nav-bottom')

package/src/components/android/NewCheckpaperAndroid.vue

@@ -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: 'name,f_dir',
         tablename: 't_organization',

package/src/components/android/NoCivilCurrentCreate.vue

@@ -519,7 +519,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,
@@ -659,7 +659,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,
@@ -672,7 +672,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,
@@ -694,7 +694,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:'',
@@ -747,7 +747,7 @@
           })
         }},
       genuineReserve () {
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/PCbookingCheck`,{data:{
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/PCbookingCheck`,{data:{
             id:this.tempItem.id,
             f_prearranged_date:this.tempItem.f_prearranged_date,
             f_remark:this.tempItem.f_remark
@@ -767,7 +767,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}'`
@@ -776,7 +776,7 @@
           this.getcheckplandata = getcheckplan.data[0]
           if(this.getcheckplandata){
             if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_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,

package/src/components/android/OnlineCheckByArea.vue

@@ -96,7 +96,7 @@
     title: '安检员B',
     data () {
       return {
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_GroupBy`, 50, {
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_GroupBy`, 50, {
           items: '"f_residential_area,' +
             'COUNT ( 0 ) as count,' +
             'SUM ( CASE WHEN f_last_check_state = \'入户\' THEN 1 ELSE 0 END ) AS count_rh,' +

package/src/components/android/OnlineRepairSafe.vue

@@ -196,7 +196,7 @@
   export default {
     title: '安检员B',
     data() {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, {
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, {
         groupitem: '""',
         orderitem: '"f_residential_area"',
         f_check_type: 'this.f_check_type[0]',
@@ -247,7 +247,7 @@
       }
     },
     ready() {
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`, {}, {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`, {}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -277,7 +277,7 @@
         info.f_filialeid = info.f_filialeids
         console.log("789789789")
         console.log(JSON.stringify(info))
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: info.f_user_id}}).then((response) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_user_id}}).then((response) => {
           if (response.data.length == 0) {
             this.$showMessage('未查询到该户有正常或者停用的表具信息，请检查档案是否正常！')
             return

package/src/components/android/OnlineVindicate.vue

@@ -198,7 +198,7 @@ import PhoneUpUserinfo from './PhoneUpUserinfo'
 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 = ''

package/src/components/android/PaperFeedback.vue

@@ -315,6 +315,21 @@
       <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="deletecancel()">取消</button>
     </div>
   </modal>
+  <modal :show.sync="showgas && showgasmodel" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        用户须知
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row" style="margin-top: 6px">
+        <sapn>{{ gasinstructions ? gasinstructions : '请配置用户须知' }}</sapn>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="closeshowgas()">确认</button>
+    </div>
+  </modal>
 </template>
 
 <script>
@@ -385,7 +400,7 @@ import co from 'co'
 //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
 //                 checkResult = '有隐患'
 //                 ////tag
-//                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+//                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
 //                 ////tag)
 //                 self.$set('detail.f_defect_id', res.data[0].id)
 //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -422,7 +437,7 @@ import co from 'co'
 //         self.undo()
 //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
 //         ////tag
-//         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+//         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
 //           ////tag
 //           if(ret.data.code ==200){
 //             ////tag
@@ -461,7 +476,7 @@ import co from 'co'
 //       }
 //     }else{
 //       ////tag
-//       self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+//       self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
 //         ////tag
 //         if(res.data.length != 0){
 //           self.$parent.$parent.user = res.data[0]
@@ -496,6 +511,9 @@ export default {
       showmodel: false,
       showbacklist:'是',
       backlistisselect: false,
+      showgas: false,
+      showgasmodel:this.$appdata.getSingleValue('用户须知查看') || false,
+      gasinstructions:'',
       deletebacklistisselect: false,
       radios: [
         {
@@ -556,7 +574,7 @@ export default {
     },
     // async isoverDate(){
     //   ////tag
-    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
     //       condition:"f_plan_item_id='"+this.$parent.$parent.item.id+"'"
     //     }
     //   })
@@ -610,7 +628,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -631,6 +648,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({
@@ -1114,6 +1132,9 @@ export default {
       }
 
     },
+    closeshowgas() {
+      this.showgas = false
+    },
     //确认安检转维修
 
     undo() {
@@ -1133,7 +1154,7 @@ export default {
       ////tag)
       let http = new HttpResetClass()
       ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -1143,7 +1164,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -1185,7 +1206,7 @@ export default {
       ////tag)
       let http = new HttpResetClass()
       ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -1197,11 +1218,13 @@ export default {
       ////tag
       let limit_times=1
       let limit_value=3
-      if(Vue.config.safecheck && Vue.config.safecheck.ApproveConfig.limit_times && Vue.config.safecheck.ApproveConfig.limit_value){
+      let limit_amount=3
+      if(Vue.config.safecheck && Vue.config.safecheck.ApproveConfig.limit_times && Vue.config.safecheck.ApproveConfig.limit_value && Vue.config.safecheck.ApproveConfig.limit_amount){
         limit_times = Vue.config.safecheck.ApproveConfig.limit_times
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value
+        limit_amount = Vue.config.safecheck.ApproveConfig.limit_amount
       }
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,
@@ -1222,7 +1245,7 @@ export default {
           },
           "f_limit_times":limit_times,
           "f_limit_value":limit_value,
-          "f_limit_amount":'',
+          "f_limit_amount":limit_amount,
           'f_limit_type':'气量'
         }
       }, {resolveMsg: null, rejectMsg: null})
@@ -1254,7 +1277,7 @@ export default {
         ////tag
         this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
         let http1 = new HttpResetClass()
-        http1.load('POST', `${this.Url}/rs/sql/tel_singleTable_OrderBy`, {
+        http1.load('POST', `${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
           data: {
             items: 'f_user_telephone',
             tablename: 't_user',
@@ -1289,6 +1312,13 @@ export default {
       this.$set('style__', '')
       this.$set('style_view_', '')
     }
+    if (Vue.config.safecheck != undefined) {
+      if (Vue.config.safecheck.ApproveConfig != undefined) {
+        if (Vue.config.safecheck.ApproveConfig.gasinstructions != undefined) {
+          this.gasinstructions = Vue.config.safecheck.ApproveConfig.gasinstructions
+        }
+      }
+    }
 
     for (let item of this.radios) {
       if (this.paper.f_client_evaluation == item.label) {
@@ -1379,6 +1409,11 @@ export default {
     '$parent.$parent.isUpload'(val) {
       ////tag
     },
+    'paper.f_read_instructions'(val) {
+      if (val == true) {
+        this.showgas = true
+      }
+    },
     'meading'(val) {
       ////tag
       this.$parent.$parent.meading = val