瀏覽代碼

样式优化和添加数据源功能

songxy 2 月之前
父節點
當前提交
5e219ded39

+ 1 - 1
web_ui/src/components/AIBtn.vue

@@ -29,7 +29,7 @@ export default {
   position: absolute;
   right: 17px;
   cursor: pointer;
-  bottom: 14px;
+  bottom: 10px;
   display: flex;
   align-items: center;
   justify-content: center;

+ 39 - 6
web_ui/src/views/industrial-land/AiIndustriaLandDetail.vue

@@ -118,6 +118,11 @@
               autofocus=""
             >
             </textarea>
+            <div class="data_source">
+              <Select v-model="dSource" style="width:100px;text-align: center;" @on-change="dSourceChange">
+                  <Option v-for="item in dataSources" :value="item.value" :key="item.value">{{ item.label }}</Option>
+              </Select>
+            </div>
             <AIBtn @send="hotQuestionReset()" />
           </div>
         </div>
@@ -248,6 +253,11 @@
               autofocus=""
             >
             </textarea>
+            <div class="data_source">
+              <Select v-model="dSource" style="width:100px;text-align: center;" @on-change="dSourceChange">
+                  <Option v-for="item in dataSources" :value="item.value" :key="item.value">{{ item.label }}</Option>
+              </Select>
+            </div>
             <AIBtn @send="zwsend" :disabled="btnSendDisabled" />
           </div>
         </vue-perfect-scrollbar>
@@ -347,6 +357,19 @@ export default {
         left: 0,
         top: 0,
       },
+      dSource: '1',
+      dataSources: [
+        {
+          label: '控详规',
+          value: '1'
+        },{
+          label: '公告地块',
+          value: '2'
+        },{
+          label: '土地储备',
+          value: '3'
+        }
+      ],
       hzData: [],
       showQuery: false,
       radarShow: false,
@@ -535,6 +558,11 @@ export default {
   },
 
   methods: {
+    dSourceChange () {
+      if (this.dSource === '3') {
+          this.$Message.error("暂无数据,请选择其他源!");
+      }
+    },
     toggleContentVisabledAll () {
       this.mContentVisabled = !this.mContentVisabled;
       this.xgdk.forEach((item) => {
@@ -1946,15 +1974,15 @@ export default {
           box-shadow: 0px 8px 16px 1px rgba(0, 57, 124, 0.2);
           border-radius: 16px 16px 16px 16px;
           border: 1px solid #4e69ff;
-
+          position: relative;
+          padding-bottom: 50px;
           textarea {
             border: none;
             resize: none;
-            width: calc(100% - 60px);
+            width: calc(100% - 40px);
             font-weight: normal;
             font-size: 18px;
             height: 100%;
-
             &:focus-visible {
               outline: none;
             }
@@ -1982,7 +2010,7 @@ export default {
 
         .left-panel-content {
           width: 100%;
-          height: calc(100% - 90px);
+          height: calc(100% - 120px);
           overflow-x: hidden;
           overflow-y: auto;
         }
@@ -2341,7 +2369,7 @@ export default {
         .textarea-panel {
           margin: 28px 3px 0px 3px;
           width: 424px;
-          height: 90px;
+          height: 120px;
           background: #ffffff;
           position: absolute;
           bottom: 26px;
@@ -2349,7 +2377,7 @@ export default {
           box-shadow: 0px 6px 12px 1px rgba(11, 53, 103, 0.08);
           border-radius: 16px 16px 16px 16px;
           border: 1px solid #e5e6ea;
-
+          position: relative;
           textarea {
             border: none;
             resize: none;
@@ -2650,6 +2678,11 @@ export default {
   }
 }
 
+.data_source {
+  position: absolute;
+  bottom: 12px;
+  left: 15px;
+}
 .dkitemchecked {
   background: rgba(224, 234, 250, 0.4);
 }

+ 38 - 19
web_ui/src/views/industrial-land/ZnxzDetail.vue

@@ -115,10 +115,10 @@
             <template v-if="qytsIndex == 1">
               <template v-if="qytsTabs[qytsIndex].result.length > 0">
                 <div
-                  class="zbcy-item"
                   v-for="(item, index) in qytsTabs[qytsIndex].result"
-                  @click="zbcyClick(item)"
+                  @click="zbcyClick(item, index)"
                   :key="index"
+                  :class="{ 'zbcy-item': true,  active: qytsActive === index}"
                 >
                   <div class="icon" v-if="false"></div>
                   <div class="value-panel">
@@ -128,9 +128,8 @@
                     <!-- <div class="type" v-else>暂无数据</div> -->
                     <div class="name">{{ item.name }}</div>
                     <div class="value">
-                      <img src="~@/assets/image/icon-loc.png" />{{
-                        item.address
-                      }}
+                      <img src="~@/assets/image/icon-loc.png" />
+                      <span>{{ item.address }}</span>
                     </div>
                   </div>
                 </div>
@@ -150,9 +149,8 @@
                   <div class="value-panel">
                     <div class="name">{{ item.name }}</div>
                     <div class="value">
-                      <img src="~@/assets/image/icon-loc.png" />园区位置:{{
-                        item.address ? item.address : "-"
-                      }}
+                      <img src="~@/assets/image/icon-loc.png" />园区位置:
+                      <span>{{ item.address ? item.address : "-" }}</span>
                     </div>
                     <!-- <div class="value">
                       <img src="~@/assets/image/icon-yqlx.png" />园区类型:{{
@@ -160,9 +158,8 @@
                       }}
                     </div> -->
                     <div class="value">
-                      <img src="~@/assets/image/icon-zycy.png" />招引产业:{{
-                        item.primaryindustry
-                      }}
+                      <img src="~@/assets/image/icon-zycy.png" />招引产业:
+                      <span>{{ item.primaryindustry }}</span>
                     </div>
                     <div class="btn-type">
                       {{ item.kfqjb == 2 ? "省级开发区" : "国家级开发区" }}
@@ -766,6 +763,7 @@ export default {
         { name: "周边产业", icon: "icon-zdxm", result: [] },
         { name: "周边园区", icon: "icon-zdxm", result: [] },
       ],
+      qytsActive: -1,
       qytsIndex: 0,
       jbxxIndex: 0,
       zbhjList: [],
@@ -1075,9 +1073,10 @@ export default {
         this.analysis();
       }, 500);
     },
-    zbcyClick(item) {
+    zbcyClick(item, index) {
       let geojson = JSON.parse(item.geom);
-      this.$emit("locationByGeojson", geojson,item.name);
+      this.$emit("locationByGeojson", geojson, item.name);
+      this.qytsActive = index;
     },
     zbyqClick(item) {
       let geojson = JSON.parse(item.geom);
@@ -2375,6 +2374,10 @@ export default {
           display: flex;
           align-items: center;
           justify-content: space-between;
+          &.active {
+            background: rgba(22, 132, 252, 0.1);
+            border-color: rgba(22, 132, 252, .9);
+          }
           .icon {
             width: 72px;
             height: 56px;
@@ -2384,6 +2387,7 @@ export default {
           }
           .value-panel {
             flex: 1;
+            width: 100%;
             height: 56px;
             position: relative;
             .name {
@@ -2391,6 +2395,9 @@ export default {
               font-weight: bold;
               font-size: 14px;
               color: #333333;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
             }
             .value {
               display: flex;
@@ -2401,10 +2408,15 @@ export default {
                 margin-top: 2px;
                 height: 16px;
               }
-              font-family: Microsoft YaHei;
-              font-weight: 400;
-              font-size: 14px;
-              color: #999999;
+              >span {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                font-family: Microsoft YaHei;
+                font-weight: 400;
+                font-size: 14px;
+                color: #999999;
+              }
             }
             .type {
               width: 73px;
@@ -2449,16 +2461,17 @@ export default {
             flex: 1;
             height: 140px;
             position: relative;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
             .name {
               font-family: Microsoft YaHei;
               font-weight: bold;
               margin-bottom: 13px;
               font-size: 15px;
-              color: #333333;
             }
             .value {
               display: flex;
-              height: 12px;
               margin-bottom: 15px;
               img {
                 margin-right: 7px;
@@ -2466,6 +2479,12 @@ export default {
                 margin-top: 2px;
                 height: 16px;
               }
+              >span {
+                color: #333333;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+              }
               font-family: Microsoft YaHei;
               font-weight: 400;
               font-size: 14px;

+ 2 - 2
web_ui/static/config.js

@@ -7,8 +7,8 @@
     queryGeometryUrl: 'http://10.249.6.132:8528/agentai/queryGeometry',
     queryGeometryListUrl: 'http://10.249.6.132:8528/agentai/queryGeometryList',
     queryYjjbntGeometryUrl: 'http://localhost:8511/queryYjjbntGeometry',
-    kfqintersectUrl: 'http://localhost:8511/kfqintersect',
-    gyydintersectUrl: 'http://localhost:8511/intersect_gyyd',
+    kfqintersectUrl: 'http://10.249.6.132:8528/agentai/kfqintersect',
+    gyydintersectUrl: 'http://10.249.6.132:8528/agentai/intersect_gyyd',
     //  subscribeUrl: 'http://10.10.9.143:8511/subscribe/',
     //  subscribeUrl: '/agentai/subscribe/',
     // subscribeUrl: 'http://192.168.0.145:8511/subscribe/',