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

package/src/components/rongcheng/PaperFeedback.vue

@@ -333,7 +333,7 @@
   //               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}`)
@@ -370,7 +370,7 @@
   //         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
@@ -409,7 +409,7 @@
         }
       }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]
@@ -498,7 +498,7 @@
       },
       // 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+"'"
       //     }
       //   })
@@ -1051,7 +1051,7 @@
         //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",
@@ -1061,7 +1061,7 @@
         }, {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": "有效",
@@ -1101,7 +1101,7 @@
         //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",
@@ -1111,7 +1111,7 @@
         }, {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": "有效",
@@ -1159,7 +1159,7 @@
           //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',

package/src/components/rongcheng/PaperListAJ.vue

@@ -27,9 +27,9 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" 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"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -222,7 +222,7 @@
     export default {
         title: '民用安检结果查看',
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
@@ -364,7 +364,7 @@
           async initstreets(){
             this.streetslist = []
             let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+            let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
               data: {
                 items: '*',
                 tablename: 't_street',

package/src/components/rongcheng/PaperListNPAJ.vue

@@ -27,9 +27,9 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" 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"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -220,7 +220,7 @@
     export default {
         title: '非民用安检结果查看',
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
@@ -363,7 +363,7 @@
           async initstreets(){
             this.streetslist = []
             let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+            let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
               data: {
                 items: '*',
                 tablename: 't_street',

package/src/components/rongcheng/PaperListNPSQ.vue

@@ -27,10 +27,10 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" 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"
                                   :choose-col="true"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -158,6 +158,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -168,6 +169,27 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true"   v-if="pic">
+      <header slot="modal-header" class="modal-header">
+        上传照片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="blodid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            isusetype="送气照片"
+          ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -179,6 +201,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -209,8 +232,11 @@
 
     export default {
         title: '非民用送气结果查看',
+        components: {
+            safecheckUpload
+        },
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
@@ -274,10 +300,19 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              blodid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.blodid=row.id
+            this.pic=true
+            debugger
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {
@@ -352,7 +387,7 @@
           async initstreets(){
             this.streetslist = []
             let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+            let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
               data: {
                 items: '*',
                 tablename: 't_street',

package/src/components/rongcheng/PaperListSQ.vue

@@ -27,10 +27,10 @@
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
             <div class="col-sm-4" 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"
                                   :choose-col="true"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel>
               <button class="button_spacing button_search" @click="search()">查询</button>
               <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
             </div>
@@ -163,6 +163,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -173,6 +174,26 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true" v-if="pic">
+      <header slot="modal-header" class="modal-header">
+        上传照片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="bolbid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -184,6 +205,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -214,8 +236,9 @@
 
     export default {
         title: '民用送气结果查看',
+        components: {safecheckUpload},
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
                 f_approved: 'this.f_approved',
                 f_entry_status: 'this.f_entry',
@@ -230,16 +253,6 @@
             model.f_no_checkplan = ''
             model.f_filialeid = this.$login.f.orgid
             model.f_check_type='民用'
-          // let searchData={
-          //     f_plan_id: this.model.f_checker_id==undefined?"":this.model.f_checker_id,
-          //     f_approved: this.model.f_approved,
-          //     f_entry_status: this.model.f_entry,
-          //     f_no_checkplan:this.model.f_no_checkplan[0],
-          //     f_filialeid: this.model.f_filialeid,
-          //     //orderitem: this.model.f_offsite_time,
-          //     //condition:this.model.condition
-          // }
-            // model.f_subcompany = this.$login.f.f_fengongsi
             return {
               searchData: {
                 condition:"1=1",
@@ -276,10 +289,18 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              bolbid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.bolbid=row.id
+            this.pic=true
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {
@@ -354,7 +375,7 @@
           async initstreets(){
             this.streetslist = []
             let HttpReset = new HttpResetClass()
-            let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+            let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
               data: {
                 items: '*',
                 tablename: 't_street',

package/src/components/rongcheng/PaperStatem.vue

@@ -54,7 +54,12 @@
           <label class="text-left font">到访不遇照片：</label>
           <img-self :src="item.f_noanswer_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
           <img-self :src="item.f_noanswertwo_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
-
+          <img-self :src="item.f_noanswer3_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer4_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer5_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer6_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer7_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer8_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
         </div>
         <div class="col-sm-4 col-xs-4">
           <div class="auto">
@@ -71,7 +76,7 @@
         <div class="col-sm-8 col-xs-8" :class="style__">
           <label class="text-left font">拒检照片：</label>
           <img-self :src="item.f_rejectcheck_path" alt="拒检照片" style=" display: inline-block" width="150" height="200"> </img-self>
-<!--          <img-self :src="item.f_noanswertwo_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+          <img-self v-if="item.f_rejectcheck2_path" :src="item.f_rejectcheck2_path" alt="拒检照片" style=" display: inline-block" width="150" height="200"> </img-self>
 
         </div>
         <div class="col-sm-4 col-xs-4">
@@ -85,6 +90,47 @@
           </div>
         </div>
       </div>
+
+      <div class="row" v-show="item.f_entry_status=='激光检漏'">
+        <div class="col-sm-8 col-xs-8" :class="style__">
+          <label class="text-left font">激光检漏照片：</label>
+          <img-self :src="item.f_detection_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection2_path" :src="item.f_detection2_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+<!--          <img-self v-if="item.f_detection3_path" :src="item.f_detection3_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_detection4_path" :src="item.f_detection4_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_detection5_path" :src="item.f_detection5_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_detection6_path" :src="item.f_detection6_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_detection7_path" :src="item.f_detection7_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_detection8_path" :src="item.f_detection8_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+        </div>
+      </div>
+      <div class="row" v-show="item.f_entry_status=='立杠保压'">
+        <div class="col-sm-8 col-xs-8" :class="style__">
+          <label class="text-left font">立杠保压照片：</label>
+          <img-self :src="item.f_pressure_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure2_path" :src="item.f_pressure2_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+<!--          <img-self v-if="item.f_pressure3_path" :src="item.f_pressure3_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_pressure4_path" :src="item.f_pressure4_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_pressure5_path" :src="item.f_pressure5_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_pressure6_path" :src="item.f_pressure6_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_pressure7_path" :src="item.f_pressure7_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_pressure8_path" :src="item.f_pressure8_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+        </div>
+      </div>
+      <div class="row" v-show="item.f_entry_status=='室外关阀'">
+        <div class="col-sm-8 col-xs-8" :class="style__">
+          <label class="text-left font">室外关阀照片：</label>
+          <img-self :src="item.f_outdoor_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor2_path" :src="item.f_outdoor2_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+<!--          <img-self v-if="item.f_outdoor3_path" :src="item.f_outdoor3_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_outdoor4_path" :src="item.f_outdoor4_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_outdoor5_path" :src="item.f_outdoor5_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_outdoor6_path" :src="item.f_outdoor6_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_outdoor7_path" :src="item.f_outdoor7_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+<!--          <img-self v-if="item.f_outdoor8_path" :src="item.f_outdoor8_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+        </div>
+      </div>
+
 <!--      <div class="row" v-show="item.f_entry_status=='拒检'">
         <div class="col-sm-8 col-xs-8">
           <label class="text-left font">拒检照片：</label>

package/src/components/rongcheng/PhoneDevicesInfo.vue

@@ -77,7 +77,8 @@
         row: Object,
         userinfo:Object,
         wid:"60%",
-        devices_types:[{label:'热水器',value:'热水器'},{label:'壁挂炉',value:'壁挂炉'},{label:'灶具',value:'灶具'}],
+        devices_types:Vue.$appdata.getParam('设备类型')?Vue.$appdata.getParam('设备类型'):[{label:'热水器',value:'热水器'},{label:'壁挂炉',value:'壁挂炉'},{label:'灶具',value:'灶具'}],
+        // devices_types:[{label:'热水器',value:'热水器'},{label:'壁挂炉',value:'壁挂炉'},{label:'灶具',value:'灶具'}],
         pipe_types:[{label:'橡胶管',value:'橡胶管'},{label:'波纹管',value:'波纹管'},{label:'钢管',value:'钢管'}],
         update:false
       }
@@ -86,6 +87,7 @@
       user: {
         type: Object
       },
+      f_user_type:'',
       f_userinfo_id:''
     },
     methods: {
@@ -132,10 +134,10 @@
           //tag
         }
         //tag
-        /*new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/commonSearchByUser`, {data: {items: '*', tablename: 't_devices', orderitem: 'f_input_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}, {resolveMsg: null, rejectMsg: null}).then((row) => {
+        /*new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/commonSearchByUser`, {data: {items: '*', tablename: 't_devices', orderitem: 'f_input_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}, {resolveMsg: null, rejectMsg: null}).then((row) => {
           this.model = row.data
         })*/
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
             //f_userinfo_code:'12381344',
             f_userinfo_id:userinfoid
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -148,6 +150,19 @@
 
       },
       save(){
+        if (this.f_user_type == "非民用") {
+          let hasAlarmOrValve = false;
+          for (let i = 0; i < this.model.length; i++) {
+            if (this.model[i].f_devices_type === '报警器' || this.model[i].f_devices_type === '切断阀') {
+              hasAlarmOrValve = true;
+              break;
+            }
+          }
+          if (!hasAlarmOrValve) {
+            this.$showMessage("请添加报警器或切断阀！  ")
+            return;
+          }
+        }
         if(this.model.length==0){
           this.$showMessage("请添加设备信息后再点击保存！")
           return
@@ -163,7 +178,7 @@
         userinfo.userfiles[0].devicesinfo.forEach((r)=>{
           r.img={content: null, filename: null}
         })
-        let response=new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+        let response=new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
           data:{
             userinfo:userinfo,
             address:{id:this.userinfo.addressinfo.id,oldid:this.userinfo.addressinfo.id}
@@ -210,7 +225,7 @@
     },*/
     ready () {
       this.getmodel()
-      /*let response=new HttpResetClass().load("POST", "/rs/logic/getSaleInitData", {
+      /*let response=new HttpResetClass().load("POST", "/api/af-safecheck/logic/getSaleInitData", {
         f_orgid: '305'
       }, {resolveMsg: null, rejectMsg: null})*/
     }