safecheck-client 4.0.0-10 → 4.0.0-101

package/src/components/NewDefectList/DefectListNew.vue

@@ -56,8 +56,8 @@
             </td>
             <td style="text-align: center">
               <div>
-<!--                <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>-->
+                <!--                <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>
               </div>
@@ -190,21 +190,21 @@
         </div>
         <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
           <label class="font_normal_body">处理后图片</label>
-         <safecheck-file-upload
-           :issearch="false"
-           :isupload="true"
-           :blodid="check.id"
-           :isdelete="true"
-           flag="safeCheck"
-           @filename="getfile"
-         ></safecheck-file-upload>
+          <safecheck-file-upload
+            :issearch="false"
+            :isupload="true"
+            :blodid="check.id"
+            :isdelete="true"
+            flag="safeCheck"
+            @filename="getfile"
+          ></safecheck-file-upload>
         </div>
         <div v-if="solveModal.preData.state == '已处理'" class="col-sm-12" style="margin-bottom: 10px">
           <p> <label class="font_normal_body">处理后图片</label></p>
           <P></P>
           <div class="col-sm-12">
             <div class="col-sm-6"  v-for="item in fileInfoData">
-<!--            <img :src="item.f_downloadURL">-->
+              <!--            <img :src="item.f_downloadURL">-->
               <img-self :width="200" :height="200" :src="item.f_downloadURL" style="margin-left: 10px"></img-self>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg">
@@ -216,9 +216,6 @@
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
               <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self>
             </div>
-            <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self>
-            </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg3">
               <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg3"  style="margin-left: 10px"></img-self>
             </div>

package/src/components/NewDefectList/DefectPaperNew.vue

@@ -65,9 +65,9 @@
                 <button style="float: right" v-if="$parent.$parent.transfer=='是'" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
                 <div style="float: right">
                   <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
-                                      :field="$parent.$parent.getfield"
-                                      progress="safeGetExportProgress"
-                                      sqlurl="api/af-safecheck/logic/exportfile" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel>
+                                  :field="$parent.$parent.getfield"
+                                  progress="safeGetExportProgress"
+                                  sqlurl="api/af-safecheck/logic/exportfile" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -151,8 +151,8 @@
                      style="width: 60%" placeholder="用户名称">
             </div>
             <div :class="$parent.$parent.style">
-                <label class="font_normal_body">小区名称：</label>
-                  <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
+              <label class="font_normal_body">小区名称：</label>
+              <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
             </div>
 
           </div>
@@ -186,26 +186,26 @@
                        style="width: 60%" placeholder="用户编号">
               </div>
 
-            <div class=" col-sm-4 form-group button-range">
-              <div class="span" style="float: right;margin-top: 8px;margin-right: 50px">
-                <div style="float: right" class="button_spacing"
-                     :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
-                     @click="$parent.$parent.hiddenr()"></div>
-                <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>
-                <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
-                <button style="float: right" v-if="$parent.$parent.transfer=='是'" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
-                <div style="float: right">
-                  <export-excel-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
-                                      :field="$parent.$parent.getfield"
-                                      progress="safeGetExportProgress"
-                                      sqlurl="api/af-safecheck/logic/exportfile" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-old>
+              <div class=" col-sm-4 form-group button-range">
+                <div class="span" style="float: right;margin-top: 8px;margin-right: 50px">
+                  <div style="float: right" class="button_spacing"
+                       :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                       @click="$parent.$parent.hiddenr()"></div>
+                  <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>
+                  <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
+                  <button style="float: right" v-if="$parent.$parent.transfer=='是'" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
+                  <div style="float: right">
+                    <export-excel-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
+                                        :field="$parent.$parent.getfield"
+                                        progress="safeGetExportProgress"
+                                        sqlurl="api/af-safecheck/logic/exportfile" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-old>
+                  </div>
                 </div>
               </div>
-            </div>
 
-          </div>
+            </div>
 
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">完成情况</label>
@@ -308,10 +308,10 @@
                      style="width: 60%" placeholder="用户名称">
             </div>
             <div :class="$parent.$parent.style">
-                <label class="font_normal_body">小区名称：</label>
-                <div class="col-xs-8" >
-                  <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
-                </div>
+              <label class="font_normal_body">小区名称：</label>
+              <div class="col-xs-8" >
+                <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
+              </div>
             </div>
           </div>
         </div>
@@ -335,7 +335,7 @@
             <th><nobr>完成数</nobr></th>
             <th><nobr>处理情况</nobr></th>
             <th><nobr>完成情况</nobr></th>
-<!--            <th><nobr>维修情况</nobr></th>-->
+            <!--            <th><nobr>维修情况</nobr></th>-->
             <th><nobr>维修员</nobr></th>
             <th><nobr>隐患明细</nobr></th>
           </tr>
@@ -357,7 +357,7 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_is_deal}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>
-<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>-->
+          <!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>-->
           <td style="text-align: center;white-space:nowrap;">{{row.f_repairman}}</td>
           <td style="text-align: center;white-space:nowrap;"><span :title="$parent.$parent.$parent.trouble(row.f_defect_content)" style="display: block;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ $parent.$parent.$parent.trouble(row.f_defect_content)}}</span></td>
         </template>
@@ -575,8 +575,8 @@ export default {
         for (const itemdata of jsonData) {
           const keys = Object.keys(itemdata)
           for (const itm of keys) {
-              const value = itemdata[itm]
-              result += itm + ':' + value
+            const value = itemdata[itm]
+            result += itm + ':' + value
           }
         }
       }
@@ -680,21 +680,21 @@ export default {
         activity:act
       }
       for(let i=0; i<this.checkes.length; i++){
-          try {
-            let result =await new HttpResetClass().load('post','/api/af-safecheck/logic/phoneUploadRectification', {
-              id:this.checkes[i],
-              repData:rep,
-              source:'pc'
-            }, {resolveMsg: null, rejectMsg: null})
-            if (result.data.code==200) {
-              successCount += result.data.successcon
-              this.progressbarWidth=Math.ceil((i+1)*100/(this.checkes.length))
-            }
-          }catch (e) {
-            this.showModal3=false
-            this.$showMessage('网络异常，请稍后再试！')
-            return
+        try {
+          let result =await new HttpResetClass().load('post','/api/af-safecheck/logic/phoneUploadRectification', {
+            id:this.checkes[i],
+            repData:rep,
+            source:'pc'
+          }, {resolveMsg: null, rejectMsg: null})
+          if (result.data.code==200) {
+            successCount += result.data.successcon
+            this.progressbarWidth=Math.ceil((i+1)*100/(this.checkes.length))
           }
+        }catch (e) {
+          this.showModal3=false
+          this.$showMessage('网络异常，请稍后再试！')
+          return
+        }
       }
       this.showModal3=false
       this.cancel1()

package/src/components/Util/ImgSelfSafePlus.vue

@@ -143,14 +143,24 @@
       },
       open() {
         this.deg = 0
-        this.powerw = 0.7
-        this.powerh = 0.8
+        this.powerw = 0.55 // Initial scale X for the image
+        this.powerh = 0.65 // Initial scale Y for the image
+
+        // Make the .full-img (black background) full size by setting its scale to 1,1
+        // It will still rotate with the image.
         $('.full-img').css({
-          'transform': 'rotate(' + this.deg + 'deg) scale(' + this.powerh + ' ,' + this.powerw + ')'
+          'transform': 'rotate(' + this.deg + 'deg) scale(1, 1)'
         })
+
+        // Apply the initial rotation and scale (this.powerw, this.powerh) to the image itself
+        this.imgState()
+
+        // This line was in the original code, related to a '.container' element.
+        // Leaving it as is, as it's not directly tied to the black box scale.
         $('.container').css({
           'opacity': '1'
         })
+
         this.show = true
       },
       close() {