合并版本v0.8.7.2

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -44,7 +44,7 @@
         </p>
         <p>
           <span>
-            应用背景：<span>
+            需求依据：<span>
               {{ dataForm.content.applicationBackground || '--' }}</span
             ></span>
         </p>

front/public/static/config/location.js

@@ -38,8 +38,8 @@ if (newLocation === 'qingdao') {
     // { name: '个人中心', key: 'personalCenter' },
     { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
-    { name: '赋能案例', key: 'assignCase' },
-    { name: '融合服务', key: 'integrationServices' },
+    { name: '典型赋能案例', key: 'assignCase' },
+    // { name: '融合服务', key: 'integrationServices' },
     { name: 'CIM专区', key: 'cimSpecialArea' },
   ]
   footerDataList.footerList = {

front/src/views/assignCase/components/queryPage.vue

@@ -4,7 +4,7 @@
       <div class="banner"></div>
       <div class="mainBox">
         <div class="top">
-          <h1>赋能案例</h1>
+          <h1>典型赋能案例</h1>
           <div></div>
           <!-- <h3>Enabling Cases</h3> -->
         </div>

front/src/views/demandCenter/demandDetails.vue

@@ -236,6 +236,8 @@
           />
         </a-list>
       </div>
+      <!-- 关闭需求申请 -->
+      <div class="closeMain" @click="closeMain">X</div>
     </div>
   </div>
 </template>
@@ -378,7 +380,9 @@
       }
     }
   }
-
+  const closeMain = () => {
+    window.history.go(-1)
+  }
   onMounted(() => {
     // const formData = computed(() => store.getters['home/demandDetailsData'])
     // formName.value = formData.value
@@ -410,6 +414,7 @@
     display: flex;
     justify-content: center;
     .main {
+      position: relative;
       width: 1550px;
       height: 100%;
       padding-top: 30px;
@@ -476,6 +481,13 @@
         }
       }
     }
+    .closeMain {
+      position: absolute;
+      top: 40px;
+      right: 20px;
+      font-size: 0.2rem;
+      cursor: pointer;
+    }
   }
   .form-container {
     padding: 20px 20px 30px 20px;

front/src/views/demandCenter/index.vue

@@ -70,6 +70,13 @@
           </template>
         </a-pagination>
       </div>
+      <!-- 需求申请 -->
+      <div class="fixedmount">
+        <div @click="toView()">
+          <p></p>
+          <p>新需求</p>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -166,6 +173,12 @@
       },
     })
   }
+  const newpage = router.resolve({
+    path: '/addApplication', // 跳转的页面路由
+  })
+  const toView = () => {
+    window.open(newpage.href, '_blank')
+  }
 
   onMounted(() => {
     const params = {
@@ -284,6 +297,41 @@
           margin-top: 10px;
         }
       }
+      .fixedmount {
+        height: 1.5rem;
+        display: flex;
+        position: fixed;
+        right: 2.6rem;
+        z-index: 10;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .fixedmount div {
+        width: 0.7rem;
+        height: 0.7rem;
+        border-radius: 0.04rem;
+        border: 0.01rem #94aac9 solid;
+        display: flex;
+        flex-direction: column;
+        // justify-content: center;
+        align-items: center;
+        padding-top: 0.13rem;
+        position: relative;
+        cursor: pointer;
+        background: #e3edfc;
+        p {
+          margin: 0;
+        }
+      }
+      .fixedmount div p:nth-child(1) {
+        height: 0.24rem;
+        width: 0.24rem;
+        background: url('~@/assets/home/shenqing.png') no-repeat;
+        background-size: contain;
+        background-position: center;
+      }
     }
   }
 </style>

front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue

@@ -7,6 +7,137 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
+    <!-- 青岛市局 -->
+    <div v-if="whoShow1 && whoShow1.itShowQingDao">
+      <div
+        class="content"
+        v-for="item in dataFrom.content"
+        :key="item.title"
+        v-show="approveStatus == '通过'"
+      >
+        <div class="content-left" v-if="item.titleType === '调用接口'">
+          <div class="left">
+            <div class="content-left-title">
+              <span>{{ item.title }}：{{ item.titleType }}</span>
+            </div>
+            <div class="content-left-content">
+              <p>
+                <span>{{ item.link.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.link.value }}</template>
+                  <span>{{ item.link.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.postMethod.name }}</span>
+                <span>{{ item.postMethod.value }}</span>
+              </p>
+            </div>
+          </div>
+          <div class="right">
+            <div @click="technical()">技术文档</div>
+            <!-- <div @click="technicalNew()">新手指引</div> -->
+            <!-- <div @click="SDKClick()">SDK安装包</div> -->
+          </div>
+        </div>
+        <div class="content-left" v-else-if="item.titleType === '平台对接'">
+          <div class="left">
+            <div class="content-left-title">
+              <span>{{ item.title }}：{{ item.titleType }}</span>
+            </div>
+            <div class="content-left-content">
+              <p>
+                <span>{{ item.linkPlatform.name }}</span>
+                <a-tooltip v-if="approveStatus == '通过'">
+                  <template #title>{{ item.linkPlatform.value }}</template>
+                  <span>{{ item.linkPlatform.value }}</span>
+                </a-tooltip>
+                <a-tooltip v-else>
+                  <template #title>请申请后查看平台地址</template>
+                  <span>****************</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+          <div class="right">
+            <div @click="technical()">技术文档</div>
+            <!-- <div @click="technicalNew()">新手指引</div> -->
+            <!-- <div @click="SDKClick()">SDK安装包</div> -->
+          </div>
+        </div>
+        <div class="content-left" v-else-if="item.titleType === 'SDK'">
+          <div class="left">
+            <div class="content-left-title">
+              <span>{{ item.title }}：{{ item.titleType }}</span>
+            </div>
+          </div>
+          <div class="right">
+            <div @click="technical()">技术文档</div>
+            <!-- <div @click="technicalNew()">新手指引</div> -->
+            <div @click="SDKClick()">SDK安装包</div>
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-right-left">
+            <div class="content-right-title">{{ item.contact }}</div>
+            <div class="content-right-content">
+              <p>
+                <span>{{ item.facilitator.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.facilitator.value }}</template>
+                  <span>{{ item.facilitator.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.people.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.people.value }}</template>
+                  <span>{{ item.people.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.phone.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.phone.value }}</template>
+                  <span>{{ item.phone.value }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+          <div class="content-right-right">
+            <div class="content-right-title">{{ item.contact2 }}</div>
+            <div class="content-right-content">
+              <p>
+                <span>{{ item.facilitator2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.facilitator2.value }}</template>
+                  <span>{{ item.facilitator2.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.people2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.people2.value }}</template>
+                  <span>{{ item.people2.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.phone2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.phone2.value }}</template>
+                  <span>{{ item.phone2.value }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-show="approveStatus !== '通过'" class="contentOther">
+        请申请后查看
+      </div>
+    </div>
+    <!-- 其他 -->
+    <div v-else>
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left" v-if="item.titleType === '调用接口'">
           <div class="left">
@@ -126,6 +257,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -133,7 +265,8 @@
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
-  const approveStatus = ref('')
+  const approveStatus = ref('通过')
+  const whoShow1 = ref(whoShow)
   let dataFrom = ref({
     title: '使用方式',
     englishTitle: 'USAGE',
@@ -188,7 +321,7 @@
       dataFrom.value.content[0].people.value = props.dataList.deptContacts
       dataFrom.value.content[0].phone.value = props.dataList.deptPhone
       dataFrom.value.content[0].postMethod.value = props.dataList.apiMethodType
-      approveStatus.value = props.dataList.approveStatus
+      // approveStatus.value = props.dataList.approveStatus
       console.log('dataList', props.dataList)
       props.dataList.infoList.map((item) => {
         if (item.attrType === '组件地址') {
@@ -449,5 +582,10 @@
         }
       }
     }
+    .contentOther {
+      width: 100%;
+      height: 0.3rem;
+      background: pink;
+    }
   }
 </style>

front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue

@@ -7,6 +7,30 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
+    <div v-if="whoShow1 && whoShow1.itShowQingDao">
+      <div class="content" v-show="approveStatus == '通过'">
+        <div
+          v-for="(item, index) in dataFrom.content"
+          :key="index"
+          class="content-card"
+        >
+          <div class="card-title">{{ item.childrenTitle }}</div>
+          <div class="card-content">
+            <div v-for="carditem in item.childrenContent" :key="carditem">
+              <div style="display: flex">
+                <span>{{ carditem.attrType }}：</span>
+                <a-tooltip>
+                  <template #title>{{ carditem.attrValue }}</template>
+                  <span>{{ carditem.attrValue }}</span>
+                </a-tooltip>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-show="approveStatus !== '通过'">请申请后查看</div>
+    </div>
+    <div v-else>
       <div class="content">
         <div
           v-for="(item, index) in dataFrom.content"
@@ -28,11 +52,14 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
   import { ref, defineProps, watch } from 'vue'
+  const approveStatus = ref('通过')
+  const whoShow1 = ref(whoShow)
   let dataFrom = ref({
     title: '归属部门与服务商',
     englishTitle: 'DEPARTMENT&ERVICE',
@@ -105,6 +132,7 @@
     () => props.dataList,
     (val) => {
       if (val) {
+        approveStatus.value = val.approveStatus
         // dataFrom.value.content[0].childrenContent = []
         // dataFrom.value.content[1].childrenContent = []
         let obj = {

front/src/views/detailsAll/components/Business/BusinessUsageMode.vue

@@ -7,6 +7,91 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
+    <div v-if="whoShow1 && whoShow1.itShowQingDao">
+      <div
+        class="content"
+        v-for="item in dataFrom.content"
+        :key="item.title"
+        v-show="approveStatus == '通过'"
+      >
+        <div class="content-left">
+          <div class="left">
+            <div class="content-left-title">
+              <span>{{ item.title }}</span>
+            </div>
+            <div class="content-left-content">
+              <p>
+                <span>{{ item.link.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.linkValue }}</template>
+                  <span>{{ item.linkValue }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+          <div class="right">
+            <div @click="technical()">技术文档</div>
+            <div @click="technicalNew()">新手指引</div>
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-right-left">
+            <div class="content-right-title">{{ item.contact }}</div>
+            <div class="content-right-content">
+              <p>
+                <span>{{ item.facilitator.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.facilitator.value }}</template>
+                  <span>{{ item.facilitator.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.people.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.people.value }}</template>
+                  <span>{{ item.people.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.phone.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.phone.value }}</template>
+                  <span>{{ item.phone.value }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+          <div class="content-right-right">
+            <div class="content-right-title">{{ item.contact2 }}</div>
+            <div class="content-right-content">
+              <p>
+                <span>{{ item.facilitator2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.facilitator2.value }}</template>
+                  <span>{{ item.facilitator2.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.people2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.people2.value }}</template>
+                  <span>{{ item.people2.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.phone2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.phone2.value }}</template>
+                  <span>{{ item.phone2.value }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-show="approveStatus !== '通过'">请申请后查看</div>
+    </div>
+    <div v-else>
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left">
           <div class="left">
@@ -84,6 +169,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -91,6 +177,8 @@
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
+  const approveStatus = ref('通过')
+  const whoShow1 = ref(whoShow)
   let dataFrom = ref({
     title: '使用方式',
     englishTitle: 'USAGE',
@@ -157,6 +245,7 @@
         if (!obj) {
           flag.value = false
         } else {
+          approveStatus.value = val.approveStatus
           dataFrom.value.content[0].link.value = val.apiUrl || '--'
           dataFrom.value.content[0].facilitator.value = val.deptName || '--'
           dataFrom.value.content[0].people.value = val.deptContacts || '--'

front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue

@@ -7,6 +7,43 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
+    <div v-if="whoShow1 && whoShow1.itShowQingDao">
+      <div class="content" v-show="approveStatus == '通过'">
+        <div class="content-card">
+          <div class="left">
+            <p>{{ dataFrom.linkName }}</p>
+            <a-tooltip>
+              <template #title>{{ dataFrom.link }}</template>
+              <p>{{ dataFrom.link }}</p>
+            </a-tooltip>
+          </div>
+          <div class="right">
+            <div @click="technical()">技术文档</div>
+            <div @click="technicaltow()">新手指引</div>
+          </div>
+        </div>
+        <div class="content-card">
+          <div v-for="(item, index) in dataFrom.content" :key="index">
+            <div class="card-title">
+              {{ item.childrenTitle }}
+            </div>
+            <div class="card-content">
+              <div v-for="carditem in item.childrenContent" :key="carditem">
+                <div>
+                  <span>{{ carditem.attrType }}：</span>
+                  <a-tooltip>
+                    <template #title>{{ carditem.attrValue }}</template>
+                    <span>{{ carditem.attrValue }}</span>
+                  </a-tooltip>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-show="approveStatus !== '通过'">请申请后查看</div>
+    </div>
+    <div v-else>
       <div class="content">
         <div class="content-card">
           <div class="left">
@@ -41,6 +78,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -48,7 +86,8 @@
   import { ref, defineProps, watch } from 'vue'
   import { pinyin } from 'pinyin-pro'
   import { message } from 'ant-design-vue'
-
+  const approveStatus = ref('通过')
+  const whoShow1 = ref(whoShow)
   let flag = ref(true)
   let dataFrom = ref({
     title: '使用方式',
@@ -180,6 +219,7 @@
     () => props.dataList,
     (val) => {
       if (val) {
+        approveStatus.value = val.approveStatus
         let obj = val.infoList.filter((item) => item.attrType === '组件地址')[0]
         dataFrom.value.content[0].childrenContent[1].attrValue =
           props.dataList.deptContacts || '--'

front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue

@@ -39,7 +39,7 @@
       flag.value = false
     } else {
       props.dataList.infoList.map((item) => {
-        if (item.attrType === '预览服务地址') {
+        if (item.attrType === '图层服务地址') {
           img.value = item.attrValue.replace(/amp;/g, '') || '--'
         }
       })
@@ -56,7 +56,7 @@
           flag.value = false
         } else {
           val.infoList.map((item) => {
-            if (item.attrType === '预览服务地址') {
+            if (item.attrType === '图层服务地址') {
               img.value = item.attrValue.replace(/amp;/g, '') || '--'
             }
           })

front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue

@@ -7,6 +7,93 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
+    <div v-if="whoShow1 && whoShow1.itShowQingDao">
+      <div
+        class="content"
+        v-for="item in dataFrom.content"
+        :key="item.title"
+        v-show="approveStatus == '通过'"
+      >
+        <div class="content-left">
+          <div class="left">
+            <a-tooltip>
+              <template #title>{{ item.linkValue }}</template>
+              <p @click="ServiceAddressFunction(item.linkValue)">
+                服务地址：
+                {{ item.linkValue }}
+              </p>
+            </a-tooltip>
+            <a-tooltip>
+              <template #title>{{ item.csslinkValue }}</template>
+              <p @click="ServiceAddressFunction(item.csslinkValue)">
+                样式服务地址：
+                {{ item.csslinkValue }}
+              </p>
+            </a-tooltip>
+          </div>
+          <div class="right">
+            <div @click="technical()">技术文档</div>
+            <div @click="technicalNew()">新手指引</div>
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-right-left">
+            <div class="content-right-title">{{ item.contact }}</div>
+            <div class="content-right-content">
+              <p>
+                <span>{{ item.facilitator.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.facilitator.value }}</template>
+                  <span>{{ item.facilitator.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.people.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.people.value }}</template>
+                  <span>{{ item.people.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.phone.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.phone.value }}</template>
+                  <span>{{ item.phone.value }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+          <div class="content-right-right">
+            <div class="content-right-title">{{ item.contact2 }}</div>
+            <div class="content-right-content">
+              <p>
+                <span>{{ item.facilitator2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.facilitator2.value }}</template>
+                  <span>{{ item.facilitator2.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.people2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.people2.value }}</template>
+                  <span>{{ item.people2.value }}</span>
+                </a-tooltip>
+              </p>
+              <p>
+                <span>{{ item.phone2.name }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.phone2.value }}</template>
+                  <span>{{ item.phone2.value }}</span>
+                </a-tooltip>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-show="approveStatus !== '通过'">请申请后查看</div>
+    </div>
+    <div v-else>
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left">
           <div class="left">
@@ -86,6 +173,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -93,6 +181,8 @@
   import { message } from 'ant-design-vue'
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
+  const approveStatus = ref('通过')
+  const whoShow1 = ref(whoShow)
   let dataFrom = ref({
     link: '',
     title: '使用方式',
@@ -163,6 +253,7 @@
         if (!obj) {
           flag.value = false
         } else {
+          approveStatus.value = val.approveStatus
           dataFrom.value.content[0].link.value = val.apiUrl || '--'
           dataFrom.value.content[0].facilitator.value = val.deptName || '--'
           dataFrom.value.content[0].people.value = val.deptContacts || '--'

front/src/views/home/DetailsPageconetent.vue

@@ -1100,6 +1100,16 @@
           getCountByFuzzyQuery(searchValue.value || '').then((res) => {
             console.log('全局搜索==========》', res.data.data)
             globalData.data = res.data.data
+            let mapFlag = true
+            res.data.data.map((val) => {
+              if (mapFlag && val.count != 0) {
+                mapFlag = false
+                changeCards(val.type)
+              }
+            })
+            if (!mapFlag) {
+              return
+            }
             if (paramsGetResources.type == '基础设施') {
               console.log('camera1', camera.value)
               camera.value.getCamera(true, searchValue.value)
@@ -1238,6 +1248,7 @@
                     val.applyCount = val.syqk // 申请量
                     val.deptName = val.TGBM // 部门
                     val.createDate = val.fbrq // 发布时间
+                    val.description = val.xgxt // 描述
                   })
                   resourceList.data = res.data.data.data || []
                   resourceTotal.value = res.data.data.rows || ''
@@ -1334,6 +1345,7 @@
                   val.applyCount = val.syqk // 申请量
                   val.deptName = val.TGBM // 部门
                   val.createDate = val.fbrq // 发布时间
+                  val.description = val.xgxt // 描述
                 })
                 resourceList.data = res.data.data.data || []
                 resourceTotal.value = res.data.data.rows || ''

front/src/views/home/apply.vue

@@ -112,15 +112,15 @@
               </div>
               <div>
                 <a-form-item
-                  label="应用背景"
+                  label="需求依据"
                   name="applicationBackground"
                   :rules="[
-                    { required: true, message: '请输入应用背景' },
-                    { min: 50, message: '应用背景最少为50个字' },
+                    { required: true, message: '请输入需求依据' },
+                    { min: 50, message: '需求依据最少为50个字' },
                   ]"
                 >
                   <a-textarea
-                    placeholder="请输入应用背景"
+                    placeholder="请输入需求依据"
                     v-model:value="formName.applicationBackground"
                     :rows="4"
                   />

front/src/views/home/components/header.vue

@@ -247,6 +247,11 @@
           path: '/assignCase',
         })
         break
+      case '典型赋能案例':
+        router.push({
+          path: '/assignCase',
+        })
+        break
       case '融合服务':
         router.push({
           path: '/integrationServices',
@@ -437,7 +442,7 @@
         font-size: 0.16rem;
       }
       .name {
-        max-width: 3.3rem;
+        max-width: 2.3rem;
         text-overflow: ellipsis;
         display: -webkit-box;
         -webkit-line-clamp: 1;

front/src/views/home/infrastructurePage.vue

@@ -840,7 +840,7 @@
   const tabList = ref([
     {
       title: '设施类型',
-      content: ['视频资源', '云资源', '感知资源', '会议室'],
+      content: ['视频资源', '云资源', '感知资源', '城市云脑会客厅'],
     },
     {
       title: '视频标签',
@@ -971,7 +971,7 @@
   }
   //获取不可选择的分钟
   const disabledStartMinutes = (selectedHour) => {
-    if (roomEndTime) {
+    if (roomEndTime.value) {
       let minutes = []
       let hour = moment().hour()
       let minute = moment().minute()
@@ -985,7 +985,7 @@
   }
   //获取不可选择的秒
   const disabledStartSeconds = (selectedHour, selectedMinute) => {
-    if (roomEndTime) {
+    if (roomEndTime.value) {
       let seconds = []
       let hour = moment().hour()
       let minute = moment().minute()
@@ -1011,7 +1011,7 @@
   }
   //获取不可选择的分钟
   const disabledEndMinutes = (selectedHour) => {
-    if (roomCreateTime) {
+    if (roomCreateTime.value) {
       let minutes = []
       let hour = moment().hour()
       let minute = moment().minute()
@@ -1025,7 +1025,7 @@
   }
   //获取不可选择的秒
   const disabledEndSeconds = (selectedHour, selectedMinute) => {
-    if (roomCreateTime) {
+    if (roomCreateTime.value) {
       let seconds = []
       let hour = moment().hour()
       let minute = moment().minute()
@@ -1262,7 +1262,7 @@
         dataSource.value = []
         dataSource2.value = []
         pagination.value.total = 0
-      } else if (name == '会议室') {
+      } else if (name == '城市云脑会客厅') {
         //     room.value = false
         //     wrjFlag.value = true
         //     showMap.value = false
@@ -1380,7 +1380,7 @@
           })
         })
         wrjFlag.value = true
-      } else if (name == '会议室') {
+      } else if (name == '城市云脑会客厅') {
         showMap.value = false
         dataSource.value = []
         dataSource2.value = []

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -135,6 +135,7 @@
             val.applyCount = val.syqk // 申请量
             val.deptName = val.TGBM // 部门
             val.createDate = val.fbrq // 发布时间
+            val.description = val.xgxt // 描述
           })
           obj.value = res.data.data.data || []
           object.sjNum = res.data.data.rows

front/src/views/newHome/components/Navigation.vue

@@ -167,7 +167,7 @@
     '数据资源',
     '知识库',
   ])
-  const select = ref('组件服务')
+  const select = ref(whoShow.itShowQingDao ? '' : '组件服务')
   let applicationDataList = ref([])
   let technosphereDataList = ref([])
   const fabubumen = ref([
@@ -312,7 +312,7 @@
     .main {
       width: 8.8rem;
       height: 1.48rem;
-      background: rgba(255, 255, 255, 0.18);
+      // background: rgba(255, 255, 255, 0.18);
       padding: 0.2rem 0.4rem;
       border-radius: 0.02rem;
       margin-top: 1.36rem;
@@ -321,36 +321,44 @@
         justify-content: flex-start;
         span {
           cursor: pointer;
-          padding: 0.05rem 0;
+          padding: 0.1rem 0;
           width: 1.2rem;
           text-align: center;
           margin: 0 0.1rem;
           font-size: 0.18rem;
-          background: linear-gradient(
-            to right,
-            rgba(68, 107, 164, 0.4) 0%,
-            rgba(68, 107, 164, 0) 100%
-          );
+          // background: linear-gradient(
+          //   to right,
+          //   rgba(68, 107, 164, 0.4) 0%,
+          //   rgba(68, 107, 164, 0) 100%
+          // );
           color: white;
-          border-left: 0.02rem solid rgb(108, 147, 204);
+          // border-left: 0.02rem solid rgb(108, 147, 204);
         }
         span:nth-of-type(1) {
           margin-left: 0;
         }
-        span:hover {
-          background: linear-gradient(
-            to right,
-            rgba(68, 107, 164, 0.5) 0%,
-            rgba(68, 107, 164, 0.1) 100%
-          );
-        }
+        // span:hover {
+        //   background: linear-gradient(
+        //     to right,
+        //     rgba(68, 107, 164, 0.5) 0%,
+        //     rgba(68, 107, 164, 0.1) 100%
+        //   );
+        // }
         .select {
-          background: linear-gradient(
-            to right,
-            rgba(68, 107, 164, 0.8) 0%,
-            rgba(68, 107, 164, 0.4) 100%
-          ) !important;
-          border-left: 0.02rem solid #fff;
+          // background: linear-gradient(
+          //   to bottom,
+          //   rgba(255, 255, 255, 0.6) 0%,
+          //   rgba(31, 116, 243, 0.8) 20%,
+          //   rgba(0, 102, 255, 0.8) 50%,
+          //   rgba(61, 122, 214, 0.8) 80%,
+          //   rgba(255, 255, 255, 0.6) 100%
+          // ) !important;
+          background: url('~@/assets/home/top-select.png') no-repeat;
+          background-size: 95%;
+          background-position: 50% 40%;
+          // border-radius: 0.5rem;
+          font-weight: 600;
+          // border-left: 0.02rem solid #fff;
         }
       }
       .bottom {