2020-6-3

discern/src/assets/scss/addData.scss

@@ -144,3 +144,11 @@
 .nav-hide {
   position: static !important;
 }
+
+//上传样式
+.addData_box .el-upload--picture-card:hover, .el-upload:focus {
+  margin: 0;
+}
+.addData_box .el-dialog {
+  width: 100%;
+}

discern/src/assets/scss/fieldsShow.scss

@@ -85,7 +85,7 @@
   background: rgb(238, 98, 98);
   font-size: 20px;
   color: #fff;
-  margin-top: .5rem;
+  margin: .5rem 0 2rem 0;
 }
 
 //发布
@@ -120,4 +120,9 @@
 // 按钮顶上去
 .nav-hide {
   position: static !important;
+}
+
+// 上传样式
+.fieldsShow_box .el-upload--picture-card:hover, .el-upload:focus {
+  margin: 0;
 }

discern/src/components/addData/addData.vue

@@ -63,6 +63,7 @@
       <!-- 上传图片 -->
       <div class="uploading_box" v-loading="loading">
         <el-upload
+          ref="upload"
           action="/send_answer_img"
           list-type="picture-card"
           :on-preview="handlePictureCardPreview"
@@ -194,13 +195,12 @@ export default {
 
     //上传图片-删除
     handleRemove() {
-      let postData = this.$qs.parse({
-        pic_list: localStorage.getItem("add"),
-        ret: this.radio
-      });
-
       //判断是识别失败进来的还是直接点击的手动输入
       if (localStorage.getItem("memoryCompileID") !== null) {
+        let postData = this.$qs.parse({
+          img_list: localStorage.getItem("add"),
+          ret: this.radio
+        });
         //识别失败
         return this.$confirm("确定要删除图片吗", "提示", {
           confirmButtonText: "确定",
@@ -221,6 +221,8 @@ export default {
                     type: "success",
                     duration: 1500
                   });
+                  this.$refs.upload.clearFiles();
+                  localStorage.removeItem("add");
                 } else if (res.data === 1) {
                   this.$notify.error({
                     title: "错误",
@@ -237,6 +239,10 @@ export default {
             throw new Error("取消成功！");
           });
       } else {
+        let postData = this.$qs.parse({
+          pic_list: localStorage.getItem("add"),
+          ret: this.radio
+        });
         //手动输入
         return this.$confirm("确定要删除图片吗", "提示", {
           confirmButtonText: "确定",
@@ -257,6 +263,8 @@ export default {
                     type: "success",
                     duration: 1500
                   });
+                  this.$refs.upload.clearFiles();
+                  localStorage.removeItem("add");
                 } else if (res.data === 1) {
                   this.$notify.error({
                     title: "错误",

discern/src/components/fieldsShow/fieldsShow.vue

@@ -513,7 +513,11 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
+    var _this = this
     this.get_boderHeight();
+    setTimeout(function() {
+      _this.loading = false;
+    }, 1500);
 
     // window.onresize监听页面高度的变化
     window.onresize = () => {

discern/src/components/home/home.vue

@@ -1941,6 +1941,11 @@ export default {
 
     this.pandui(); //先判断天气插件是否需要更新
 
+    //判断当前是否有commandLeiWen数据
+    if (localStorage.getItem('commandLeiWen')) {
+      localStorage.setItem('commandLeiWen', '0')
+    }
+
     // 【注意2:】
     // 轮播图 · 初始化设定
     var swiper = new Swiper(".swiper-container", {

discern/src/components/mapShow/mapShow.vue

@@ -37,7 +37,7 @@
             <bm-marker
               class="dian"
               :icon="{url: marker.url, size: { width: 30, height: 40 }}"
-              :dragging="true"
+              :dragging="false"
               animation="BMAP_ANIMATION_BOUNCE"
               :position="{lng: marker.lng, lat: marker.lat}"
               @click="infoWindowOpen(marker, i)"
@@ -55,7 +55,7 @@
                 :labelStyle="{color: 'DarkSeaGreen', fontSize : '22px', border: 0}"
                 :offset="{width: -35, height: 30}"
                 :show="marker.showFlag"
-              />-->
+              /> -->
             </bm-marker>
           </div>
         </bml-marker-clusterer>
@@ -80,7 +80,8 @@
 import { BmlMarkerClusterer } from "vue-baidu-map";
 // 引入marker
 import BmMarker from "vue-baidu-map/components/overlays/Marker";
-import { BmGeolocation, BmNavigation, BmMapType } from "vue-baidu-map";
+// import { BmGeolocation, BmNavigation, BmMapType } from "vue-baidu-map";
+import { BmGeolocation, BmNavigation } from "vue-baidu-map";
 import bottomNav from "../bottomNav/bottomNav"; //底部导航栏
 
 const markers = [];
@@ -100,7 +101,7 @@ export default {
     BmMarker,
     bottomNav,
     BmNavigation,
-    BmMapType,
+    // BmMapType,
   },
   data() {
     //这里存放数据

discern/src/components/questions/questions.vue

@@ -770,7 +770,11 @@ export default {
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    this.get_boderHeight();
+    var _this = this
+    _this.get_boderHeight();
+    setTimeout(function() {
+      _this.loading = false;
+    }, 1500);
 
     // window.onresize监听页面高度的变化
     window.onresize = () => {