renren-admin改为ucs-admin

back/public/config/basicConfig.js

@@ -17,34 +17,34 @@ var CONFIGITEM = {
     // 青岛市大数据局
     qingdao: {
       previewUrl: 'http://15.72.183.90:7008/',
-      apiURL: 'http://15.72.183.90:8000/renren-admin',
+      apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket'
+      websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
     },
     // 西海岸大数据局
     xihaian: {
       previewUrl: 'http://10.134.135.9:9796/',
-      // apiURL: 'http://10.134.135.9:8888/renren-admin',
+      // apiURL: 'http://10.134.135.9:8888/ucs-admin',
-      // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
+      // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
-      apiURL: 'http://192.168.124.236:8888/renren-admin',
+      apiURL: 'http://192.168.124.236:8888/ucs-admin',
-      // apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
+      // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
-      websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
+      websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
     },
     // 测试
     test: {
       previewUrl: 'http://192.168.124.243:9796/',
-      apiURL: 'http://192.168.124.243:8888/renren-admin',
+      apiURL: 'http://192.168.124.243:8888/ucs-admin',
-      websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
+      websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
     },
     // 内网穿透
     frp: {
       previewUrl: 'http://124.222.94.39:9796/',
-      apiURL: 'http://124.222.94.39:8888/renren-admin',
+      apiURL: 'http://124.222.94.39:8888/ucs-admin',
-      websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket'
+      websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
     },
     dev: {
       previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.243:8888/renren-admin',
+      apiURL: 'http://192.168.124.243:8888/ucs-admin',
-      websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
+      websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
     }
   }
 }

front/public/static/config/basicConfig.js

@@ -27,9 +27,9 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      apiURL: 'http://15.72.183.90:8000/renren-admin',
+      apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      websocketURL: '15.72.183.90:8000/renren-admin',
+      websocketURL: '15.72.183.90:8000/ucs-admin',
-      // websocketURL: '192.168.124.233:8888/renren-admin',
+      // websocketURL: '192.168.124.233:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -45,10 +45,10 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      //apiURL: 'http://15.72.183.90:8000/renren-admin',
+      //apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      // websocketURL: '10.16.5.146:8888/renren-admin', // 姜永超
+      // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
-      websocketURL: '10.18.1.99:8889/renren-admin',
+      websocketURL: '10.18.1.99:8889/ucs-admin',
-      // websocketURL: '10.16.5.35:8888/renren-admin',
+      // websocketURL: '10.16.5.35:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -69,10 +69,10 @@ var CONFIGITEM = {
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
-      // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
+      // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
-      // websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
+      // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
-      websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄
+      websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
-      // websocketURL: '10.18.1.99:8889/renren-admin', // 研发
+      // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -87,8 +87,8 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.243:8888/ucs-admin',
-      // websocketURL: '10.18.1.99:8889/renren-admin',
+      // websocketURL: '10.18.1.99:8889/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -103,7 +103,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://192.168.124.243:9797',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.243:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -118,7 +118,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://124.222.94.39:9797',
       previewUrl: 'http://124.222.94.39:9796/',
-      websocketURL: '124.222.94.39:8888/renren-admin',
+      websocketURL: '124.222.94.39:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },

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

@@ -1,5 +1,7 @@
 <template>
   <div class="box">
+    <!-- <IntegrationServiceOrder ref="integrationServiceOrderDom" :orderArray="orderArray" :style="styleObj">
+    </IntegrationServiceOrder> -->
     <div class="CanCase">
       <div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
         <a-image :preview="false" style="width:300px;height:200px" :src="
@@ -7,13 +9,14 @@
             .attrValue
         " />
         <h3>{{ item.name }}</h3>
-        <p>发布时间 {{ item.updateDate }}</p>
+        <p>发布时间 {{ item.createDate }}</p>
       </div>
     </div>
   </div>
 </template>
 <script setup>
 import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
+import IntegrationServiceOrder from './integrationServiceOrder.vue'
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
@@ -27,6 +30,19 @@ const props = defineProps({
     default: '组件服务',
   },
 })
+
+const orderArray = ref([
+  {
+    value: 'create_date',
+    name: '发布时间',
+    orderType: 'DESC',
+  },
+])
+
+const styleObj = ref({
+  'justify-content': 'flex-end',
+   "padding": "0 20px"
+})
 const emits = defineEmits(['saveSearchCodition'])
 
 const caseList = ref([])

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

@@ -1,5 +1,5 @@
 <template>
-  <ul class="integrationServiceOrder">
+  <ul class="integrationServiceOrder" :style="styleObj">
     <li v-for="(item, i) in integrationOrderList" :key="i" @click="
       changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
     ">
@@ -14,7 +14,7 @@
   </ul>
 </template>
 <script setup>
-import { ref, reactive, nextTick, defineExpose } from 'vue'
+import { ref, reactive, nextTick, defineExpose, defineProps } from 'vue'
 import mybus from '@/myplugins/mybus'
 
 const orderList = [
@@ -39,7 +39,18 @@ const orderList = [
   //   orderType: 'DESC',
   // },
 ]
+
+const props = defineProps({
+  orderArray: { type: Array, default: null },
+  styleObj: { type: Object, default: null },
+})
+
+console.log('props.orderArray------------>', props.orderArray);
+
 const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
+if(props.orderArray) {
+  integrationOrderList.value = props.orderArray
+}
 const integrationOrder = reactive({
   orderField: '',
   orderType: '',