sujunling 1 年間 前
コミット
74e0423adc

+ 2 - 2
.env.development

@@ -11,10 +11,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
 # 线上演示环境
-# VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
+VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:20043"],["/agent","http://127.0.0.1:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
-VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
+# VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.119.143:9200"],["/agent","http://192.168.119.143:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"]]                                                            

+ 13 - 4
src/views/assembly/item/AssemblyData.vue

@@ -13,12 +13,16 @@
               <span><a :href="[`./mapview.html?onlineIde_${i.servicealiasname}`]" target="_blank"
                   rel="noopener noreferrer">浏览</a></span>
               <!-- <span @click="showDrawer(i)">详细</span> -->
-              <span @click="handleDetailInfo(i)">详细</span>
+              <span @click="handleDetailInfo(i)" style="color: #2D74E7;">详细</span>
               <span @click="applyWay(i)" v-if="i.SFJRSQK == '未加入'">加入申请库</span>
               <!-- <span @click="applyWay(i)" v-if="i.SFJRSQK == '未加入'">{{ i.SFJRSQK }}</span> -->
               <!-- <span v-else style="cursor: not-allowed;background: rgb(232, 232, 232) !important;">{{ i.SFJRSQK }}申请库</span> -->
-              <span v-else style="cursor: not-allowed;background: rgb(232, 232, 232) !important;">{{ i.SFJRSQK == '已加入' ?
-                '已加入申请库' : i.SFJRSQK }}</span>
+              <!-- <span v-else style="cursor: not-allowed;background: rgb(232, 232, 232) !important;">{{ i.SFJRSQK == '已加入' ?
+                '已加入申请库' : i.SFJRSQK }}</span> -->
+              <span v-if="i.SFJRSQK != '未加入'"
+                :style="{ color: i.SFJRSQK == '已加入' ? '#999999' : '#ffffff', background: i.SFJRSQK == '已加入' ? '#E8E8E8' : i.SFJRSQK == '审核中' ? '#ED9C23' : i.SFJRSQK == '审核不通过' ? '#FA5151' : '' }">{{
+                  i.SFJRSQK == '已加入' ? '已加入申请库' :
+                  i.SFJRSQK }}</span>
             </p>
           </div>
         </div>
@@ -209,6 +213,11 @@ div.assemblyModal {
   border-radius: 0px 0px 4px 4px;
 }
 
+.bottomBut span {
+  border-radius: 3px;
+  background: #E1EBFB;
+}
+
 .bottomBut span:first-child,
 .bottomBut span:nth-child(2) {
   float: left;
@@ -244,7 +253,7 @@ div.assemblyModal {
   line-height: 34px;
   margin-right: 20px;
   padding: 0 10px;
-  background: #E8E8E8;
+  background: #E1EBFB;
   cursor: pointer;
 }
 

+ 14 - 4
src/views/resource/plat/item/FileData.vue

@@ -30,12 +30,12 @@
               <div class="operation-item browse-item-btn browse-item-MR00001936">
                 <a target="_blank"
                   :href="(i.info && i.info.length && i.info[0].thumbnail) || './static/img/default-dr3.jpg'">
-                  <span>浏览</span>
+                  <span style="color: #2D74E7;">浏览</span>
                 </a>
               </div>
               <div class="operation-item" @click="handleQuery(i, n)">
                 <a href="javascript:void(0)" class="">
-                  <span>详细</span>
+                  <span style="color: #2D74E7;">详细</span>
                 </a>
               </div>
             </div>
@@ -45,9 +45,15 @@
                   <span>加入申请库</span>
                 </a>
               </div>
-              <div class="operation-item" v-else style="cursor: not-allowed;background-color: #e8e8e8;">
+              <div class="operation-item" v-else-if="i.SFJRSQK === '审核通过'"
+                style="background-color: #05B069;color: #ffffff;cursor: pointer;" @click="showEmpowerInfo(i)">
+                已申请信息
+              </div>
+              <div class="operation-item" v-else style="cursor: not-allowed;background-color: #e8e8e8;"
+                :style="{ background: i.SFJRSQK == '已加入' ? '#E8E8E8' : i.SFJRSQK == '审核中' ? '#ED9C23' : i.SFJRSQK == '审核不通过' ? '#FA5151' : '' }">
                 <a href="javascript:void(0)" class="" style="cursor: not-allowed;color:#656363;">
-                  <span>{{ i.SFJRSQK == '已加入' ? '已加入申请库' : i.SFJRSQK }}</span>
+                  <span :style="{ color: i.SFJRSQK == '已加入' ? '#999999' : '#ffffff' }">{{ i.SFJRSQK == '已加入' ? '已加入申请库' :
+                    i.SFJRSQK }}</span>
                 </a>
               </div>
             </div>
@@ -164,6 +170,10 @@ export default defineComponent({
 </script>
 
 <style scoped>
+.operation-item {
+  border-radius: 3px;
+}
+
 .datacenter-right .resource_list .item-title .r_name {
   color: #5e5d5e;
   display: inline-block;

+ 14 - 6
src/views/resource/plat/item/MapData.vue

@@ -26,14 +26,15 @@
           </div>
           <div class="operation-box">
             <div class="left">
-              <div class="operation-item browse-item-btn browse-item-MR00001936">
+              <div class="operation-item browse-item-btn browse-item-MR00001936"
+                style="background: #E1EBFB;color: #2D74E7;">
                 <a target="_blank" :href="`./mapview.html?${i.SERVICEID}`">
-                  <span>浏览</span>
+                  <span style="color: #2D74E7;">浏览</span>
                 </a>
               </div>
-              <div class="operation-item" @click="handleQuery(i, n)">
+              <div class="operation-item" @click="handleQuery(i, n)" style="background: #E1EBFB;color: #2D74E7;">
                 <a href="javascript:void(0)" class="">
-                  <span>详细</span>
+                  <span style="color: #2D74E7;">详细</span>
                 </a>
               </div>
             </div>
@@ -47,9 +48,11 @@
                 style="background-color: #05B069;color: #ffffff;cursor: pointer;" @click="showEmpowerInfo(i)">
                 已申请信息
               </div>
-              <div class="operation-item" v-else style="cursor: not-allowed;background-color: #e8e8e8;">
+              <div class="operation-item" v-else style="cursor: not-allowed;background-color: #e8e8e8;"
+                :style="{ background: i.SFJRSQK == '已加入' ? '#E8E8E8' : i.SFJRSQK == '审核中' ? '#ED9C23' : i.SFJRSQK == '审核不通过' ? '#FA5151' : '' }">
                 <a href="javascript:void(0)" class="" style="cursor: not-allowed;color:#656363;">
-                  <span>{{ i.SFJRSQK == '已加入' ? '已加入申请库' : i.SFJRSQK }}</span>
+                  <span :style="{ color: i.SFJRSQK == '已加入' ? '#999999' : '#ffffff' }">{{ i.SFJRSQK == '已加入' ? '已加入申请库' :
+                    i.SFJRSQK }}</span>
                 </a>
               </div>
             </div>
@@ -193,6 +196,10 @@ export default defineComponent({
 </script>
 
 <style scoped>
+.operation-item {
+  border-radius: 3px;
+}
+
 .pagination {
   float: right;
 }
@@ -265,6 +272,7 @@ export default defineComponent({
       margin-right: 22px;
       padding: 0 10px;
       background: #E8E8E8;
+      border-radius: 3px;
 
       a {
         font-size: 12px;

+ 17 - 7
src/views/resource/plat/item/SceneData.vue

@@ -29,12 +29,12 @@
             <div class="left">
               <div class="operation-item browse-item-btn browse-item-MR00001936">
                 <a target="_blank" :href="`./sceneview.html?${i.SERVICEID}`">
-                  <span>浏览</span>
+                  <span style="color: #2D74E7;">浏览</span>
                 </a>
               </div>
               <div class="operation-item" @click="handleQuery(i, n)">
                 <a href="javascript:void(0)" class="">
-                  <span>详细</span>
+                  <span style="color: #2D74E7;">详细</span>
                 </a>
               </div>
             </div>
@@ -44,9 +44,15 @@
                   <span>加入申请库</span>
                 </a>
               </div>
-              <div class="operation-item" v-else style="cursor: not-allowed;background-color: #e8e8e8;">
-                <a href="javascript:void(0)" style="cursor: not-allowed;color:#656363;">
-                  <span>{{ i.SFJRSQK == '已加入' ? '已加入申请库' : i.SFJRSQK }}</span>
+              <div class="operation-item" v-else-if="i.SFJRSQK === '审核通过'"
+                style="background-color: #05B069;color: #ffffff;cursor: pointer;" @click="showEmpowerInfo(i)">
+                已申请信息
+              </div>
+              <div class="operation-item" v-else style="cursor: not-allowed;background-color: #e8e8e8;"
+                :style="{ background: i.SFJRSQK == '已加入' ? '#E8E8E8' : i.SFJRSQK == '审核中' ? '#ED9C23' : i.SFJRSQK == '审核不通过' ? '#FA5151' : '' }">
+                <a href="javascript:void(0)" class="" style="cursor: not-allowed;color:#656363;">
+                  <span :style="{ color: i.SFJRSQK == '已加入' ? '#999999' : '#ffffff' }">{{ i.SFJRSQK == '已加入' ? '已加入申请库' :
+                    i.SFJRSQK }}</span>
                 </a>
               </div>
             </div>
@@ -81,7 +87,7 @@ import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
 const props = {
   listData: {
     type: Object,
-    default: () => {},
+    default: () => { },
   }
 }
 
@@ -89,7 +95,7 @@ export default defineComponent({
   name: 'SceneData',
   components: { BasicTable, TableAction, Search, DetailModal, Authority, Popconfirm, Tooltip, SceneDrawer, MyPage },
   props,
-  emits:['resAddToCar'],
+  emits: ['resAddToCar'],
   setup(props, { emit }) {
     const showResDeatil = ref(false)
     const detailResId = ref('')
@@ -179,6 +185,10 @@ export default defineComponent({
 </script>
 
 <style scoped>
+.operation-item {
+  border-radius: 3px;
+}
+
 .datacenter-right .resource_list .item-title .r_name {
   color: #5e5d5e;
   display: inline-block;