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

src/api/datacenter.js

@@ -42,6 +42,7 @@ export function getPointByDeptId(type,deptId) {
 
 //点击地图点位详情信息数据
 export function getPointDetails(id,type) {
+  // alert(id+"==="+type)
   return request({
     url: '/center-agriculture/data/getPointDetails?id='+id+'&type='+type,
     method: 'get',

src/views/datacenter.vue

@@ -476,7 +476,7 @@ export default {
                   '     <div class="d-l-con">' +
                   '       <div class="d-l-l-text">' +
                   // '         <h4>地址：' + res.data.list[i].address + '</h4>' +
-                  '         <h4>名称：' + res.data.list[i].NAME + '</h4>' +
+                  '         <h4>名称：' + res.data.list[i].name + '</h4>' +
                   '       </div>' +
                   '     </div>' +
                   '   </span>' +
@@ -490,7 +490,8 @@ export default {
                   '   </span>' +
                   '</div>',
                 click: 'showPointDetails',
-                parameter: {id:res.data.list[i].id,type:type},
+                parameter: {objec: res.data.list[i]},
+                // parameter: {id:res.data.list[i].id,type:type},
                 keepBindPopup: false,
                 isAggregation: false
               }

src/views/pointDetails.vue

@@ -1,50 +1,115 @@
 <template>
   <div class="visual-con">
     <el-dialog title="站点详情" :visible.sync="pointDetailsVisible" width="50rem" v-if="pointDetailsVisible">
-			
+
 		<div class="text-con">
+      <!--name: (...)-->
+      <!--address: (...)-->
+      <!--contacts: (...)-->
+      <!--create_by: (...)-->
+      <!--create_name: (...)-->
+      <!--create_time: (...)-->
+      <!--dept_id: (...)-->
+      <!--dept_name: (...)-->
+      <!--id: (...)-->
+      <!--latitude: (...)-->
+      <!--longitude: (...)-->
+      <!--phone: (...)-->
+      <!--varieties: (...)-->
       <div><i class="ismall"></i><span>名称:{{retMap.name}}</span></div>
       <div><i class="ismall"></i><span>地址:{{retMap.address}}</span></div>
-      <div><i class="ismall"></i><span>注册登记机关:{{retMap.registration_authority}}</span></div>
-      <div><i class="ismall"></i><span>注册时间:{{retMap.register_date}}</span></div>
-      <div><i class="ismall"></i><span>注册资金:{{retMap.legal_person}}</span></div>
-      <div><i class="ismall"></i><span>法人姓名:{{retMap.phone}}</span></div>
-      <div><i class="ismall"></i><span>联系电话:{{retMap.members_num}}</span></div>
+      <div><i class="ismall"></i><span>联系人:{{retMap.contacts}}</span></div>
+      <div><i class="ismall"></i><span>联系人电话:{{retMap.phone}}</span></div>
+      <!--<div><i class="ismall"></i><span>创建时间:{{retMap.create_time}}</span></div>-->
       <div><i class="ismall"></i><span>所属部门:{{retMap.dept_name}}</span></div>
       <div><i class="ismall"></i><span>地址坐标:{{retMap.longitude}},{{retMap.latitude}}</span></div>
-      <div v-if="type=='hezuoshe'">
-        <div><i class="ismall"></i><span>租用年限:{{retMap.Lease_term}}</span></div>
-        <div><i class="ismall"></i><span v-for="dict in dict.type.task_source" v-if="dict.value == retMap.hzs_type">合作社类型:{{dict.label}}</span></div>
-        <div><i class="ismall"></i><span>成员人数:{{retMap.members_num}}</span></div>
-        <div><i class="ismall"></i><span>带动农民数:{{retMap.driven_farmers_num}}</span></div>
-        <div><i class="ismall"></i><span>征地地址:{{retMap.land_address}}</span></div>
-      </div>
-      <div v-if="type=='nongji'">
-        <div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>
-        <div><i class="ismall"></i><span>举办单位:{{retMap.Lease_term}}</span></div>
-        <div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>
-      </div>
-      <div v-if="type=='xubao'">
-        <div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>
-        <div><i class="ismall"></i><span>举办单位:{{retMap.lease_term}}</span></div>
-        <div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>
-      </div>
-      <div v-if="type=='yangzhi'">
-        <div><i class="ismall"></i><span v-for="dict in dict.type.farm_farmer_type" v-if="dict.value == retMap.breeder_type">养殖户类型:{{dict.label}}</span></div>
-        <div><i class="ismall"></i><span v-for="dict in dict.type.farm_breed_type" v-if="dict.value == retMap.type">养殖类型:{{dict.label}}</span></div>
-        <div><i class="ismall"></i><span>养殖品种:{{retMap.varieties}}</span></div>
-        <div><i class="ismall"></i><span>养殖数量:{{retMap.quantity}}</span></div>
-        <div><i class="ismall"></i><span>粪污处理占地面积:{{retMap.excrement_area}}㎡</span></div>
-        <div><i class="ismall"></i><span>粪污处理产物:{{retMap.excrement_product}}</span></div>
-        <div><i class="ismall"></i><span>粪污处理说明:{{retMap.excrement_explain}}</span></div>
-      </div>
-      <div v-if="type=='zhibao'">
-        <div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>
-        <div><i class="ismall"></i><span>举办单位:{{retMap.Lease_term}}</span></div>
-        <div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>
+      <div><i class="ismall"></i><span>备注信息:{{retMap.varieties}}</span></div>
+
+      <!--<div><i class="ismall"></i><span>名称:{{retMap.name}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>地址:{{retMap.address}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>注册登记机关:{{retMap.registration_authority}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>注册时间:{{retMap.register_date}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>注册资金:{{retMap.legal_person}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>法人姓名:{{retMap.phone}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>联系电话:{{retMap.members_num}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>所属部门:{{retMap.dept_name}}</span></div>-->
+      <!--<div><i class="ismall"></i><span>地址坐标:{{retMap.longitude}},{{retMap.latitude}}</span></div>-->
+      <!--<div v-if="type=='hezuoshe'">-->
+        <!--<div><i class="ismall"></i><span>租用年限:{{retMap.Lease_term}}</span></div>-->
+        <!--<div><i class="ismall"></i><span v-for="dict in dict.type.task_source" v-if="dict.value == retMap.hzs_type">合作社类型:{{dict.label}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>成员人数:{{retMap.members_num}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>带动农民数:{{retMap.driven_farmers_num}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>征地地址:{{retMap.land_address}}</span></div>-->
+      <!--</div>-->
+      <!--<div v-if="type=='nongji'">-->
+        <!--<div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>举办单位:{{retMap.Lease_term}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>-->
+      <!--</div>-->
+      <!--<div v-if="type=='xubao'">-->
+        <!--<div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>举办单位:{{retMap.lease_term}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>-->
+      <!--</div>-->
+      <!--<div v-if="type=='yangzhi'">-->
+        <!--<div><i class="ismall"></i><span v-for="dict in dict.type.farm_farmer_type" v-if="dict.value == retMap.breeder_type">养殖户类型:{{dict.label}}</span></div>-->
+        <!--<div><i class="ismall"></i><span v-for="dict in dict.type.farm_breed_type" v-if="dict.value == retMap.type">养殖类型:{{dict.label}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>养殖品种:{{retMap.varieties}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>养殖数量:{{retMap.quantity}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>粪污处理占地面积:{{retMap.excrement_area}}㎡</span></div>-->
+        <!--<div><i class="ismall"></i><span>粪污处理产物:{{retMap.excrement_product}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>粪污处理说明:{{retMap.excrement_explain}}</span></div>-->
+      <!--</div>-->
+      <!--<div v-if="type=='zhibao'">-->
+        <!--<div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>举办单位:{{retMap.Lease_term}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>-->
+      <!--</div>-->
+      <!--<div><i class="ismall"></i><span>备注信息:{{retMap.remarks}}</span></div>-->
+    <!--</div>-->
+      <!--<div class="text-con">-->
+        <!--<div><i class="ismall"></i><span>名称:{{retMap.name}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>地址:{{retMap.address}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>注册登记机关:{{retMap.registration_authority}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>注册时间:{{retMap.register_date}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>注册资金:{{retMap.legal_person}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>法人姓名:{{retMap.phone}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>联系电话:{{retMap.members_num}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>所属部门:{{retMap.dept_name}}</span></div>-->
+        <!--<div><i class="ismall"></i><span>地址坐标:{{retMap.longitude}},{{retMap.latitude}}</span></div>-->
+        <!--<div v-if="type=='hezuoshe'">-->
+          <!--<div><i class="ismall"></i><span>租用年限:{{retMap.Lease_term}}</span></div>-->
+          <!--<div><i class="ismall"></i><span v-for="dict in dict.type.task_source" v-if="dict.value == retMap.hzs_type">合作社类型:{{dict.label}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>成员人数:{{retMap.members_num}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>带动农民数:{{retMap.driven_farmers_num}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>征地地址:{{retMap.land_address}}</span></div>-->
+        <!--</div>-->
+        <!--<div v-if="type=='nongji'">-->
+          <!--<div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>举办单位:{{retMap.Lease_term}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>-->
+        <!--</div>-->
+        <!--<div v-if="type=='xubao'">-->
+          <!--<div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>举办单位:{{retMap.lease_term}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>-->
+        <!--</div>-->
+        <!--<div v-if="type=='yangzhi'">-->
+          <!--<div><i class="ismall"></i><span v-for="dict in dict.type.farm_farmer_type" v-if="dict.value == retMap.breeder_type">养殖户类型:{{dict.label}}</span></div>-->
+          <!--<div><i class="ismall"></i><span v-for="dict in dict.type.farm_breed_type" v-if="dict.value == retMap.type">养殖类型:{{dict.label}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>养殖品种:{{retMap.varieties}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>养殖数量:{{retMap.quantity}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>粪污处理占地面积:{{retMap.excrement_area}}㎡</span></div>-->
+          <!--<div><i class="ismall"></i><span>粪污处理产物:{{retMap.excrement_product}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>粪污处理说明:{{retMap.excrement_explain}}</span></div>-->
+        <!--</div>-->
+        <!--<div v-if="type=='zhibao'">-->
+          <!--<div><i class="ismall"></i><span>经费来源:{{retMap.land_use_mode}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>举办单位:{{retMap.Lease_term}}</span></div>-->
+          <!--<div><i class="ismall"></i><span>从业人数:{{retMap.members_num}}</span></div>-->
+        <!--</div>-->
+        <!--<div><i class="ismall"></i><span>备注信息:{{retMap.remarks}}</span></div>-->
       </div>
-      <div><i class="ismall"></i><span>备注信息:{{retMap.remarks}}</span></div>
-			</div>
     </el-dialog>
   </div>
 
@@ -66,6 +131,11 @@ export default {
     },
     methods: {
       showPointDetails(pointParam) {
+        console.log("pointParam=", pointParam.objec)
+        this.retMap = pointParam.objec;
+        this.pointDetailsVisible=true;
+      },
+      showPointDetails_废弃(pointParam) {
         this.pointDetailsVisible=true;
         this.type=pointParam.type;
         getPointDetails(pointParam.id,pointParam.type).then(res => {

vue.config.js

@@ -18,7 +18,7 @@ const fs = require('fs')
 // 这里只列一部分，具体配置参考文档
 module.exports = {
   // 部署生产环境和开发环境下的URL。
-  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上datacenter
+  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
@@ -52,13 +52,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+        // target: `http://127.0.0.1:3031`,
+        target: `https://29613561xe.eicp.vip`,
         // target: `http://192.168.2.118:3031`,
-         target: `http://121.36.228.66:3031`,
-         // target: `http://192.168.1.122:3031`,
-         // target: `http://127.0.0.1:3031`,
-         // target: `http://192.168.31.192:3031`,
-         // target: `https://117.78.49.164:3031`,
-         // target: `https://36.49.108.22:3031`,
+        // target: `http://121.36.228.66:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -70,7 +67,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: 'expanded' }
+        sassOptions: {outputStyle: 'expanded'}
       }
     }
   },