safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/android/CheckNotice.vue

@@ -53,7 +53,7 @@ export default {
       if (Vue.android) {
         this.model = this.$androidUtil.bzLogic('提取安检通知', {f_subcompany: Vue.user.f_subcompany}).data
       } else {
-        this.$resetpost('AndroidRest/rs/sql/提取通知', {data: {f_subcompany: Vue.user.f_subcompany}}, {
+        this.$resetpost('AndroidRest/api/af-safecheck/sql/提取通知', {data: {f_subcompany: Vue.user.f_subcompany}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then(

package/src/components/android/CheckPlan.vue

@@ -140,7 +140,7 @@ export default {
         this.$set('model.rows', response.data)
         this.getCount()
       } else {
-        this.$resetpost(`AndroidRest/rs/logic/提取安检计划`, {
+        this.$resetpost(`AndroidRest/api/af-safecheck/logic/提取安检计划`, {
           f_checker_id: this.user.id,
           f_checker: this.user.name,
           f_plan_year: this.c_plan_year[0]
@@ -189,7 +189,7 @@ export default {
           })
         })
       }else{
-        this.$resetpost('rs/sql/已下载计划',{data:{'ids': ids.substring(1)}}).then((respanse)=>{
+        this.$resetpost('api/af-safecheck/sql/已下载计划',{data:{'ids': ids.substring(1)}}).then((respanse)=>{
           console.log("已下载计划",respanse)
           records = respanse.data
           records.forEach((record)=> {

package/src/components/android/CheckPlanDown.vue

@@ -48,7 +48,7 @@
                   <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_send_operator }}/{{row.f_plan_month}}</p>-->
                   <!--</div>-->
                   <div class="row text-right" >
-                    <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.downloadHand(row)' v-if="$parent.$parent.$parent.isDown(row)">下载</button>&nbsp;
+                    <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.downHand(row)' v-if="$parent.$parent.$parent.isDown(row)">下载</button>&nbsp;
                   </div>
                 </div>
               </div>
@@ -59,8 +59,8 @@
       </criteria-paged>
     </div>
     <!--<div class="row text-center" style="margin-top: 20px;">-->
-    <!--<button type="' 正在进行共享计划下载，请确认！' btn-lg btn-font btn-color" style="width: 45%;" @click="downHand()">共享计划下载</button>-->
-    <!--&lt;!&ndash;<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="database()">数据库导出</button>&ndash;&gt;-->
+    <!--<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="downHand()">共享计划下载</button>-->
+    <!--&lt;!&ndash;<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="dat abase()">数据库导出</button>&ndash;&gt;-->
     <!--</div>-->
     <!-- <div class="auto" style="padding-top: 20px;" v-if='show'>
       <p class="text-warning" style="padding: 0 10px">正在下载抄表单...</p>
@@ -72,7 +72,7 @@
       </p>
     </div> -->
   </div>
-<!--  <back-page :need-back='true'  @flag="$back()"></back-page>-->
+  <!--<back-page :need-back='true'  @flag="$back()"></back-page>-->
 </template>
 <script>
 import AppData from '../../stores/AppData'
@@ -80,30 +80,74 @@ import { PagedList } from 'vue-client'
 import * as Util from '../Util'
 import co from 'co'
 import Vue from 'vue'
-// const downloadHand = function * (self, row) {
-//
-// }
+const downloadHand = function * (self, row) {
+  let res = yield self.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel'])
+  let flag = false
+  if (res === 'confirm') {
+    flag = true
+  }
+  if (flag) {
+    let result = yield self.$androidUtil.bzLogic('DownCheckPlanInfo', {id: row.id})
+    HostApp.param_cache(paramStr.substr(i, subLength))
+    HostApp.__this__ = this
+    HostApp.syncLogic({
+      // logic别名，key必须为logic
+      'logic': 'DownCheckPlanInfo',
+      // 回调执行方法名，key必须为callback
+      'callback': 'javascript:HostApp.__this__.uploadCallBack()',
+      // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+      // 执行回调方法传入key为backresult
+      // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+      'backresult': 1
+    })
+    //安卓端
+    if (result.state === 0) {
+      if (result.data.length > 0) {
+        self.getlocalCheckPlan()
+        self.$showMessage(`下载成功，您可前往计划导航进行查看！`)
+      } else {
+        self.$showMessage('无可下载的共享计划！')
+      }
+    } else {
+      self.$showMessage('下载失败！')
+    }
+    //PC端模拟安卓
+    // if (result.data.state === 0) {
+    //   console.log(result.data.data)
+    //   if (result.data.data.length > 0) {
+    //     self.handcount = result.data.data.length
+    //     self.handinfo = [...result.data.data]
+    //     self.$showMessage(`下载成功`)
+    //     self.reload()
+    //   } else {
+    //     self.$showMessage('无可下载的共享计划！')
+    //   }
+    // } else {
+    //   self.$showMessage('下载失败！')
+    // }
+  }
+}
 
 export default {
   title: '共享计划下载',
   data () {
     return {
-      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
       checkPlanInfo: [],
       localcheckPlanInfo:[]
     }
   },
   ready () {
-
+    // Vue.user.f_fengongsi = '中海油.海南分公司'
     this.getlocalCheckPlan()
   },
   methods: {
-    reload() {
+    reload () {
       console.log('页面刷新 ')
       this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
     },
-    getlocalCheckPlan() {
-      let value = this.$androidUtil.path({alias: 'getLocalCheckPlan', data: {}})
+    getlocalCheckPlan () {
+      let value = this.$androidUtil.bzLogic('getLocalShareCheckPlan',{condition: ''})
       console.log(value)
       this.localcheckPlanInfo = value.data
       // this.$androidUtil.path({alias: 'getLocalCheckPlan', data:{}}).then((value)=>{
@@ -111,44 +155,49 @@ export default {
       //   this.localcheckPlanInfo = value.data
       // })
     },
-    downloadHand(row) {
-      HostApp.__this__ =this
-      this.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          HostApp.logicWithHint({
-            'logic': 'DownCheckPlanInfo',
-            'callback': 'javascript: HostApp.__this__.downloadHandCallback()',
-            'data': {id: row.id},
-            'backresult': 1
-          })
-        }
-      })
+    async downHand (row) {
+      // TODO: 先检查网络情况
+      // this.show = true
+      // this.$showAlert('正在下载抄表单,请勿操作！', 'success', 1000)
+      let res = await this.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel'])
+      if (res === 'confirm') {
+        HostApp.__this__ = this
+        HostApp.param_cache(JSON.stringify({id: row.id}))
+        HostApp.syncLogic({
+          // logic别名，key必须为logic
+          'logic': 'DownCheckPlanInfo',
+          // 回调执行方法名，key必须为callback
+          'callback': 'javascript:HostApp.__this__.downLoadCallBack()',
+          // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+          // 执行回调方法传入key为backresult
+          // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+          'backresult': 1
+        })
+      }
     },
-    downloadHandCallback(jo) {
-      // 安卓端
-      console.log('下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载下载')
+    downLoadCallBack(jo){
+      console.log('====》' + JSON.stringify(jo))
       if (jo.state == 'ok') {
         let result = JSON.parse(jo.result)
-        if (result.state == 0) {
+        console.log('下载结果的f_paper_id===》' + JSON.stringify(result))
+        if (result.state === 0) {
           if (result.data.length > 0) {
             this.getlocalCheckPlan()
-            this.$showMessage('下载成功，您可前往计划导航进行查看！')
+            this.$showMessage(`下载成功，您可前往计划导航进行查看！`)
           } else {
             this.$showMessage('无可下载的共享计划！')
           }
         } else {
           this.$showMessage('下载失败！')
         }
-      } else {
-        this.$showMessage('下载失败，请重试！')
       }
     }
   },
-  computed: {
-    isDown () {
+  computed:{
+    isDown(){
       return function (row) {
         for (let info of this.localcheckPlanInfo) {
-          if (info.id == row.id) {
+          if(info.id == row.id){
             return false
           }
         }

package/src/components/android/CheckPlanItems.vue

@@ -269,7 +269,7 @@ export default {
   props: ['f_plan_id', 'f_residential_area'],
   data() {
     return {
-      model: Vue.android ? new LocalPagedList('androidGetuserinfo', 5, {f_plan_id: 'this.f_plan_id'}) : new PagedList(`AndroidRest/rs/sql/androidGetuserinfo`, 5, {f_plan_id: 'this.f_plan_id' }),
+      model: Vue.android ? new LocalPagedList('androidGetuserinfo', 5, {f_plan_id: 'this.f_plan_id'}) : new PagedList(`AndroidRest/api/af-safecheck/sql/androidGetuserinfo`, 5, {f_plan_id: 'this.f_plan_id' }),
       showModal: false,
       param: null,
       f_preset_dt : Util.to3339TimeString(),
@@ -347,7 +347,7 @@ export default {
     },
     inspect(row) {
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_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) => {
           console.log(JSON.stringify(response))
         row['f_plan_meters'] = response.data
 

package/src/components/android/CheckerMonthly.vue

@@ -34,7 +34,7 @@ import co from 'co'
 import Vue from 'vue'
 
 let aggCheckerTask = function * (self) {
-    let result = yield self.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/统计安检员月任务?pageNo=1&pageSize=9999` , {
+    let result = yield self.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/统计安检员月任务?pageNo=1&pageSize=9999` , {
         data: {
             id: Vue.user.id,
             org_id: Vue.user.parentid,