Merge remote-tracking branch 'origin/dev' into dev

src/components/AiOpenData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :type="type" :openid="oid" v-text="oid"/>
+  <div :type="type" :openid="oid"/>
 </template>
 
 <script>

src/components/pages/selectGird.vue

@@ -11,13 +11,24 @@
       <div class="showTypes">
         <div v-if="options.length > 0">
           <div class="cards" v-for="(item, index) in options" :key="index" @click="itemClick(item)">
-            <div class="imges">
+            <div class="imges" v-if="!isDisabledOneGird">
               <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
                    @click.stop="girdClick(item, index)"/>
               <img src="./img/xz.png" alt="" class="imgselect" v-else
                    @click.stop="girdClick(item, index)"/>
               <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
             </div>
+            <div class="imges" v-if="isDisabledOneGird">
+              <div v-if="item.girdLevel != 0">
+                <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+                <img src="./img/xz.png" alt="" class="imgselect" v-else
+                    @click.stop="girdClick(item, index)"/>
+              </div>
+              <span v-else class="imgselect"></span>
+              <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
+            </div>
+
             <div class="rightes">
               <div class="applicationNames fill">{{ item.girdName }}</div>
               <u-icon v-if="item.girdLevel != 2" name="arrow-right" color="#ddd"/>
@@ -53,6 +64,7 @@ export default {
       girdLevel: 0,
       parentGirdId: '',
       isMyGird: false, //是否只查询当前户对应的网格员管理的三级网格
+      isDisabledOneGird: false, //是否可以选择一级网格 true不可选
     }
   },
   computed: {
@@ -68,6 +80,10 @@ export default {
     if (params.isMyGird) {
       this.isMyGird = params.isMyGird
     }
+
+    if(params.isDisabledOneGird) {
+      this.isDisabledOneGird = params.isDisabledOneGird
+    }
     this.isGirdUser()
     
   },