坏图标替换等

src/api/fwbzdz/fwbzdz.js

@@ -122,4 +122,21 @@ export const saveFwAndFz = (form) => {
     method: 'post',
     data: form
   })
-}
+}
+
+export const saveRy = (form) => {
+  return request({
+    url: '/api/bzdz/api/saveRy',
+    method: 'post',
+    data: form
+  })
+}
+
+
+export const putfile = (row) => {
+  return request({
+    url: '/api/blade-resource/oss/endpoint/put-file',
+    method: 'post',
+    data:row
+  })
+}

src/views/ybss/fwbzdz/components/AddSyfw.vue

@@ -88,7 +88,7 @@
             <el-input type="textarea" :rows="3" v-model="formData.bz"></el-input>
         </div>
         <div class="footer">
-            <button class="btn_nomal">取消</button>
+            <button class="btn_nomal" @click="cancel">取消</button>
             <button class="btn_primary" @click="save">确定</button>
         </div>
         <fwtd ref="fwtd" :options="options" @getfwtd="getfwtd"></fwtd>
@@ -141,17 +141,14 @@ export default {
         },
     },
     mounted() {
-
-        this.saveFwAndFz = true
-        this.fwtdLoading = true
+        this.fwloading = true
         dictionaryList().then(res => {
             const data = res.data.data
             console.log('dictionaryList', data)
             this.options = data
             this.gjOp = data.gjdq
         }).finally(() => {
-            this.saveFwAndFz = false
-            this.fwtdLoading = false
+            this.fwloading = false
         })
     },
     methods: {
@@ -166,6 +163,9 @@ export default {
             this.formData.fwyt = val.fwyt.value
             this.formData.syyt = val.syyt.value
         },
+        cancel(){
+            this.$emit('closeDialog')
+        },
         save() {
             this.formData.dzbm = this.query.dzbm
             this.saveFwAndFz = true
@@ -173,6 +173,7 @@ export default {
                 console.log('saveFwAndFz', res)
             }).finally(() => {
                 this.saveFwAndFz = false
+                this.$emit('closeDialog')
             })
         }
     }
@@ -181,7 +182,15 @@ export default {
 <style lang="scss" scoped>
 @import '@/styles/newcrue.scss';
 @import '@/styles/public/button-style.scss';
-
+.filebox{
+  opacity: 0;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
 .item_head {
     display: flex;
     justify-content: space-between;
@@ -258,4 +267,4 @@ export default {
         margin-right: 24px;
     }
 }
-</style>
+</style>

src/views/ybss/fwbzdz/components/GridGroup.vue

@@ -12,12 +12,12 @@
                     <div style="display: flex;margin-top: 8px;">
                         <img :src="icon_house_color_16" alt="" v-if="lcnpmh.times != 0">
                         <img :src="icon_house_gray_16" alt="" v-else>
-                        <div :class="{ has_data: lcnpmh.times != 0 ? true : false }">实有房屋</div>
+                        <div :class="{ has_data: lcnpmh.times != 0 ? true : false }" style="margin-left: 5px">实有房屋</div>
                     </div>
                     <div style="display: flex;margin-top: 8px;">
                         <img :src="icon_unit_color_16" alt="" v-if="lcnpmh.sydwNum != 0">
                         <img :src="icon_unit_gray_16" alt="" v-else>
-                        <div :class="{ has_data: lcnpmh.sydwNum != 0 ? true : false }">实有单位</div>
+                        <div :class="{ has_data: lcnpmh.sydwNum != 0 ? true : false }" style="margin-left: 5px">实有单位</div>
                     </div>
                     <div style="margin-top: 8px;" :class="{ has_data: lcnpmh.personNum != 0 ? true : false }">已采集 {{
                         lcnpmh.personNum }} 人</div>
@@ -101,7 +101,7 @@ export default {
 <style lang="scss" scoped>
 .grid_body {
     display: flex;
-
+    margin-top: 1em;
     .lch {
         width: 32px;
         height: 104px;
@@ -158,4 +158,4 @@ export default {
         }
     }
 }
-</style>
+</style>

src/views/ybss/fwbzdz/components/fwtd.vue

@@ -70,13 +70,14 @@ export default {
             this.dialogVisible = false
         },
         dialogSave() {
-            this.$emit('getfwtd', {
-                fwlb: this.getLabel('fwlb', this.fwlb),
-                fwxz: this.getLabel('fwxz', this.fwxz),
-                fwyt: this.getLabel('fwyt', this.fwyt),
-                syyt: this.getLabel('syyt', this.syyt)
-            })
-            this.dialogVisible = false
+          this.$emit('getfwtd', {
+            fwlb: this.getLabel('fwlb', this.fwlb),
+            fwxz: this.getLabel('fwxz', this.fwxz),
+            fwyt: this.getLabel('fwyt', this.fwyt),
+            syyt: this.getLabel('syyt', this.syyt)
+          })
+          this.dialogVisible = false
+
         },
         getLabel(str, val) {
             let value
@@ -133,4 +134,4 @@ export default {
         border-radius: 8px;
     }
 }
-</style>
+</style>

src/views/ybss/fwbzdz/fwbzdz.vue

@@ -19,7 +19,7 @@
         </div>
         <div class="dz_param" :class="{ dz_param_selected: dzType == 'sydw' ? true : false }"
           @click="changeDzParam('sydw')">
-          <img :src="icon_unit_color_16" alt="" style="margin-right: 8px;" v-if="dzType == 'sydw'">
+          <img :src="icon_unit_color_16" alt="" style="margin-right: 8px;width: 16px" v-if="dzType == 'sydw'">
           <img :src="icon_unit_gray_16" alt="" style="margin-right: 8px;" v-else>
           <div>实有单位</div>
           <img :src="icon_choose_right_24" alt="" class="icon_choose_right" v-if="dzType == 'sydw'">
@@ -69,7 +69,7 @@ export default {
       },
       dzType: '',
       icon_house_color_16: require('@/img/fwbzdz/icon_house_color_16.svg'),   // 彩色房屋
-      icon_unit_color_16: require('@/img/fwbzdz/icon_unit_color_16.svg'),     // 彩色单位
+      icon_unit_color_16: require('@/img/fwbzdz/icon_unit_color_16@2x.png'),     // 彩色单位
       icon_house_gray_16: require('@/img/fwbzdz/icon_house_gray_16.svg'),     // 灰色房屋
       icon_unit_gray_16: require('@/img/fwbzdz/icon_unit_gray_16.svg'),       // 灰色单位
       ldphxlh: '',
@@ -184,6 +184,7 @@ export default {
     align-items: center;
     cursor: pointer;
     position: relative;
+    box-sizing: border-box;
   }
 
   .dz_param_selected {
@@ -259,4 +260,4 @@ export default {
     color: rgba(4, 8, 20, 1);
   }
 }
-</style>
+</style>