Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

 Conflicts:

	src/views/authentic/Pdf.vue

src/views/authentic/Pdf.vue

@@ -45,7 +45,7 @@
               </tr>
             </table>
             <div class="a4_sub_title">地块四至图</div>
-            <el-image :key="imgUrl" v-show="imgUrl" class="img-content img" style="z-index: 999" width="595" height="500" :src="imgUrl" />
+            <img :key="imgUrl" v-show="imgUrl" class="img-content img" style="z-index: 999" width="595" height="500" :src="imgUrl" />
             <div :key="imgUrl" v-show="!imgUrl" class="img-content" ref="mapRef" id="mapRefId"></div>
             <div class="signature">签名:______________</div>
           </div>
@@ -128,8 +128,10 @@ const closeDialog = (key) => {
 };
 function toImg(show) {
   let canvas = pdfMap.kmap.map.getViewport().querySelector('canvas')
-  let dataURL = canvas.toDataURL('image/webp',0.8);
-  imgUrl.value = dataURL;
+  let dataURL = canvas.toDataURL('image/png');
+  // if(show){
+    imgUrl.value = dataURL;
+  // }
 }
 
 
@@ -141,7 +143,7 @@ onMounted(()=>{
     pdfMap.initMap(data,mapRef.value)
     setTimeout(function(){
       toImg(false)
-    },1500)
+    },1000)
   })
 })
 </script>
@@ -276,10 +278,6 @@ $body-height:calc(100% - $title-height);
           .ol-layer{
             width:595px !important;
             height: 500px !important;
-            canvas{
-              width:595px !important;
-              height: 500px !important;
-            }
           }
         }
       }
@@ -298,5 +296,9 @@ $body-height:calc(100% - $title-height);
 
 
 }
+canvas{
+  width:595px;
+  height: 500px;
+}
 
 </style>

src/views/authentic/index.vue

@@ -11,6 +11,7 @@
         v-model="locationVal"
         filterable
         remote
+        :disabled="!disabledForm&&isEdit"
         effect="dark"
         reserve-keyword
         placeholder="搜索地区"
@@ -35,11 +36,11 @@
         </el-option>
       </el-select>
       <div class="search">
-        <div class="add btn" @click="handleAdd">
+        <div class="add btn" :class="{'disabled-button':!disabledForm&&isEdit}" @click="handleAdd">
           <el-icon><Plus /></el-icon>
           <span>创建</span>
         </div>
-        <div class="upload btn" @click="handleExport">
+        <div class="upload btn" :class="{'disabled-button':!disabledForm&&isEdit}" @click="handleExport">
           <img class="icon" src="@/assets/images/common/back-icon.png" alt="" />
           <span>导出</span>
         </div>
@@ -88,10 +89,10 @@
           />
         </el-form-item>
         <div class="button">
-          <el-button class="btn" type="primary" @click="onSearch"
+          <el-button class="btn" :class="{'disabled-button':!disabledForm&&isEdit}" type="primary" @click="onSearch"
             >查询</el-button
           >
-          <el-button class="btn reset" @click="onRest">重置</el-button>
+          <el-button class="btn reset" :class="{'disabled-button':!disabledForm&&isEdit}" @click="onRest">重置</el-button>
         </div>
       </el-form>
       <div class="box">
@@ -444,7 +445,7 @@ const onSubmit = () => {
         isUpdata.value = false;
         disabledForm.value = true;
         mapData.disabledForm = true;
-        const point = mapData.curPointData;
+        Object.assign(formInlineSearch, initForm);
         authenticMap.endDraw();
         getList().then(() => {
           isRefresh.value = false;
@@ -476,8 +477,8 @@ function updateFormInline(newData, name) {
 
 // 删除地块
 const handleDelete = () => {
-  if (!mapData.curPointData.id) return ElMessage("请选择地块");
   const id = mapData.selectPointArr.map((item) => item.values_.id);
+  if (id.length<0) return ElMessage("请选择地块");
   ElMessageBox.confirm("您确定删除该地块吗?", "提示", {
     confirmButtonText: "确认",
     cancelButtonText: "取消",