Merge branch 'main' of https://gitea.lihaink.cn/zmj/screenControl

src/view/components/areaChose.vue

@@ -56,7 +56,7 @@ const handChose = (index) => {
     getTownListsFn(options[index].value);
     sendFn('choserArea', { name: options[index].label, code: options[index].value })
     
-    emit('handArea', options[actIndex.value].label,)
+    emit('handArea', {name:options[actIndex.value].label,code:options[actIndex.value].value},)
 }
 
 const handTown = (index) => {
@@ -68,7 +68,7 @@ const handTown = (index) => {
     townLists.value.forEach(item => {
         if (item.code == townLists.value[index].code) {
             sendFn('choseTown', { name: item.name, code: item.code })
-            emit('handTown', item.name)
+            emit('handTown', {name:item.name,code:item.code})
         }
     })
 }

src/view/plantScreen/index.vue

@@ -1,28 +1,15 @@
 <template>
-    <!-- <div style="text-align: center;">伤感情</div>
-    <el-select v-model="areaCode" class="m-2" @change="changeArea" placeholder="Select" size="large">
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-    </el-select>
-    <el-select v-model="townCode" class="m-2" @change="changeTown" placeholder="Select" size="large">
-        <el-option v-for="item in townOptions" :key="item.value" :label="item.label" :value="item.value" />
-    </el-select>
-    <button @click="sendFn('back', { name: '泸县' }), townCode = ''">返回首页</button>
-    <button @click="sendFn('refresh'), townCode = ''">刷新</button>
-    <button @click="sendFn('choseLand', { landName: item.title,id:item.id })" v-for="item in landList"> {{ item.title }}</button>
-    <button @click="sendFn('backHome', { name: '泸县' }), townCode = ''">返回首页</button>
-    <button @click="sendFn('detail', { name: item.title,id:item.id })" v-for="item in landList"> {{ item.title }}</button>
-    <p>地块</p> -->
     <div class="content" v-if="flag">
-        <div class="plant-li" v-for="item in 10">
-            究极地块
+        <div class="plant-li" v-for="item in landList" :key="item.id" @click="handClick(item)">
+            {{ item.title }}
         </div>
     </div>
 
-    <areaChose v-else></areaChose>
+    <areaChose v-else channel="user-plant" @handTown="handTown" @handArea="handArea"></areaChose>
     <div class="area" @click="flag = !flag">
         <div class="area-top">
-            <div class="town">江陽區</div>
-            <div class="town">江陽區</div>
+            <div class="town">{{ area }}</div>
+            <div class="town">{{ town }}</div>
         </div>
         <div class="area-bottom"></div>
     </div>
@@ -30,101 +17,54 @@
 <script setup scoped>
 import { ref, reactive } from "vue"
 import { sendMsg } from "@/api.js"
-import axios from "axios"
 import { landListApi } from "@/api.js"
 import areaChose from "../components/areaChose.vue"
 
 const flag = ref(true)
+const town = ref("")
+const area = ref("泸县")
+let areaCode = 0
 
-// 镇列表
-const options = [
-    {
-        value: '510502',
-        label: '江阳区',
-    },
-    {
-        value: '510503',
-        label: '纳溪区',
-    },
-    {
-        value: '510504',
-        label: '龙马潭区',
-    },
-    {
-        value: '510521',
-        label: '泸县',
-    },
-    {
-        value: '510522',
-        label: '合江县 ',
-    },
-    {
-        value: '510524',
-        label: '叙永县 ',
-    }, {
-        value: '510525',
-        label: '古蔺县 ',
-    },
-]
-// 区列表
-const townOptions = []
+const handTown = (e) => {
+    town.value = e.name
+    getLandList(areaCode ,e.code)
 
-const areaCode = ref('510521')
-
-const townCode = ref("")
-
-const changeArea = (e) => {
-    townCode.value = ''
-    getTownList()
-    options.forEach(item => {
-        if (item.value == e) {
-            sendFn('choserArea', { name: item.label, code: item.value })
-        }
-    })
 }
 
-const changeTown = (e) => {
-    townOptions.forEach(item => {
-        if (item.value == e) {
-            sendFn('choseTown', { name: item.label })
-        }
-    })
+const handArea = (e) => {
+    area.value = e.name
+    areaCode=e.code
+    town.value = ''
+    getLandList(e.code)
 
-    getLandList()
 }
 
-const getTownList = () => {
-    townOptions.splice(0, 99999999)
-    axios.get(`https://crmeb-test.shop.lihaink.cn/api/city/get_street?area_code=${areaCode.value}`)
-        .then(function (res) {
-            res.data.data.forEach(item => {
-                townOptions.push({
-                    value: item.code,
-                    label: item.name
-                })
-            })
-
-        })
-}
-
-const landList = ref([])
-const getLandList = async () => {
+const landList=ref([])
+const getLandList = async (areaCode=510521,streetCode='') => {
     let res = await landListApi({
-        areaCode: areaCode.value,
-        streetCode: townCode.value
+        areaCode,
+        streetCode,
     })
-    landList.value = res.data.list
-
-
-
+    landList.value=res.data.list
+    console.log(landList.value)
 }
+getLandList()
 
-getTownList()
+const handClick=(item)=>{
+    let data={
+        id:item.id,
+        landName:item.title,
+        areaCode:item.county_code,
+        townCode:item.town_code,
+        town_name:item.town_name
+    }
+    sendMsg({ channel: 'user-plant', event:'choseLand', data })
+    // sendFn('choseLand', {id:item.id,landName:item.title,townCode:item.town_code} )
+}
 // 发送消息
-const page = ref(1)
 const sendFn = (event, data = '') => {
     if (data.page) page.value = data.page;
-    sendMsg({ channel: 'user-3', event, data })
+    sendMsg({ channel: 'user-plant', event, data })
 }
 </script>
 <style lang="scss" scoped>
@@ -140,6 +80,7 @@ const sendFn = (event, data = '') => {
     flex-wrap: wrap;
     justify-content: center;
     overflow-y: auto;
+
     .plant-li {
         width: 165.9px;
         height: 190.48px;
@@ -181,5 +122,4 @@ const sendFn = (event, data = '') => {
     background-size: 100% 100%;
     transform: translateY(-20px);
 }
-
 </style>

src/view/tradeScreen/index.vue

@@ -31,18 +31,17 @@ const flag = ref(true)
 const town=ref("")
 const area=ref("泸县")
 
-
 const sendFn = (event, data = '', fn) => {
     sendMsg({ channel: 'user-trad', event, data })
     if (fn) eval(fn)
 }
 
 const handTown=(e)=>{
-    town.value=e
+    town.value=e.name
 }
 
 const handArea=(e)=>{
-    area.value=e
+    area.value=e.name
     town.value=''
 }
 </script>