Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/assets/styles/public.scss

@@ -323,9 +323,13 @@ select {
 }
 
 .el-dropdown-land .el-icon-caret-bottom {
-	color: #666666;
+	color: rgba(35,35,32,0.4);
 	margin-left: 2px;
 }
+.el-icon-caret-bottom:before{
+	color: rgba(35,35,32,0.4);
+
+	}
 
 .land_date_picker {
 	position: absolute !important;

dsk-operate-ui/src/layout/index.vue

@@ -3,7 +3,7 @@
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group',width1350:$route.name=='Radar',width1240:$route.name=='Overview'}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
+      <div :class="{'fixed-header':fixedHeader}" style="position: relative;z-index: 1000;">
         <navbar :offsetWidth="offsetWidth"/>
       </div>
       <app-main/>

dsk-operate-ui/src/views/market/index.vue

@@ -21,7 +21,8 @@
         iframeHight: window.innerHeight, // iframe高度-当前页控制
         navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68},  // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
         src: '',  //iframe嵌套页面地址
-        domain: 'https://plug.jiansheku.com', // 插件地址
+        // domain: 'https://plug.jiansheku.com', // 插件地址
+        domain: 'https://pre-plug.jiansheku.com', // 插件地址测试
         // domain: 'http://192.168.60.19:3400',
         // domain: 'http://192.168.60.30:3300',
         ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912', // 需要携带的sdkId