safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/{shaoguan/DefectList.vue → outsideSafecheck/pc/HiddenDangerView/DefectListTS.vue}

@@ -40,75 +40,81 @@
               <nobr>{{row.f_item_value}}</nobr>
             </td>
             <td style="text-align: center">
-              <nobr>{{row.f_repaire_type}}</nobr>
+              <nobr v-if="(row.f_item_name).indexOf('异常差值')===-1">{{row.f_repaire_type}}</nobr>
+              <nobr v-else>隐患差值不需要转维修</nobr>
             </td>
             <td style="text-align: center">
-              <img-button style="float: left;margin-left: 12%" v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理'" :src="'/rs/image/file/'+row.f_path" :value="'隐患图片'"></img-button>
-              <button v-if="row.f_repaire_type == '维修已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>
-<!--              <button v-if="row.f_repaire_type == '隐患未处理'" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect( row, 'solve')">处理隐患</button>-->
+              <!--<img-button style="float: left;margin-left: 12%" v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理'" :src="'/rs/image/file/'+row.f_path"  :src1="'/rs/image/file/'+row.f_second_path" :value="'隐患图片'"></img-button>-->
+              <!--              <button v-if="row.f_repaire_type == '维修已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>-->
+              <button class="button_spacing button_search-1" @click="$parent.$parent.$parent.openDefectImg(row)">隐患图片</button>
+              <button class="button_spacing button_search-1" @click="$parent.$parent.$parent.openRepairImg(row)" v-if="row.f_repaire_type=='维修已处理'" style="margin-top: 3px">维修图片</button>
+              <!--<button v-if="row.f_repaire_type == '隐患未处理'" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect( row, 'solve')">处理隐患</button>-->
+
             </td>
           </template>
         </data-grid>
       </criteria-paged>
     </div>
 
-    <div style="overflow-y: scroll;height: 40%" v-if="needRepair">
-      <div class="form-horizontal auto">
-        <ul class="nav nav-tabs">
-          <li role="presentation" class="active"><a style="	color: #000 !important;font-size: 14px">转维修</a></li>
-        </ul>
-        <validator name='v' @valid="valid = true" @invalid="valid = false">
-          <div class="row">
-            <div class="col-sm-4" :class="[$v.dispatchtype.required ? 'select-error' : '']">
-              <label for="dispatchtype" class="font_normal_body">派发类型</label>
-              <input id="dispatchtype" type="text" v-show="false" v-model="$refs.dispatchtype.selectedItems" v-validate:dispatchtype='{required: true }'>
-              <v-select :value.sync="toRepairModal.preData.dispatchType" v-model="toRepairModal.preData.dispatchType"
-                        :options='toRepairModal.preData.dispatchTypeOptions' placeholder='派发类型'
-                        close-on-select v-ref:dispatchtype>
-              </v-select>
-            </div>
-            <div class="col-sm-4  " v-if="toRepairModal.preData.dispatchType == '派发给站点'">
-              <label class="font_normal_body">站&nbsp;&nbsp;点</label>
-              <right-tree
-                  islist
-                  :userid="$login.f.id"
-                  :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
-                  @re-res="getSiteRes">
-              </right-tree>
-            </div>
-            <div class="col-sm-4   " v-if="toRepairModal.preData.dispatchType == '派发给维修员'" :class="[$v.f_repairman.required ? 'select-error' : '']">
-              <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairman" v-validate:f_repairman='{required: true }'>
-              <label class="font_normal_body">维修员</label>
-              <v-select
-                  :value.sync="toRepairModal.preData.f_repairman"
-                  :value-single="true"
-                  :options='toRepairModal.preData.repairers'
-                  placeholder='请选择维修员'
-                  close-on-select></v-select>
-            </div>
-            <div class="col-sm-4" :class="[$v.f_repairtype.required ? 'select-error' : '']">
-              <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairtype" v-validate:f_repairtype='{required: true }'>
-              <label class="font_normal_body">报修类型</label>
-              <v-select :value.sync="toRepairModal.preData.f_repairtype" style="width:60%"
-                        class="select select_list"
-                        :value-single="true"
-                        :options='toRepairModal.preData.repairTypeOptions'
-                        close-on-select>
-              </v-select>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-sm-8 ">
-              <label class="font_normal_body" style="width: 12%">备&nbsp;&nbsp;&nbsp;&nbsp;注</label>
-              <input class="input_search" style="width: 60%" type="text" v-model="toRepairModal.preData.f_remarks" placeholder="备注">
-            </div>
-            <div class="col-sm-4" style="margin-top: 1%">
-              <button class="button_search" :disabled="!valid" @click="confirm">转维修</button>
-            </div>
+    <!--    <div style="overflow-y: scroll;height: 40%" v-if="needRepair&&(check.f_one_count!=0||check.f_two_count!=0)">
+          <div class="form-horizontal auto">
+            <ul class="nav nav-tabs">
+              <li role="presentation" class="active"><a style="	color: #000 !important;font-size: 14px">一、二级隐患转维修</a></li>
+            </ul>
+            <validator name='v' @valid="valid = true" @invalid="valid = false">
+              <div class="row">
+                <div class="col-sm-4" :class="[$v.dispatchtype.required ? 'select-error' : '']">
+                  <label for="dispatchtype" class="font_normal_body">派发类型</label>
+                  <input id="dispatchtype" type="text" v-show="false" v-model="$refs.dispatchtype.selectedItems" v-validate:dispatchtype='{required: true }'>
+                  <v-select :value.sync="toRepairModal.preData.dispatchType" v-model="toRepairModal.preData.dispatchType"
+                            :options='toRepairModal.preData.dispatchTypeOptions' placeholder='派发类型'
+                            close-on-select v-ref:dispatchtype>
+                  </v-select>
+                </div>
+                <div class="col-sm-4  " v-if="toRepairModal.preData.dispatchType == '派发给站点'">
+                  <label class="font_normal_body">站&nbsp;&nbsp;点</label>
+                  <right-tree
+                      islist
+                      :userid="$login.f.id"
+                      :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
+                      @re-res="getSiteRes">
+                  </right-tree>
+                </div>
+                <div class="col-sm-4   " v-if="toRepairModal.preData.dispatchType == '派发给维修员'" :class="[$v.f_repairman.required ? 'select-error' : '']">
+                  <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairman" v-validate:f_repairman='{required: true }'>
+                  <label class="font_normal_body">维修员</label>
+                  <v-select
+                      :value.sync="toRepairModal.preData.f_repairman"
+                      :value-single="true"
+                      :options='toRepairModal.preData.repairers'
+                      placeholder='请选择维修员'
+                      close-on-select></v-select>
+                </div>
+                <div class="col-sm-4" :class="[$v.f_repairtype.required ? 'select-error' : '']">
+                  <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairtype" v-validate:f_repairtype='{required: true }'>
+                  <label class="font_normal_body">报修类型</label>
+                  <v-select :value.sync="toRepairModal.preData.f_repairtype" style="width:60%"
+                            class="select select_list"
+                            :value-single="true"
+                            :options='toRepairModal.preData.repairTypeOptions'
+                            close-on-select>
+                  </v-select>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-8 ">
+                  <label class="font_normal_body" style="width: 12%">备&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+                  <input class="input_search" style="width: 80%;margin-left: 3%" type="text" v-model="toRepairModal.preData.f_remarks" placeholder="备注">
+                </div>
+                <div class="col-sm-4" style="margin-top: 1%">
+                  <button class="button_search" :disabled="!valid" @click="confirm">转维修</button>
+                </div>
+              </div>
+            </validator>
           </div>
-        </validator>
-      </div>
-    </div>
+        </div>-->
+
+
     <modal :show.sync="showSolveModal" v-ref:solveModal>
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
@@ -145,45 +151,50 @@
         <div class="col-sm-6" style="margin-top: 10px">
           <label class="font_normal_body">处理时间</label>
           <datepicker
-              :disabled="solveModal.preData.type == 'view'"
-              placeholder='处理时间' style="width:60%"
-              :disabled-days-of-week="[]"
-              :format="'yyyy-MM-dd'"
-              :show-rest-button="reset"
-              :value.sync="solveModal.uploadData.f_repair_date">
+            :disabled="solveModal.preData.type == 'view'"
+            placeholder='处理时间' style="width:60%"
+            :disabled-days-of-week="[]"
+            :format="'yyyy-MM-dd'"
+            :show-rest-button="reset"
+            :value.sync="solveModal.uploadData.f_repair_date">
           </datepicker>
         </div>
-        <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
+        <div v-if="solveModal.preData.type == 'solve'" class="col-sm-6" style="margin-bottom: 10px">
           <label class="font_normal_body">处理后图片</label>
           <avatar-upload :width="200" :height="200" :img-src.sync="solveModal.uploadData.imgSrc" :filename.sync="solveModal.uploadData.filename" v-ref:imginfo></avatar-upload>
         </div>
-        <div v-if="solveModal.preData.type == 'view'" class="col-sm-12" style="margin-bottom: 10px">
+        <div v-if="solveModal.preData.type == 'view'" class="col-sm-6" style="margin-bottom: 10px">
           <label class="font_normal_body">处理后图片</label>
           <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg"></img-self>
         </div>
+        <div class="col-sm-6" style="margin-bottom: 10px">
+          <label class="font_normal_body">情况说明</label>
+          <textarea v-model="solveModal.uploadData.f_item_remakes"></textarea>
+        </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
         <button class="button_search" v-if="solveModal.preData.type == 'solve'" @click="ok">确认</button>
         <button class="button_search" @click="cancel">取消</button>
       </div>
     </modal>
+    <image-viewer :src="defectImg" :show="showDefectModal" @clone_f="clone_p" alt="隐患图片"></image-viewer>
   </div>
 </template>
 
 <script>
   import {PagedList, HttpResetClass} from 'vue-client'
-  import * as Util from '../Util'
+import * as Util from '../../../Util'
   import co from 'co'
 
   const upSolveDefect = function* (self) {
     let uploadData = self.solveModal.uploadData
     console.log('uploadData => ' + JSON.stringify(uploadData))
-    self.$resetpost('/rs/logic/pcRepairDefect', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+    self.$resetpost('/api/af-safecheck/logic/pcRepairDefect', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
       .then(res => {
         if (res.data.code == 200) {
           self.$showMessage('隐患已处理。')
           self.showSolveModal = false
-          self.model.search('', {})
+          self.model.search('1=1', {})
         }
       })
   }
@@ -199,18 +210,15 @@
       uploadData.model.f_orgstr = preData.f_reciever
       uploadData.model.f_outlets = preData.f_outlets
     } else if (preData.dispatchType == '派发给维修员') {
-      // uploadData.model.f_meetunit = self.$login.f.orgpathnames
-      // uploadData.model.f_orgstr = self.$login.f.orgpathstr
-      // uploadData.model.f_outlets = self.$login.f.f_parentname
+      uploadData.model.serviceacitivity[0].f_reciever = preData.f_repairman
       uploadData.model.f_meetunit = self.$login.f.deps
       uploadData.model.f_orgid = self.$login.f.orgid
       uploadData.model.f_filiale = self.$login.f.org
       uploadData.model.f_outlets = self.$login.f.deps
       uploadData.model.f_filiale_id = self.$login.f.orgid
-      uploadData.model.serviceacitivity[0].f_reciever = self.toRepairModal.preData.f_repairman
       uploadData.toRepair = '一级派单'
     }
-    let res = yield self.$resetpost('/rs/sql/GetUserForRepaire', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireTS', {data: {f_userinfo_id: self.check.f_userinfo_id}})
     preData.userInfo = res.data[0]
     uploadData.model = Object.assign(uploadData.model, preData.userInfo)
     uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
@@ -220,11 +228,19 @@
     // 拼接failure
     let failure = []
     self.model.rows.forEach(row => {
-      if (row.f_repaire_type == '隐患未处理') {
-        failure.push({
-          f_failure_type: row.f_item_name,
-          failurecase: row.f_item_value.split(',')
-        })
+      console.log("66666")
+      // console.log(row.f_defect_level.indexOf('一级')!=-1)
+      // console.log(row.f_defect_level.indexOf('二级')!=-1)
+      // console.log(row.f_defect_level)
+      // console.log(row.f_defect_level.indexOf('一级'))
+      // console.log(row.f_defect_level.indexOf('二级'))
+      if (row.f_defect_level){
+        if (row.f_repaire_type == '隐患未处理'&&(row.f_defect_level.indexOf('一级')!=-1||row.f_defect_level.indexOf('二级')!=-1)) {
+          failure.push({
+            f_failure_type: row.f_item_name,
+            failurecase: row.f_item_value.split(',')
+          })
+        }
       }
     })
     uploadData.model.failure = failure
@@ -235,7 +251,7 @@
     }
     let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
     // 取隐患未处理的
-    rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
+    rows = rows.filter(row => row.f_repaire_type == '隐患未处理'&&row.f_defect_level && (row.f_defect_level.indexOf('一级')!=-1||row.f_defect_level.indexOf('二级')!=-1))
     console.log('row => ' + JSON.stringify(rows))
     // 开始拼接
     rows.forEach(row => {
@@ -254,6 +270,7 @@
           details: [{
             f_project: `${row.f_item_name}:${row.f_item_value}`,
             type: 'selector',
+            f_defect_id:row.id,
             options: safecheckOptions
           }]
         }
@@ -262,6 +279,7 @@
         // 存在则追加
         repairitems.data[existIndex].details.push({
           f_project: `${row.f_item_name}:${row.f_item_value}`,
+          f_defect_id:row.id,
           type: 'selector',
           options: safecheckOptions
         })
@@ -270,10 +288,10 @@
     uploadData.model.f_repairitems = repairitems
     console.log('uploadData ---> ' + JSON.stringify(uploadData))
     // 调工单接口
-    let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
+    let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
     console.log('result ===> ' + JSON.stringify(result))
     if (result.data.f_service_id) {
-      let updateRes = yield self.$resetpost('/rs/logic/updateDefectState', {itemsId: self.$login.convertToIn(rows.map(row => row.id))})
+      let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectState', {itemsId: self.$login.convertToIn(rows.map(row => row.id))})
       if (updateRes.data.code == 200) {
         self.$showMessage('隐患已转维修。')
         self.model.search(`f_repaire_type != '无隐患'`, {})
@@ -282,14 +300,15 @@
   }
 
   export default {
-    title: '隐患项列表',
+    title: '隐患项列表(未整合)',
     data() {
       return {
-        model: new PagedList('rs/sql/GetDefectByPaperId', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdTS', 100, {
           f_paper_id: 'this.f_paper_id'
         }),
         showSolveModal: false,
         showToRepairModal: false,
+        showDefectModal:false,
         valid: false,
         needRepair: true,
         solveModal: {
@@ -307,6 +326,7 @@
             filename: ''
           }
         },
+        defectImg:[],
         toRepairModal: {
           preData: {
             dispatchTypeOptions: [{label: '派发给站点', value: '派发给站点'}, {label: '派发给维修员', value: '派发给维修员'}],
@@ -324,8 +344,7 @@
           uploadData: {
             model: {
               serviceacitivity: [{
-                f_service_acitivity_type: '派单',
-                f_reciever:''
+                f_service_acitivity_type: '派单'
               }],
               f_repairitems: {},
               failure: '',
@@ -371,12 +390,40 @@
     props: ['check'],
     ready() {
       if (this.check) {
+        console.log("7777777777777777")
+        console.log(JSON.stringify(this.check))
         this.model.f_paper_id = this.check.id
         this.model.search(`f_repaire_type != '无隐患'`, {})
       }
       this.getEmp()
     },
     methods: {
+      openDefectImg(row){
+        console.log(row)
+        this.defectImg= [{url: '/rs/image/file/' + row.f_path}]
+        var img2 = {url: '/rs/image/file/' + row.f_second_path}
+        if (row.f_second_path != ''){
+          this.defectImg.push(img2)
+        }
+        console.log(this.defectImg)
+        this.showDefectModal = true
+      },
+      openRepairImg(row){
+        new HttpResetClass().load('post','/api/af-safecheck/sql/getRpaorImg',{data:{defectid:row.id}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          console.log(row)
+          this.defectImg= [{url: '/rs/image/file/' + res.data[0].f_first_imgname}]
+          if (res.data[0].f_second_imgname){
+            var img2 = {url: '/rs/image/file/' + res.data[0].f_second_imgname}
+            this.defectImg.push(img2)
+          }
+          console.log(this.defectImg)
+          this.showDefectModal = true
+        })
+      },
+      clone_p () {
+        // 关闭组件
+        this.showDefectModal = false
+      },
       solveDefect(row, type) {
         this.solveModal.preData.defectImg = '/rs/image/file/' + row.f_path
         this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_repair_path
@@ -402,6 +449,7 @@
       cancel() {
         this.showSolveModal = false
         this.showToRepairModal = false
+        this.showDefectModal = false
       },
       toRepair() {
         this.showToRepairModal = !this.showToRepairModal
@@ -421,16 +469,16 @@
       },
       // 获取维修员
       getEmp() {
-        let val = {source: 'this.getParentByType($organization$).getChildByName($维修员$).getUsers()', userid: `${this.$login.f.id}`}
+        let val = {source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1 ))', userid: `${this.$login.f.id}`}
         let http = new HttpResetClass()
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           res.data.forEach((item) => {
             let http1 = new HttpResetClass()
-            http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+            http1.load('POST', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
               data: {
                 items: 'f_user_telephone',
                 tablename: 't_user',
-                condition: `id  =  ${item.id}`,
+                condition: `id  =  '${item.id}'`,
                 orderitem: 'id'
               }
             }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
@@ -454,9 +502,13 @@
       },
       'model.rows'() {
         if (this.model.rows.length > 0) {
-          if (this.model.rows[0].f_repaire_type == '隐患未处理') {
-            this.needRepair = true
-            return
+          for (let i = 0; i < this.model.rows.length; i++) {
+            if (this.model.rows[i].f_defect_level) {
+              if (this.model.rows[i].f_repaire_type === '隐患未处理' && (this.model.rows[i].f_defect_level.indexOf('一级') != -1 || this.model.rows[i].f_defect_level.indexOf('二级') != -1)) {
+                this.needRepair = true
+                return
+              }
+            }
           }
         }
         this.needRepair = false

package/src/components/outsideSafecheck/pc/HiddenDangerView/DefectMainTS.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="flex">
+    <section>
+      <div class="row"  style="height: 100%" :class="{'basic-main':!showItem,'binary':showItem}">
+        <div :class="{'binary-left':showItem}" >
+          <defect-paper-ts @select-changed="selected" v-ref:check></defect-paper-ts>
+        </div>
+        <div style="width: 45%" :class="{'binary-right':showItem}" v-show="showItem">
+          <defect-list-ts v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
+                       v-ref:detail></defect-list-ts>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+  import DefectPaper from './DefectPaperTS'
+  import DefectDetail from './DefectDetailTS'
+
+  export default {
+    title: '隐患查看(未整合)',
+    props: ['f'],
+    components: {DefectPaper, DefectDetail},
+    data() {
+      return {
+        showItem: false
+      }
+    },
+    methods: {
+      selected(row) {
+        this.showItem = true
+      }
+    },
+    watch:{
+
+    }
+  }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 5px 7px 5px 7px;
+    border-radius: 10px;
+  }
+</style>