Browse Source

隐患图片修i该

coys 1 năm trước cách đây
mục cha
commit
32995f79f5

+ 12 - 13
src/components/nfcPopup/alone.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="nfc-popup">
-    <van-popup v-model="visible"  v-show="!globalLoading" get-container="nfc-popup"  lock-scroll>
+    <van-popup v-model="visible" v-show="!globalLoading" get-container="nfc-popup" lock-scroll>
       <div class="nfc-panel">
         <div>
           <p class="top-text">将手机背部靠近NFC标签扫描</p>
@@ -66,7 +66,7 @@ export default {
       this.useNFC()
     },
     openCameraCallBack(data) {
-      this.globalLoading=true
+      this.globalLoading = true
       let params = {}
       try {
         let img = JSON.parse(data)
@@ -76,8 +76,8 @@ export default {
           content: img.content
         }
       } catch (e) {
-        if(data.errorCode === 1 || data.errorCode === '1'){
-          throw  new Error("ios取消相机操作")
+        if (data.errorCode === 1 || data.errorCode === '1') {
+          throw new Error('ios取消相机操作')
         }
         params = {
           extension: data.extension,
@@ -99,18 +99,17 @@ export default {
 
           this.imageList.push({ name: res.data.name, url: imgUrl(res.data.url), imgPath: res.data.url })
           this.$emit('input', this.imageList)
-          
         })
         .catch(err => {
           /*上传失败*/
-        
+
           this.visible = false
-          this.$toast.fail('上传失败111')
+          this.$toast.fail('上传失败')
           this.fileList.splice(this.fileList.length - 1, 1)
         })
     },
     openNFCScanCallBack(data) {
-      this.globalLoading=true
+      this.globalLoading = true
       let nfc = null
       try {
         nfc = JSON.parse(data)
@@ -118,17 +117,17 @@ export default {
         nfc = data
       }
       this.objNfc = nfc
-      
+
       if (this.objNfc.errorCode == 0) {
         this.$emit('changeNFC', this.objNfc.content)
-        Toast.success('扫描成功')
-        window.openNFCScanCallBack =null
+        Toast.success({ message: '扫描成功', position: 'top' })
+        window.openNFCScanCallBack = null
         this.visible = false
       } else {
-        Toast.error(this.objNfc.errorString)
+        // Toast.error({ message: this.objNfc.errorString, position: 'top' })
       }
     }
-  },
+  }
   // destroyed() {
   //   window.openCameraCallBack = null
   //   window.openNFCScanCallBack = null

+ 2 - 2
src/utils/request.js

@@ -63,8 +63,8 @@ let success = response => {
     return  Promise.reject(res.msg);
   }
   if (res.code === 500) {
-    // Toast.fail('请求错误');
-    Toast.fail(res.msg);
+    
+    Toast.fail({ message: res.msg, position: 'top' });
     return  Promise.reject(res.msg);
   }
   Toast.fail(res.msg);

+ 4 - 0
src/views/menu/monitoringCall/index.vue

@@ -295,10 +295,14 @@ export default {
         taskId: this.taskId
       }
       registration(obj).then(res => {
+        
         let { code, data, msg } = res
         if (code == 200) {
           Toast.success('扫描成功')
           this.$router.push('/consultInfo/' + this.taskId)
+        }else{
+          Toast.error({ message: msg, position: 'top' })
+
         }
       })
     },

+ 7 - 25
src/views/menu/problemItem/detail.vue

@@ -130,9 +130,12 @@
                   <div>隐患图片</div>
                 </van-col>
                 <van-col :span="16">
-                  <div class="nfc-img" v-for="(v,i) in taskInfo.images" :key="v" @click="clickImage(taskInfo.images,i)">
+                  <div class="nfc-img" v-for="(v,i) in ['/2023/12/18/20231218165501A031.png','/2023/12/18/20231218165501A031.png','/statics/2023/12/18/20231218165501A031.png','/statics/2023/12/18/20231218165501A031.png']" :key="v" @click="clickImage(taskInfo.images,i)">
                     <img :src="imgUrl(v)" alt="" >
                   </div>
+                  <!-- <div class="nfc-img" v-for="(v,i) in taskInfo.images" :key="v" @click="clickImage(taskInfo.images,i)">
+                    <img :src="imgUrl(v)" alt="" >
+                  </div> -->
                 </van-col>
               </van-row>
             </div>
@@ -499,29 +502,8 @@ export default {
   line-height: 120px;
 }
 .mainItem {
-  display: flex;
   font-size: 28px;
-  align-items: center;
-  justify-content: space-between;
-  background-color: #fff;
-  flex-wrap: wrap;
-  border-bottom: 1px solid #ccc;
-  &:last-child{
-    border-bottom:none;
-  }
-  div {
-    flex: 1;
-    text-align: left;
-  }
-  p {
-  }
-  .label {
-    width: 230px;
-    flex: none;
-  }
-  .labelPeople {
-    margin-bottom: 20px;
-  }
+  width: 100%;
 }
 .mainItemData {
   justify-content: end;
@@ -557,8 +539,8 @@ export default {
     padding-left: 10px;
     background-color: #fff;
     padding: 10px;
-
-    opacity: 0.9;
+    flex-flow: wrap;
+    // opacity: 0.9;
   }
   .tagCls {
     margin-top: 10px;

+ 25 - 34
src/views/menu/rehearsalTask/components/dialog.vue

@@ -9,38 +9,30 @@
 
       <van-row>
         <van-col span="24">
-          <van-search
-            v-model="searchVal"
-            
-            placeholder="请输入搜索关键词"
-            @input="onSearch"
-            @cancel="onCancel"
-          />
+          <van-search v-model="searchVal" placeholder="请输入搜索关键词" @input="onSearch" @cancel="onCancel" />
         </van-col>
       </van-row>
 
       <van-row class="rowclss">
         <van-col span="24">
           <van-collapse v-model="activeNames" @change="checkedHandler" accordion>
-            <van-checkbox-group v-model="result"  @change="changeCheckBox">
-            <van-collapse-item
-              :ref="item.id"
-              :name="item.id"
-              v-for="item in peopleListCpoy"
-              
-              :key="item.id"
-              :title="item.drillProjects"
+            <van-checkbox-group v-model="result" @change="changeCheckBox">
+              <van-collapse-item
+                :ref="item.id"
+                :name="item.id"
+                v-for="item in peopleListCpoy"
+                :key="item.id"
+                :title="item.drillProjects"
               >
-              <!-- :title="item.defaultCause" -->
-              <template #right-icon>
-                <van-checkbox  :name="item.id"  ref="checkboxes" class="checkboxList" />
-              </template>
-              <div class="lddq">
-                {{ item.defaultCause }}
-              </div>
-            </van-collapse-item>
-           
-             </van-checkbox-group>
+                <!-- :title="item.defaultCause" -->
+                <template #right-icon>
+                  <van-checkbox :name="item.id" ref="checkboxes" class="checkboxList" />
+                </template>
+                <div class="lddq">
+                  {{ item.defaultCause }}
+                </div>
+              </van-collapse-item>
+            </van-checkbox-group>
           </van-collapse>
         </van-col>
       </van-row>
@@ -94,7 +86,7 @@ export default {
   },
   data() {
     return {
-      activeNames:[],
+      activeNames: [],
       orgId: this.organizationId || '',
       show: false,
       value1: '',
@@ -114,8 +106,8 @@ export default {
 
   methods: {
     // 弹框关闭动画
-    closedHandler(){
-        this.searchVal=''
+    closedHandler() {
+      this.searchVal = ''
     },
     //复选框发生变化
     changeCheckBox(list) {
@@ -167,15 +159,14 @@ export default {
       // 抛出已选择人员信息
       this.$emit('checkList', list)
     },
-    checkedHandler(id){
-      
+    checkedHandler(id) {
       this.result.push(id)
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.checkboxList{
+.checkboxList {
   z-index: 999;
 }
 .van-action-sheet {
@@ -188,7 +179,7 @@ export default {
 .bottomdiv {
   width: 100%;
   bottom: 0%;
-  position: fixed;
+  position: absolute;
   margin-top: 20px;
   z-index: 2000;
 }
@@ -200,10 +191,10 @@ export default {
   height: 3px;
   background-color: #1989fa;
 }
-.rowclss{
+.rowclss {
   margin-bottom: 100px;
 }
-.lddq{
+.lddq {
   text-align: justify;
   white-space: pre-wrap;
   // text-align: left;

+ 2 - 1
src/views/menu/training/components/selectData.vue

@@ -201,7 +201,7 @@ export default {
 .bottomdiv {
   width: 100%;
   bottom: 0%;
-  position: fixed;
+  position: absolute;
   margin-top: 20px;
   z-index: 2000;
 
@@ -210,6 +210,7 @@ export default {
   margin-bottom: 100px;
 }
 .bigsheetbox {
+
   height: calc(100vh - 100px);
 }
 .van-field__control {

+ 2 - 1
vue.config.js

@@ -116,8 +116,9 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://47.92.229.224:8080",
+        // target: "http://47.92.229.224:8080",
         // target: "http://10.87.21.103:8080",
+        target: "http://10.87.21.107:8080",
         // target: "http://10.87.23.62:8080",
         // ws:true,
         changOrigin:true,