safecheck-client 4.0.1-8 → 4.0.1-80

package/src/filiale/xinkang/pc/PaperList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-row">
+  <div class="flex-row" v-show="showinfo1">
     <div class="basic-main">
       <criteria-paged :model="model" v-ref:paged @sort="sort">
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
@@ -266,6 +266,8 @@
       <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
     </div>
   </div>
+  <new-check-paper v-if="showinfo2" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback1"></new-check-paper>
+  <new-check-paper-temp  v-if="showinfo3" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback2"></new-check-paper-temp>
 </template>
 
 <script>
@@ -333,7 +335,11 @@ import BenzAMRRecorder from 'benz-amr-recorder'
       // }
       // model.f_subcompany = this.$login.f.f_fengongsi
       return {
+        showinfo1:true,
+        showinfo2:false,
+        showinfo3:false,
         audioshow:false,
+        shouinfodata:{},
         searchData: {
           condition: "1=1",
           orderitem: "f_offsite_time desc",
@@ -376,6 +382,14 @@ import BenzAMRRecorder from 'benz-amr-recorder'
       }
     },
     methods: {
+      showback1(){
+        this.showinfo1 = true
+        this.showinfo2 = false
+      },
+      showback2(){
+        this.showinfo1 = true
+        this.showinfo3 = false
+      },
       //获取省市区列表
       getPcd(val){
         this.pcds = [{label:'全部',value:''}]
@@ -484,15 +498,16 @@ import BenzAMRRecorder from 'benz-amr-recorder'
       },
 
       change(row) {
-        // Vue.$login = {jwt: row.f_checker_id}
-        asyncReady(this).then(() => {
-            ////tag)
-            row.f_upload_state = '已传'
-            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
-        }).catch(
-          (respanse) => {
-            alert('获取配置文件失败')
-          })
+        row.f_upload_state = '已传'
+        this.shouinfodata = JSON.parse(JSON.stringify(row))
+        this.showinfo1 = false
+        if (row.f_safe_type == '已挂表未办卡安检'){
+          this.showinfo2 = false
+          this.showinfo3 = true
+          return
+        }
+        this.showinfo2 = true
+        this.showinfo3 = false
       },
       readConfig() {
         let gen = asyncReady(this)

package/src/filiale/yuansheng/android/SwitchValve.vue

@@ -294,7 +294,7 @@ export default {
         meternumberf: this.thisOneData.f_meternumber,  //表号
         contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
       }
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/iot_saveInstruct`, {data: data}).then((row) => {
         this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
         //tag
         this.thisOneData = '';