safecheck-client 4.0.0-32 → 4.0.0-34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.0-32",
+  "version": "4.0.0-34",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/NewDefectList/DefectListNew.vue

@@ -56,7 +56,7 @@
             </td>
             <td style="text-align: center">
               <div>
-<!--                <img-button v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理' && row.f_path" :src="'/singlepage/rs/image/file/'+row.f_path" :value="'隐患图片'"></img-button>-->
+<!--                <img-button v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理' && row.f_path" :src="'/rs/image/file/'+row.f_path" :value="'隐患图片'"></img-button>-->
 <!--                <button style="margin-top: 3px" v-if="row.f_repaire_type == '维修已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>-->
                 <button style="margin-top: 3px" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect(row, row.f_repaire_type)">处理详情</button>
                 <button style="margin-top: 3px" v-if="row.f_repaire_type == '隐患未处理' && $parent.$parent.$parent.showHandleDefectButton === '是'" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect(row, 'solve')">处理隐患</button>
@@ -519,10 +519,10 @@ export default {
       this.solveModal.preData.repairedImg3 = ''
       this.solveModal.preData.repairedImg4 = ''
       this.solveModal.preData.repairedImg5 = ''
-      this.solveModal.preData.defectImg = row.f_path ? '/singlepage/rs/image/file/' + row.f_path : ''
-      this.solveModal.preData.defectImg1 = row.f_p1_path ? '/singlepage/rs/image/file/' + row.f_p1_path : ''
-      this.solveModal.preData.defectImg2 = row.f_p2_path ? '/singlepage/rs/image/file/' + row.f_p2_path : ''
-      this.solveModal.preData.defectImg3 = row.f_p3_path ? '/singlepage/rs/image/file/' + row.f_p3_path : ''
+      this.solveModal.preData.defectImg = row.f_path ? '/rs/image/file/' + row.f_path : ''
+      this.solveModal.preData.defectImg1 = row.f_p1_path ? '/rs/image/file/' + row.f_p1_path : ''
+      this.solveModal.preData.defectImg2 = row.f_p2_path ? '/rs/image/file/' + row.f_p2_path : ''
+      this.solveModal.preData.defectImg3 = row.f_p3_path ? '/rs/image/file/' + row.f_p3_path : ''
       this.solveModal.uploadData.id = row.id
       this.solveModal.preData.type = type
       this.solveModal.preData.state = row.f_repaire_state
@@ -533,13 +533,13 @@ export default {
           this.solveModal.preData.repairedImg = row.f_repair_path
           this.solveModal.preData.repairedImg1 = row.f_repair1_path
         } else {
-          this.solveModal.preData.f_repair_path = row.f_repair_path? '/singlepage/rs/image/file/' + row.f_repair_path:null
-          this.solveModal.preData.repairedImg = row.f_repair_path? '/singlepage/rs/image/file/' + row.f_repair_path:null
-          this.solveModal.preData.repairedImg1 = row.f_other_dealpath1 ? '/singlepage/rs/image/file/' + row.f_other_dealpath1 : null
-          this.solveModal.preData.repairedImg2 = row.f_other_dealpath2 ? '/singlepage/rs/image/file/' + row.f_other_dealpath2 : null
-          this.solveModal.preData.repairedImg3 = row.f_repair2_path ? ('/singlepage/rs/image/file/' + row.f_repair2_path) : ''
-          this.solveModal.preData.repairedImg4 = row.f_repair3_path ? ('/singlepage/rs/image/file/' + row.f_repair3_path) : ''
-          this.solveModal.preData.repairedImg5 = row.f_repair4_path ? ('/singlepage/rs/image/file/' + row.f_repair4_path) : ''
+          this.solveModal.preData.f_repair_path = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
+          this.solveModal.preData.repairedImg = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
+          this.solveModal.preData.repairedImg1 = row.f_other_dealpath1 ? '/rs/image/file/' + row.f_other_dealpath1 : null
+          this.solveModal.preData.repairedImg2 = row.f_other_dealpath2 ? '/rs/image/file/' + row.f_other_dealpath2 : null
+          this.solveModal.preData.repairedImg3 = row.f_repair2_path ? ('/rs/image/file/' + row.f_repair2_path) : ''
+          this.solveModal.preData.repairedImg4 = row.f_repair3_path ? ('/rs/image/file/' + row.f_repair3_path) : ''
+          this.solveModal.preData.repairedImg5 = row.f_repair4_path ? ('/rs/image/file/' + row.f_repair4_path) : ''
         }
         if (type === '现场已处理') {
           this.solveModal.uploadData.f_repairman = this.check.f_checker_name

package/src/components/android/SafecheckOrderV.vue

@@ -1433,7 +1433,7 @@
           if(this.item.f_user_type == '非民用'){
             // 非民用
             if (Vue.config.safecheck.DevicesSetConfig != undefined){
-              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
@@ -1443,7 +1443,7 @@
           }else{
             // 民用户
             if (Vue.config.safecheck.DevicesConfig != undefined){
-              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])

package/src/components/android/userinfo/SafecheckUserInfo.vue

@@ -77,17 +77,7 @@
           </div>
         </div>
 
-        <div style="font-size: medium;" :class="style__">
-          <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img src="../../../assets/housestyle.png"
-                                                                   style="width: 20px;margin-bottom: 5px;text-align: left"
-                                                                   alt="">用气状态:</span>
-          <div :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
-            <input type="radio" name="enterstatus" v-model="f_usergas_status" id="nopeople" value="已使用">
-            <input type="radio" name="enterstatus" v-model="f_usergas_status" id="rejectchecck" value="未使用">拒检
-            <input type="radio" name="enterstatus" v-model="f_usergas_status" id="enterhouse" value="已关气">入户
-          </div>
 
-        </div>
         <div style="font-size: medium;" :class="style__">
           <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img src="../../../assets/housestyle.png"
                                                                    style="width: 20px;margin-bottom: 5px;text-align: left"

package/src/components/paper/PaperList.vue

@@ -384,7 +384,6 @@
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">
               {{row.f_approved_note}}
             </td>
-            <td style="text-align: center">{{row.f_gas_state}}</td>
             <td style="text-align: center">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
 

package/src/filiale/xiangyuanzhongai/android/SafecheckDevices.vue

@@ -732,7 +732,7 @@ export default {
               // 如果选中的是隐患项,取消选中isdefect为false的
               this.f_items[n].f_item_value = selectList
               // 如果第一次选择隐患项，初始化
-              if (!this.f_items[n].f_is_defect) {
+              if (this.f_items[n].f_item_value && this.f_items[n].string_defect){
                 this.f_items[n].f_is_defect = true
                 this.f_items[n].f_defect_level = selected[0].level
                 this.f_items[n].f_path = Vue.nopic
@@ -751,6 +751,24 @@ export default {
             this.f_items[n].f_deal_dispose = ''
             this.f_items[n].tooltip = ''
           })
+        }else if(this.f_items[n].type  == 'string') {
+          this.$watch('f_items[' + n + '].f_item_value', function (val) {
+            if (this.f_items[n].f_item_value && this.f_items[n].string_defect){
+              this.f_items[n].f_is_defect = true
+              this.f_items[n].f_defect_level = ''
+              this.f_items[n].f_path = Vue.nopic
+              this.f_items[n].f_live_dispose = '否'
+              this.f_items[n].f_deal_dispose = '未处理'
+              this.f_items[n].tooltip = ''
+            }else {
+              this.f_items[n].f_path = ''
+              this.f_items[n].f_is_defect = ''
+              this.f_items[n].f_defect_level = ''
+              this.f_items[n].f_live_dispose = ''
+              this.f_items[n].f_deal_dispose = ''
+              this.f_items[n].tooltip = ''
+            }
+          })
         }
       }
       //tag)
@@ -1014,6 +1032,7 @@ export default {
         verification_text:'',
         verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
+        string_defect: this.config[this.device.device].items[item].isdefect,
         multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
         readonly: this.config[this.device.device].items[item].readonly == true?true:false,

package/src/filiale/{xiangyuan → xiangyuanzhongai}/android/SafecheckUserInfo.vue

@@ -82,9 +82,9 @@
                                                                    style="width: 20px;margin-bottom: 5px;text-align: left"
                                                                    alt="">用气状态:</span>
           <div :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
-            <input type="radio" name="enterstatus" v-model="f_usergas_status" id="nopeople" value="已使用">
-            <input type="radio" name="enterstatus" v-model="f_usergas_status" id="rejectchecck" value="未使用">拒检
-            <input type="radio" name="enterstatus" v-model="f_usergas_status" id="enterhouse" value="已关气">入户
+            <input type="radio" name="gasstate" v-model="f_gas_state" id="1" value="已使用">已使用
+            <input type="radio" name="gasstate" v-model="f_gas_state" id="2" value="未使用">未使用
+            <input type="radio" name="gasstate" v-model="f_gas_state" id="3" value="已关气">已关气
           </div>
 
         </div>

package/src/filiale/xiangyuanzhongai/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
+  'safecheck-userinfo' : (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
 }
 
 exports.specialComp = specialComp