Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css

business-css/frontend/src/api/business/algorithm/index.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 //获取所有项目列表
 export function searchAlgorithmsPage(queryParams:any){
   return request({
-    url: '/api/algorithms/search' ,
+    url: '/algorithms/search' ,
     method: 'get',
     params:queryParams
   });
@@ -15,7 +15,7 @@ export function searchAlgorithmsPage(queryParams:any){
 //新增项目
 export function addAlgorithms(data:any){
   return request({
-    url:'/api/algorithms' ,
+    url:'/algorithms' ,
     method: 'Post',
     data: data
   });
@@ -25,7 +25,7 @@ export function addAlgorithms(data:any){
 //更新项目信息
 export function updateAlgorithms (queryParams:any){
   return request({
-    url:'/api/algorithms' ,
+    url:'/algorithms' ,
     method: 'PUT',
     data: queryParams
   });
@@ -35,7 +35,7 @@ export function updateAlgorithms (queryParams:any){
 //单个删除项目
 export function deleteAlgorithms (queryParams:any){
   return request({
-    url:'/api/algorithms/'+queryParams.id ,
+    url:'/algorithms/'+queryParams.id ,
     method: 'delete'
     // params: queryParams
   });
@@ -43,7 +43,7 @@ export function deleteAlgorithms (queryParams:any){
 //多选删除项目
 export function deleteBatchAlgorithms (queryParams:any){
   return request({
-    url:'/api/algorithms',
+    url:'/algorithms',
     method: 'delete',
     data: queryParams
   });

business-css/frontend/src/api/business/project/index.ts

@@ -9,6 +9,13 @@ export function searchProjectsLsit(queryParams:any){
   });
 }
 
+export function projectsById(queryParams:any){
+  return request({
+    url: '/projects/'+ queryParams.projectId ,
+    method: 'get'
+  });
+}
+
 
 
 

business-css/frontend/src/api/business/scenario/index.ts

@@ -57,3 +57,12 @@ export function getActiveAlgorithms(){
   });
 }
 
+
+//获取所有项目列表
+export function getByScenario(queryParams:any){
+  return request({
+    url: '/scenario-results/by-scenario' ,
+    method: 'get',
+    params: queryParams
+  });
+}

business-css/frontend/src/components/antvx6/tableModel.vue

@@ -0,0 +1,129 @@
+<script lang="ts">
+export default {
+  name: "x6查看结果数据",
+};
+</script>
+
+<script setup lang="ts">
+import { onMounted, ref, nextTick } from "vue";
+import { ElForm, ElMessage, ElMessageBox } from "element-plus";
+import { getByScenario } from "@/api/business/scenario";
+const emit = defineEmits([ 'closeEditdevice']);
+
+const props = defineProps({
+  deviceId: {
+    required: false,
+    type: String,
+    default: ''
+  },
+  scenarioId: {
+    required: false,
+    type: String,
+    default: ''
+  },
+
+})
+const scenarioResultData:any = ref([]) 
+function getScenarioResults(){
+  scenarioResultData.value = []
+  getByScenario({
+    scenarioId: props.scenarioId,
+    deviceId: props.deviceId,
+    pageNum:1,
+    pageSize:999
+  }).then((res:any) => {
+    scenarioResultData.value = res.data.records
+  })
+}
+onMounted(() => {
+  getScenarioResults()
+
+});
+
+</script>
+
+<template>
+  <div class="editdevice-box">
+      
+    
+  </div>
+
+</template>
+
+<style scoped>
+.editdevice-box{
+  width: 100%;
+  height: calc(100vh - 200px);
+}
+.editdevice_navigation_left{
+  width: 110px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  cursor: pointer;
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: #363636;
+  background-image: url('@/assets/x6/navleft.png');
+}
+.editdevice_navigation_left:hover{
+  color: #266fff ;
+}
+.editdevice_navigation_activeleft{
+  background-image: url('@/assets/x6/navleft_active.png');
+  color: #fff !important;
+}
+.editdevice_navigation_right{
+   width: 110px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  cursor: pointer;
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: #363636;
+  background-image: url('@/assets/x6/navright.png');
+}
+.editdevice_navigation_right:hover{
+  color: #266fff ;
+}
+.editdevice_navigation_activeright{
+  background-image: url('@/assets/x6/navright_active.png');
+  color: #fff !important;
+}
+</style>
+<style>
+ .el-table .el-table--enable-row-hover .el-table__body tr:hover > td{
+  background-color: #194764 !important;
+}
+
+ .editdevice-box .el-table .el-table__row.current-row td{
+  background-color: #f3faff !important;
+  border-top:1px solid #14aaff;
+  border-bottom:1px solid #14aaff
+}
+.editdevice-box .el-table .el-table__row.current-row td:last-child{
+  border-right:1px solid #14aaff;
+}
+.editdevice-box .el-table .el-table__row.current-row td:first-child{
+  border-left:1px solid #14aaff;
+}
+.editdevice-box .el-table .el-table__row.current-row:last-child td{
+  border-bottom:1px solid #14aaff
+}
+.el-table__inner-wrapper:before{
+  background-color: transparent !important;
+  border-top: 1px solid var(--el-table-border-color);
+}
+ .el-table--border:before{
+  background-color: transparent !important;
+  border-top: 1px solid var(--el-table-border-color);
+}
+</style>
+
+
+

business-css/frontend/src/router/index.ts

@@ -26,7 +26,12 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import('@/views/error-page/404.vue'),
     meta: { hidden: true }
   },
-
+  {
+    name: '图形化分析',
+    path: '/viewanalysis',
+    component: () => import('@/components/antvx6/viewx6.vue'),
+    meta: { hidden: true }
+  },
   {
     path: '/',
     component: Layout,