safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/createcheckplan/CreatePlan.vue

@@ -392,7 +392,7 @@
     self.checkboxModel.repeated = self.repeated
     console.log('self.model',self.model)
       self.checkboxModel.planWay = 'add'
-      yield self.$resetpost('rs/logic/GenCallInAllPlan', {data: self.checkboxModel},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+      yield self.$resetpost('api/af-safecheck/logic/GenCallInAllPlan', {data: self.checkboxModel},{resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log(res.data)
         if(res.data.code == 200) {
           self.$showMessage(`添加成功！现在${self.checkplan.f_plan_name}共有${res.data.countItem}个计划！`)
@@ -422,7 +422,7 @@
     self.checkboxModel.planWay = 'create'
     self.checkboxModel.createWay = self.createWay
     self.checkboxModel.repeated = self.repeated
-    yield self.$resetpost('rs/logic/GenCallInAllPlan', {data: self.checkboxModel}, {resolveMsg: null, rejectMsg: null})
+    yield self.$resetpost('api/af-safecheck/logic/GenCallInAllPlan', {data: self.checkboxModel}, {resolveMsg: null, rejectMsg: null})
       .then((respanse) => {
         console.log(respanse)
         self.showModal = false
@@ -448,7 +448,7 @@
     let checkIdArray = []
     data = self.model.params
     console.log('data ===> '+JSON.stringify(data))
-    yield self.$resetpost('rs/sql/getExistCheckItem/n', {data:data}, {resolveMsg: null, rejectMsg: null})
+    yield self.$resetpost('api/af-safecheck/sql/getExistCheckItem/n', {data:data}, {resolveMsg: null, rejectMsg: null})
       .then((res) => {
         console.log(res.data.n)
         self.repeated = res.data.n
@@ -456,7 +456,7 @@
   }
 
   let seachData = function * (self) {
-    let getParams = yield self.$resetpost('rs/logic/getSaleInitData', {data: {f_orgid: self.$login.f.orgid}}, {
+    let getParams = yield self.$resetpost('api/af-safecheck/logic/getSaleInitData', {data: {f_orgid: self.$login.f.orgid}}, {
       resolveMsg: null,
       rejectMsg: '获取营收参数出错！！！'
     })
@@ -489,7 +489,7 @@
     let searchSafeCycle= function* (self){
       console.log('获取民用非民用安检周期')
       let http = new HttpResetClass()
-      yield http.load('POST', 'rs/logic/getSafeCheckCycle', {},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+      yield http.load('POST', 'api/af-safecheck/logic/getSafeCheckCycle', {},{resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log('安检周期',res.data)
         if(res.data.code == 200){
           self.civil = res.data.civil.value
@@ -510,8 +510,8 @@
         let moptions = []
         for (let i = 1; i <= 12; i++)
           moptions.push({label: i + '', value: i + ''})
-        let model1 = new PagedList('rs/sql/根据安检员查询用户档案', 50,null)
-        let model = new PagedList('rs/sql/根据安检员查询用户档案', 50, {
+        let model1 = new PagedList('api/af-safecheck/sql/FetchUserFileByOrgChecker', 50,null)
+        let model = new PagedList('api/af-safecheck/sql/FetchUserFileByOrgChecker', 50, {
           orderitem: '"f_residential_area,f_address"',
           timetype: 'this.timetype',
           f_filialeids: 'this.f_filialeids'
@@ -519,7 +519,7 @@
         // 默认搜索12个月
         model.timetype = 'mm'
         model.f_filialeids = '('+this.$login.f.orgid+')'
-        let model2 = new PagedList('rs/sql/planCount', 50, {
+        let model2 = new PagedList('api/af-safecheck/sql/planCount', 50, {
           f_filialeids: 'this.f_filialeids'
         })
         model2.f_filialeids = '('+this.$login.f.orgid+')'
@@ -650,7 +650,7 @@
           this.checkboxModel.f_checker_id = val.id
         },
         dangerplan(){
-          this.$resetpost('rs/sql/getRemind', {data:{condition :` 1 = 1 and f_filialeid in ${this.model.f_filialeids}`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.$resetpost('api/af-safecheck/sql/getRemind', {data:{condition :` 1 = 1 and f_filialeid in ${this.model.f_filialeids}`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
 
             if (res.data.length>0){
               let a =0
@@ -733,7 +733,7 @@
          this.checkedAll = false
          this.sqlname = 'ByOrgChecker'
          console.log('查询结束')
-         this.model.url = 'rs/sql/根据安检员查询用户档案'
+         this.model.url = 'api/af-safecheck/sql/FetchUserFileByOrgChecker'
           await this.model1.search(args.condition, args.model)
 
             for (let row of this.model1.rows){
@@ -776,7 +776,7 @@
         async getAreaList() {
           let http = new HttpResetClass()
           this.areaslist = [{label:'全部',value:''}]
-          let res = await http.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
+          let res = await http.load('POST', '/api/af-safecheck/sql/safe_singleTable_GroupBy', {
             data: {
               items: 'f_residential_area',
               tablename: 't_area',

package/src/components/createcheckplan/DelPlanRepeat.vue

@@ -107,7 +107,7 @@
   }
 
   let syncDelete = function * (self,row) {
-    yield self.$resetpost('rs/logic/deleteCheckPlanItem', {id:row.id },{
+    yield self.$resetpost('api/af-safecheck/logic/deleteCheckPlanItem', {id:row.id },{
       warnMsg: '删除数据不可恢复，确认删除吗？',
       resolveMsg: '恭喜！删除成功！',
       rejectMsg: '删除失败：'
@@ -126,7 +126,7 @@
       let moptions = []
       for(let i=1; i<=12; i++)
         moptions.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/deleteplanrepeat', 20,
+      let model = new PagedList('api/af-safecheck/sql/deleteplanrepeat', 20,
         {f_filialeid: 'this.f_filialeid', f_plan_year: 'this.c_plan_year[0]', f_plan_month: 'this.c_plan_month[0]'})
       model.c_plan_year = [year+'']
       model.c_plan_month = [moptions[new Date().getMonth()].value]
@@ -164,7 +164,7 @@
         console.log(`选择目标计划id:${this.$refs.chooser.selectedRow.id}`)
         // 执行调整业务
         let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/CheckerPlanAdjust', {
+        http.load('POST', 'api/af-safecheck/logic/CheckerPlanAdjust', {
           data: {
             f_plan_id:this.$refs.chooser.selectedRow.id,
             checkrows:this.checkrows
@@ -196,7 +196,7 @@
         }
        console.log(sqlcondition,'测试请求sql')
        let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/deleteCheckPlanRepeat', {
+        http.load('POST', 'api/af-safecheck/logic/deleteCheckPlanRepeat', {
           data: sqlcondition
         }, {resolveMsg: null, rejectMsg: null}).then((res) => {
           console.log(res.data)
@@ -230,7 +230,7 @@
         }
         console.log(sqlcondition,'测试请求sql')
         let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/SeldeleteCheckPlanRepeat', {
+        http.load('POST', 'api/af-safecheck/logic/SeldeleteCheckPlanRepeat', {
           data: sqlcondition
         }, {resolveMsg: null, rejectMsg: null}).then((res) => {
           console.log(res.data)

package/src/components/createcheckplan/PlanList.vue

@@ -69,14 +69,14 @@
                         v-model="model.f_plan_month" condition="f_plan_month='{}'"></v-select>
             </div>
             <div :class="{'col-sm-8':$parent.$parent.$parent.showItem,'col-sm-6':!$parent.$parent.$parent.showItem}">
-              <role-selector-safe
+              <role-selector
                       role-name="安检员"
                       role-lable="安&nbsp;检&nbsp;员&nbsp;"
                       @re-res="$parent.$parent.getRes"
                       :value.sync="model.f_checker_id"
                       v-model="model.f_checker_id"
                       condition="f_checker = '{}'">
-              </role-selector-safe>
+              </role-selector>
             </div>
           </div>
         </div>
@@ -207,7 +207,7 @@
     import * as Util from '../Util'
 
     let syncDelete = function* (self, row) {
-        yield self.$resetpost('rs/logic/deleteCheckPlan', row, {
+        yield self.$resetpost('api/af-safecheck/logic/deleteCheckPlan', row, {
             warnMsg: '删除数据不可恢复，确认删除吗？',
             resolveMsg: '恭喜！删除成功！',
             rejectMsg: '删除失败：'
@@ -220,7 +220,7 @@
         self.NowSelected.f_issued = '是'
         self.NowSelected.f_issue_time = self.$login.toStandardTimeString()
         self.NowSelected.f_send_operator = self.$login.f.name
-        yield self.$resetpost('rs/logic/BespeakCheckPlan', {data: self.NowSelected}, {
+        yield self.$resetpost('api/af-safecheck/logic/BespeakCheckPlan', {data: self.NowSelected}, {
             resolveMsg: '下发计划成功！',
             rejectMsg: '下发计划失败！'
         }).then((respanse) => {
@@ -270,7 +270,7 @@
             let moptions = []
             for (let i = 1; i <= 12; i++)
                 moptions.push({label: i + '', value: i + ''})
-            let model = new PagedList('rs/sql/预约计划下发', 20, {
+            let model = new PagedList('api/af-safecheck/sql/预约计划下发', 20, {
                 items: '"*"',
                 groupitem: '""',
                 orderitem: '"f_plan_month"',
@@ -378,7 +378,7 @@
             distribute() {
                 this.NowSelected = this.$refs.paged.$refs.grid.selected
                 let http = new HttpResetClass()
-                http.load('POST', 'rs/sql/singleTable', {
+                http.load('POST', 'api/af-safecheck/sql/singleTable', {
                     data: {
                         tablename: 't_check_plan_item',
                         condition: `f_plan_id = '${this.NowSelected.id}'`

package/src/components/createcheckplan/PlanUersList.vue

@@ -7,9 +7,9 @@
 <!--          <label class="font_normal_blue-1">安检计划下发项明细</label>-->
           <ul class="nav nav-tabs">
             <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">安检计划下发项明细</a></li>
-            <export-excel-safe   :data="$parent.$parent.searchData"
+            <export-excel   :data="$parent.$parent.searchData"
                             :field="$parent.$parent.excelHeaders"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="planItem" template-name='安检计划明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="planItem" template-name='安检计划明细'></export-excel>
           </ul>
         </div>
       </criteria>
@@ -64,7 +64,7 @@
 
     // let fetchItems = function * (self) {
     //   let f_plan_id = "f_plan_id='" + self.item.id + "'"
-    //   let plan = yield self.$resetpost('rs/sql/预约计划下发详情',
+    //   let plan = yield self.$resetpost('api/af-safecheck/sql/预约计划下发详情',
     //     { data: {items: '*', tablename: 't_check_plan_item', condition: f_plan_id, groupitem: '', orderitem: 'f_userinfoid'} },
     //     { resolveMsg: null, rejectMsg: null })
     //   self.model.rows = plan.data
@@ -74,7 +74,7 @@
         title: '项目编写',
         data() {
             return {
-                model: new PagedList('rs/sql/planItem', 20),
+                model: new PagedList('api/af-safecheck/sql/planItem', 20),
                 // model: {
                 //   rows: []
                 // },

package/src/components/defect/DefectDetail.vue

@@ -40,7 +40,7 @@
                         </v-select>
                     </div>
                     <div class="col-sm-4">
-                        <role-selector-safe
+                        <role-selector
                                 :left-width="'55%'"
                                 :right-width="'55%'"
                                 role-name="安检员"
@@ -49,7 +49,7 @@
                                 :value.sync="model.f_checker_id"
                                 v-model="model.f_checker_id"
                                 condition="c.f_checker = '{}'">
-                        </role-selector-safe>
+                        </role-selector>
                     </div>
                     <div class="col-sm-2 ">
                         <div class="button_spacing" style="float: right; margin-top: 8px;"
@@ -103,7 +103,7 @@
       let year = (new Date()).getFullYear()
       for (let i = year - 8; i <= year + 1; i++)
         options.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/planCount', 20, {
+      let model = new PagedList('api/af-safecheck/sql/planCount', 20, {
         f_plan_year: 'this.f_plan_year[0]',
         f_checker: 'this.chosenOrg.name',
         f_filialeids: 'this.f_filialeids '

package/src/components/defect/DefectList.vue

@@ -12,9 +12,9 @@
         <data-grid :model="model" partial='list' class="table_sy">
           <template partial='head'>
             <tr>
-<!--              <th>-->
-<!--                <nobr>隐患设备</nobr>-->
-<!--              </th>-->
+              <th>
+                <nobr>隐患设备</nobr>
+              </th>
               <th>
                 <nobr>隐患项</nobr>
               </th>
@@ -30,9 +30,9 @@
             </tr>
           </template>
           <template partial='body'>
-<!--            <td style="text-align: center">-->
-<!--              <nobr>{{row.f_device_type}}</nobr>-->
-<!--            </td>-->
+            <td style="text-align: center">
+              <nobr>{{row.f_device_type}}</nobr>
+            </td>
             <td style="text-align: center">
               <nobr>{{row.f_item_name}}</nobr>
             </td>
@@ -40,22 +40,26 @@
               <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)" v-if="!row.f_item_name.includes('差值')">隐患图片</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 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>
+          <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">
@@ -98,9 +102,9 @@
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-8 form-group">
-              <label class="font_normal_body" >备&emsp;&emsp;注</label>
-              <input class="input_search" style="width: 60%" type="text" v-model="toRepairModal.preData.f_remarks" placeholder="备注">
+            <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>
@@ -108,7 +112,9 @@
           </div>
         </validator>
       </div>
-    </div>
+    </div>-->
+
+
     <modal :show.sync="showSolveModal" v-ref:solveModal>
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
@@ -153,20 +159,25 @@
               :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>
@@ -179,12 +190,12 @@
   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', {})
         }
       })
   }
@@ -201,9 +212,6 @@
       uploadData.model.f_outlets = preData.f_outlets
     } else if (preData.dispatchType == '派发给维修员') {
       uploadData.model.serviceacitivity[0].f_reciever = preData.f_repairman
-      // 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.f_meetunit = self.$login.f.deps
       uploadData.model.f_orgid = self.$login.f.orgid
       uploadData.model.f_filiale = self.$login.f.org
@@ -211,7 +219,7 @@
       uploadData.model.f_filiale_id = self.$login.f.orgid
       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/GetUserForRepaire', {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
@@ -221,11 +229,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
@@ -236,7 +252,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 => {
@@ -255,6 +271,7 @@
           details: [{
             f_project: `${row.f_item_name}:${row.f_item_value}`,
             type: 'selector',
+            f_defect_id:row.id,
             options: safecheckOptions
           }]
         }
@@ -263,6 +280,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
         })
@@ -271,10 +289,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 != '无隐患'`, {})
@@ -286,7 +304,7 @@
     title: '隐患项列表',
     data() {
       return {
-        model: new PagedList('rs/sql/GetDefectByPaperId', 100, {
+        model: new PagedList('api/af-safecheck/sql/GetDefectByPaperId', 100, {
           f_paper_id: 'this.f_paper_id'
         }),
         showSolveModal: false,
@@ -309,6 +327,7 @@
             filename: ''
           }
         },
+        defectImg:[],
         toRepairModal: {
           preData: {
             dispatchTypeOptions: [{label: '派发给站点', value: '派发给站点'}, {label: '派发给维修员', value: '派发给维修员'}],
@@ -372,12 +391,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
@@ -403,6 +450,7 @@
       cancel() {
         this.showSolveModal = false
         this.showToRepairModal = false
+        this.showDefectModal = false
       },
       toRepair() {
         this.showToRepairModal = !this.showToRepairModal
@@ -413,6 +461,7 @@
         if(obj.resids[0]){
           this.toRepairModal.preData.f_meetunit = obj.res.join('.')
           this.toRepairModal.preData.f_reciever = obj.resids.join('.')
+          this.toRepairModal.preData.f_outlets = obj.res[obj.res.length - 1]
         }else {
           this.toRepairModal.preData.f_meetunit = ''
           this.toRepairModal.preData.f_reciever = ''
@@ -421,16 +470,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 +503,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/defect/DefectMain.vue

@@ -1,14 +1,16 @@
 <template>
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
-            <div  :class="{'basic-main':!showItem,'binary-left':showItem}"  >
-                       <defect-paper @select-changed="selected" :style="style" :style2="style2" v-ref:check></defect-paper>
-            </div>
-                <div  class="binary-right" v-show="showItem">
-                  <div class="flex">
+    <div class="flex">
+        <section>
+            <div class="row"  style="height: 100%" :class="{'basic-main':!showItem,'binary':showItem}">
+                <div :class="{'binary-left':showItem}" >
+                    <defect-paper @select-changed="selected" v-ref:check></defect-paper>
+                </div>
+                <div style="width: 45%" :class="{'binary-right':showItem}" v-show="showItem">
                     <defect-list v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
                                  v-ref:detail></defect-list>
                 </div>
             </div>
+        </section>
     </div>
 </template>
 
@@ -22,9 +24,7 @@
     components: {DefectPaper, DefectDetail},
     data() {
       return {
-        showItem: false,
-        style:'col-sm-2 form-group',
-        style2:'col-sm-4 form-group'
+        showItem: false
       }
     },
     methods: {
@@ -33,17 +33,7 @@
       }
     },
     watch:{
-      'showItem'(val){
-        console.log("777777777")
-        console.log(val)
-        if (val){
-          this.style='col-sm-3 form-group'
-          this.style2='col-sm-6 form-group'
-        }else{
-          this.style='col-sm-2 form-group'
-          this.style2='col-sm-4 form-group'
-        }
-      }
+
     }
   }
 </script>