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

2 years ago · 80cd366916
4 changed files with 177 additions and 124 deletions
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@ -35,7 +35,7 @@
          <el-input
            v-if="column.type == 2"
            v-model="column.values"
-            clearable
+            :clearable="true"
            size="10"
            :placeholder="`请输入${column.label}`"
            @change="inputchange($event,column)"
--- a/src/views/distribution/reservation/atlas.vue
+++ b/src/views/distribution/reservation/atlas.vue
@ -1,134 +1,170 @@
 <template>
+  <div class="bmap" id="container" style="float: left"></div>
+  <div
+    style="
+      border: 1px solid pink;
+      margin-left: 5px;
+      height: 600px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    "
+  >
+    <!--            @change="handleCheckedCitiesChange"-->
+    <el-checkbox-group v-model="reservationIds">
+      <el-col v-for="(item, index) in reservationData">
+        <el-checkbox :label="item.id" :key="item.id"
+          >{{ item.consignee }}&emsp;{{ item.deliveryAddress }}&emsp;{{
+            item.deliveryPhone
+          }}</el-checkbox
+        >
+      </el-col>
+    </el-checkbox-group>
+  </div>

-        <div class="bmap" id="container" style="float: left">
-
-        </div>
-        <div style="border:1px solid pink ;margin-left: 5px;height: 600px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)" >
-<!--            @change="handleCheckedCitiesChange"-->
-            <el-checkbox-group v-model="reservationIds" >
-                    <el-col  v-for="(item,index) in reservationData">
-                        <el-checkbox   :label="item.id" :key="item.id">{{item.consignee}}&emsp;{{item.deliveryAddress}}&emsp;{{item.deliveryPhone}}</el-checkbox>
-                    </el-col>
-            </el-checkbox-group>
-        </div>
-
-    <div style="margin-left: 40%;margin-top: 5%;float: bottom">
-        <el-button type="primary" icon="el-icon-circle-close"  @click="aaa">确认(转配送页面)</el-button>
-        <el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
-    </div>
+  <div style="margin-left: 40%; margin-top: 5%; float: bottom">
+    <el-button type="primary" icon="el-icon-circle-close" @click="checkgoto"
+      >确认(转配送页面)</el-button
+    >
+    <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
+  </div>
 </template>

 <script>
-  import { useStore } from 'vuex'
-  import { getReservationAddr } from '@/api/distribution/distributionReservation';
-  import { getDictionaryBiz } from '@/api/system/dict';
-  // import { ref } from 'vue'
-  export default {
-    data () {
-      return {
-        name: 'BmapDemo',
-        loading: true,
-        ids: null,
-        error: null,
-        addressList:[],
-        reservationData:[],
-        reservationIds:[],
-        setup() {
-          // const store = useStore()
-          // let latitude = ref('')
-          // let longitude = ref('')
-          // console.log(store.state.record.latitude)
-          // latitude.value = store.state.record.latitude
-          // longitude.value = store.state.record.longitude
-          // return {
-          //   latitude,
-          //   longitude
-          // }
-        }
-      }
-    },
-    created() {
-      this.$watch(
-        () => this.$route.params,
-        () => {
-        this.fetchData();
-        },
-        // 组件创建完后获取数据，
-        // 此时 data 已经被 observed 了
-        { immediate: true }
-      )
-      //根据预约信息查询预约列表地址
-      this.initMap(this.ids);
-
-    },
-    methods:{
-      fetchData() {
-        this.error = this.post = null
-        this.loading = true
-        if (this.$route.query.id){
-          this.ids= this.$route.query.id;
-        }
-      },
-      initMap(ids){
-        if (ids.length>1){
-          ids.split(",")
-        }
-        this.loading = true;
-        getReservationAddr(ids).then(res=>{
-          res.data.data.forEach(item=>{
-            this.ids.split(",").forEach(id=>{
-              if (item.id==id){
-                this.reservationIds.push(item.id)
-              }
-            })
-          })
-          console.log(this.reservationIds);
-          this.reservationData = res.data.data;
-
-          this.addressList=res.data.data;
-        })
-        this.loading = false;
+import { useStore } from 'vuex';
+import { getReservationAddr } from '@/api/distribution/distributionReservation';
+import { getDictionaryBiz } from '@/api/system/dict';
+import { onMounted, reactive, toRefs, watchEffect } from 'vue';
+import { useRouter } from 'vue-router';
+// import { ref } from 'vue'
+export default {
+  setup() {
+    let router = useRouter();
+    let details = reactive({
+      name: 'BmapDemo',
+      loading: true,
+      ids: null,
+      error: null,
+      addressList: [],
+      reservationData: [],
+      reservationIds: [],
+      mapLoc: null,
+    });
+    onMounted(() => {
+      console.log(router);
+      details.ids = router.currentRoute.value.query.id;
+      initMap(router.currentRoute.value.query.id);
+      setTimeout(() => {
+        init();
+      }, 1500);
+      // setTimeout(()=>{
+      //   details.mapLoc.clearOverlays();

-      },
-      aaa(){
-        console.log(">>>>>>>>>>>",this.reservationIds);
-        let ids = this.reservationIds.join(",")
-        this.$router.push({
-          path: '/distribution/deliveryInfo/deliveryInfo',
-          query: {
-            id: ids
+      // },9500)
+    });
+    watchEffect(() => {
+      console.log(details.reservationIds);
+      if(details.mapLoc){
+        details.mapLoc.clearOverlays();
+      }
+      // details.mapLoc.clearOverlays();
+      // details.mapLoc.clearLabels()
+      details.reservationIds.map((item,index) => {
+        details.reservationData.map(ite => {
+          if (item == ite.id) {
+            console.log(ite)
+            maplabel(ite,index)
          }
        });
-      },
-
-    },
-    mounted() {
-
-      let map = new BMapGL.Map("container");          // 创建地图实例
-      let point = new BMapGL.Point(116.404, 39.915);  // 创建点坐标
-      map.centerAndZoom(point, 15);
-      let content = "label";
-      let label = new BMapGL.Label(content, {       // 创建文本标注
-        position: point,                          // 设置标注的地理位置
-        offset: new BMapGL.Size(10, 20)           // 设置标注的偏移量
-      })
-      map.addOverlay(label);
-      map.addOverlay(label);                        // 将标注添加到地图中
-      label.setStyle({                              // 设置label的样式
-        color: '#000',
-        fontSize: '30px',
-        border: '2px solid #1E90FF'
-      })
-    },
+      });
+      // details.reservationData
+    });
+    function init() {
+      details.mapLoc = new BMapGL.Map('container'); // 创建地图实例
+      let point = new BMapGL.Point(116.404, 39.915); // 创建点坐标
+      details.mapLoc.centerAndZoom(point, 12);
+      details.mapLoc.enableScrollWheelZoom(true);
+      // maplabel()
+    }
+    function maplabel(item,index) {
+      let myGeo = new BMapGL.Geocoder();
+      myGeo.getPoint(item.deliveryAddress, function (point) {
+        if (point) {
+          console.log(point,'---------------');
+          if(index==0){
+            details.mapLoc.centerAndZoom(point, 12);
+          }
+          let content = item.consignee;
+          let label = new BMapGL.Label(content, {
+            // 创建文本标注
+            position:point,
+            offset: new BMapGL.Size(10, 20),
+          });
+          details.mapLoc.addOverlay(label); // 将标注添加到地图中
+          label.setStyle({
+            // 设置label的样式
+            color: '#000',
+            fontSize: '10px',
+            border: '1px solid #1E90FF',
+            borderRadius:'20px',
+            padding:'5px 10px'
+          });
+          console.log(label,'---------------');
+        } else {
+          // alert('您选择的地址没有解析到结果！');
+          console.log(point);
+          console.log('您选择的地址没有解析到结果！');
+        }
+      });
+      
+    }
+    // init()
+    function initMap(ids) {
+      if (ids.length > 1) {
+        ids.split(',');
+      }
+      details.loading = true;
+      getReservationAddr(ids).then(res => {
+        res.data.data.forEach(item => {
+          details.ids.split(',').forEach(id => {
+            if (item.id == id) {
+              details.reservationIds.push(item.id);
+            }
+          });
+        });
+        console.log(details.reservationIds);
+        details.reservationData = res.data.data;

-  }
+        details.addressList = res.data.data;
+      });
+      details.loading = false;
+    }
+    function checkgoto() {
+      console.log('>>>>>>>>>>>', details.reservationIds);
+      let ids = details.reservationIds.join(',');
+      router.push({
+        path: '/distribution/deliveryInfo/deliveryInfo',
+        query: {
+          id: ids,
+        },
+      });
+    }
+    function back() {
+      router.back(-1);
+    }
+    return {
+      back,
+      checkgoto,
+      init,
+      initMap,
+      ...toRefs(details),
+    };
+  },
+};
 </script>

 <style scoped>
-    .bmap {
-        width: 800px;
-        height: 600px;
-        border: 1px solid pink;
-    }
+.bmap {
+  width: 800px;
+  height: 600px;
+  border: 1px solid pink;
+}
 </style>
-
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@ -7,7 +7,7 @@
          <el-form-item label="时间">
            <!--            <el-input v-model="query.warehousingTime" placeholder="请输入时间"></el-input>-->
            <el-date-picker
-              v-model="query.warehousingTime"
+              v-model="query.createTime"
              type="date"
              placeholder="请输入时间"
              format="YYYY-MM-DD"
--- a/vite.config.js
+++ b/vite.config.js
@ -12,7 +12,7 @@ export default ({ mode, command }) => {
      port: 2888,
      proxy: {
        '/api': {
-          target: 'http://192.168.2.29:13000',
+          target: 'http://192.168.2.11:8889',
          //target: 'http://test3.javablade.com',
          changeOrigin: true,
          rewrite: path => path.replace(/^\/api/, ''),
@ -29,5 +29,22 @@ export default ({ mode, command }) => {
      },
    },
    plugins: createVitePlugins(env, command === 'build'),
+    build: {
+      chunkSizeWarningLimit: 1000,
+      rollupOptions: {
+        output: {
+          // 分包
+          manualChunks(id) {
+            if (id.includes("node_modules")) {
+              return id
+                .toString()
+                .split("node_modules/")[1]
+                .split("/")[0]
+                .toString();
+            }
+          },
+        },
+      },
+    }
  });
 };