Hua vor 3 Monaten
Ursprung
Commit
2af566d36f

+ 14 - 0
ruoyi-ui/src/api/service/info.js

@@ -229,4 +229,18 @@ export function editLogping(data) {
     method: 'put',
     data: data
   })
+}
+export function getQuality(query) {
+  return request({
+    url: "/md/quality/list",
+    method: "get",
+    params: query,
+  });
+}
+export function getEfficiency(query) {
+  return request({
+    url: "/md/efficiency/list",
+    method: "get",
+    params: query,
+  });
 }

+ 3 - 40
ruoyi-ui/src/views/evaluate/index.vue

@@ -1,5 +1,5 @@
 <template>
-   <div style="overflow-y: auto;">
+   <div style="overflow-y: auto;background-color:  #F7F7F7;height: 100%;">
      <div style="margin-left: 1%;width: 98%;display: flex;margin-top: 1%;height: 15vh;">
         <div shadow="always" style="width: 33%;height: 100%;;border-radius: 10px;background-color: white;" class="boxShadow">
           <div style="width: 100%;display: flex;align-items: center;justify-content: center;font-size: 35px;font-weight: bold;color: #477ACF;;height: 70%">
@@ -27,7 +27,7 @@
         </div>
       </div>
       <div style="background-color:  #F7F7F7;padding-top:1%;">
-        <div style="margin-left: 1%;width: 98%;display: flex;height: 35vh;">
+        <div style="margin-left: 1%;width: 98%;display: flex;height: 32vh;">
           <div style="width: 100%;height: 100%;">
             <el-card shadow="always" class="box-card" style="width:100%;height: 100%;">
               <div style="display: flex;align-items: center;font-weight: bold;line-height: 1;">
@@ -62,43 +62,6 @@
               </div>
             </el-card>
           </div>
-          <!-- <div style="width: 30%;height: 100%;margin-left: 1%;">
-            <el-card shadow="always" class="box-card" style="width:100%;height: 100%;">
-              <div style="display: flex;align-items: center;font-weight: bold;width: 100%;">
-                <div style="">模型服务调用次数</div>
-                <div style="width: 50%;margin-left: 20%;">
-                  <el-select
-                    v-model="value"
-                    class="m-2"
-                    placeholder="长江水利委员会"
-                    style="width: 100%;;"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </div>
-              </div>
-              <div id="top2"  style="width: 98%;margin-left: 1%;margin-top: 1%;" :style="{'height':heightAll*0.23+'px'}">
-
-              </div>
-            </el-card>
-          </div>
-          <div style="width: 30%;height: 100%;;margin-left: 1%">
-            <el-card shadow="always" class="box-card" style="width:100%;height: 100%;">
-              <div style="display: flex;align-items: center;font-weight: bold;width: 100%;">
-                <div style="">模型服务类型总数 </div>
-                <div style="color: #79bbff;margin-left: 1%;"> 123 </div>
-                <div style="margin-left: 1%;"> 次 </div>
-              </div>
-              <div id="top3"  style="width: 98%;margin-left: 1%;margin-top: 1%;" :style="{'height':heightAll*0.25+'px'}">
-
-              </div>
-            </el-card>
-          </div> -->
         </div>
         <div style="margin-left: 1%;width: 98%;display: flex;margin-top: 1%;height: 38vh;">
           <el-card shadow="always" class="box-card" style="width:50%;height: 100%;">
@@ -154,7 +117,7 @@
                     />
                 </el-select> -->
             </div>
-            <div id="bt2"  style="width: 100%;margin-left: 1%;margin-top: 1%;height: 30vh;">
+            <div id="bt2"  style="width: 100%;margin-left: 1%;margin-top: 1%;height: 28vh;">
 
             </div>
           </el-card>

+ 127 - 664
ruoyi-ui/src/views/evaluate/quality.vue

@@ -5,15 +5,19 @@
         <div style="position: absolute;left: 80%;z-index: 1000;">
             <div>
                 <el-date-picker
-                v-model="time"
+                v-model="timeYear"
                 type="year"
                 v-if="activeName=='third'"
+                value-format="YYYY-MM-DD"
+                @change="getQualityList"
                 placeholder="请选择年份"
                 />
                 <el-date-picker
-                v-model="time"
+                v-model="timeMon"
                 type="month"
                 v-if="activeName=='second'"
+                value-format="YYYY-MM-DD"
+                @change="getQualityList"
                 placeholder="请选择月份"
                 />
             </div>
@@ -22,7 +26,7 @@
         v-model="activeName"
         type="card"
         class="demo-tabs"
-        @tab-click="handleClick"
+        @tab-click="getQualityList"
         >
             <el-tab-pane label="周" name="first"></el-tab-pane>
             <el-tab-pane label="月" name="second"></el-tab-pane>
@@ -30,7 +34,7 @@
         </el-tabs>
         <el-table 
           :data="tableData" 
-          style="width: 100%;margin-left: 0%;margin-top: -0.8%;"
+          style="width: 100%;margin-left: 0%;margin-top: -0.8%;height: 80vh;"
           :cell-style="{ padding:'5px' }"
           :header-cell-style="{height: heightAll*0.01+'px',}"
           :row-style="{ fontSize: '16px',textAlign:'center'}"
@@ -42,19 +46,27 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="模型名称"  width="200">
+          <el-table-column prop="mdName" label="模型名称"  width="250">
+          </el-table-column>
+          <el-table-column prop="statisNum" label="调用次数"  show-overflow-tooltip/>
+          <el-table-column prop="statisNumTrue" label="调用成功次数"/>
+          <el-table-column prop="rate" label="成功率"/>
+          <el-table-column prop="rateLv" label="质量">
             <template #default="scope">
-              <div style="color: #409EFF;cursor: pointer;" @click="showDe(scope.row)">
-                {{scope.row.name}}
+              <div style="color:#67C23A" v-if="scope.row.rateLv==='优'">
+                {{ scope.row.rateLv }}
+              </div>
+              <div style="color:#67C23A" v-if="scope.row.rateLv==='良'">
+                {{ scope.row.E6A23C }}
+              </div>
+              <div style="color:#909399" v-if="scope.row.rateLv==='中'">
+                {{ scope.row.rateLv }}
+              </div>
+              <div style="color:#F56C6C" v-if="scope.row.rateLv==='差'">
+                {{ scope.row.rateLv }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="type" label="统计时间">
-          </el-table-column>
-          <el-table-column prop="url" label="调用次数"  show-overflow-tooltip/>
-          <el-table-column prop="rqtype" label="调用次数"/>
-          <el-table-column prop="rqtype" label="成功率"/>
-          <el-table-column prop="rqtype" label="质量"/>
         </el-table>
       </div>
         <el-dialog @close="clearAdd" v-model="dialogVisible" title="" width="60%" destroy-on-close :key="tableKey">
@@ -190,680 +202,131 @@
   </div>
 </template>
 <script   setup>
-import {getCatalog} from "@/api/service/catalog";
-import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
-import { reactive } from 'vue'
-import { modelTreeSelect,getSerDe,addService,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,testLog } from "@/api/service/info";
-import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
-import JsonViewer from 'vue-json-viewer'
-import 'vue-json-viewer/style.css' 
-import  JsonEditorVue from 'json-editor-vue3'
-import { cloneDeep } from 'lodash'
-import { useClipboard } from "@vueuse/core";
+import { getQuality } from "@/api/service/info";
+
+const timeMon = ref('')
+const timeYear = ref('')
+const activeName = ref('first')
+const tableData = ref ([])
 
-const titleTest = ref('')
-const { proxy } = getCurrentInstance();
-const JsonAdd= ref(JSON.stringify({ data: "初始值1" }))
-const exampleAdd = ref('')
-const dialogVisibleLevel = ref(false)
-const dialogVisibleDe = ref(false) 
-const detail = ref({
-  name:'',
-  rqtype:'',
-  rptype:''
-})
-const tableDataLog = ref([])
-const show1Lev = ref(true)
-const inputNode =ref('')
-const isEdit = ref(true)
-const time = ref('')
-const dataReturn = ref('')
-const optionsCan = ref([
-  {
-    label:"string",
-    value:'string'
-  },
-  {
-    label:"int",
-    value:'int'
-  },
-  {
-    label:"boolean",
-    value:'boolean'
-  },
-  {
-    label:"array",
-    value:'array'
-  },
-  {
-    label:"object",
-    value:'object'
-  },
-  {
-    label:"number",
-    value:'number'
-  },
-  {
-    label:"null",
-    value:'null'
-  },
-  {
-    label:"any",
-    value:'any'
-  },
+function getWeekRange(date = new Date()) {
+  // 获取传入日期是本周的第几天(0是周日,1是周一,...,6是周六)
+  const dayOfWeek = date.getDay();
+  // 计算与本周第一天的天数差。如果今天是周日(0),则上周一需要减6天;否则减(当前星期数-1)天。
+  const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek;
   
-])
-const currentNodeKey = ref('')
-const options =  ref([
-    {label:'开发中',
-    value:'1'
-    },
-    {label:'运行中',
-    value:'2'
-    },
-])
-const dataJsonXiang = ref([])
-const parTree = ref({})
-const valueKet = ref(0)
-const tableDataCan = ref([
-    {
-      itemName:'',
-      itemCode:'',
-      paramType:'',
-      paramNote:''
-    }
-])
-const dialogVisibleTest = ref(false)
-const optionsMdid = ref([])
-const optionsRqtype = ref([
-    {label:'GET',
-    value:'GET'
-    },
-    {label:'POST',
-    value:'POST'
-    },
-])
-const optionsType=  ref([
-    {label:'RESTful',
-    value:'RESTful'
-    },
-    {label:'WebService',
-    value:'WebService'
-    },
-    {label:'HTTP',
-    value:'HTTP'
-    },
-    {label:'WebSocket',
-    value:'WebSocket'
-    },
-])
-const data =  ref([])
-const select =  ref('1')
-const activeName =  ref('first')
-const title =  ref('')
-const titleTree =  ref('')
-const currentPage =  ref(1)
-const total =  ref(1)
-const tableData = ref([])
-const tableheight = window.innerHeight*0.7
-const heightAll = window.innerHeight
-const dialogVisible = ref(false)
-const dialogVisibleTree = ref(false)
-const isAdd = ref(false)
-const isAddTa = ref(false)
-const treeId = ref('');
-const valueSta = ref('1');
-const parMdid = ref('')
-const example = ref('');
-const tableDataCanAdd = ref([
-  {
-      itemName:'',
-      itemCode:'',
-      paramType:'',
-      paramNote:''
-    }
-])
-const formZu = ref({
-  itemName:'',
-  itemTp:'',
-  itemEn:'',
-  itemTp:'',
-  itemDataTp:'',
-  itemDefaultVal:'',
-  itemUnit:'',
-  itemNotes:'',
-});
-const parId= ref('')
-const formJi = ref({
-  name:'',
-  cateCode:'',
-  type:'',
-  url:'',
-  rqtype:'',
-  rptype:'',
-  intro:'',
-});
-const rulesJi = reactive({
-  name: [{ required: true, message: '必填', trigger: 'blur' }],
-  url: [{ required: true, message: '必填', trigger: 'blur' }],
-  cateCode: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefJi = ref();
-const formAdd = ref({
-  name:'',
-  cateCode:'',
-  type:'',
-  url:'',
-  rqtype:'',
-  rptype:'',
-  intro:'',
-  mdid:''
-});
-const rulesAdd = reactive({
-  mdid: [{ required: true, message: '必填', trigger: 'blur' }],
-  name: [{ required: true, message: '必填', trigger: 'blur' }],
-  url: [{ required: true, message: '必填', trigger: 'blur' }],
-  cateCode: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefAdd = ref();
-const treeRef = ref(null);
-const formTree = ref({
-  itemName:'',
-  catePid:'',
-  itemNo:'',
-  itemNotes:''
-});
-const rulesTree = reactive({
-  itemNo: [{ required: true, message: '必填', trigger: 'blur' }],
-  catePid: [{ required: true, message: '必填', trigger: 'blur' }],
-  itemName: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefTree = ref();
-const formLev = ref({
-  itemName:'',
-  itemNo:'',
-  itemNotes:'',
-});
-const rulesLev = reactive({
-  itemNotes: [{ required: true, message: '必填', trigger: 'blur' }],
-  itemNo: [{ required: true, message: '必填', trigger: 'blur' }],
-  itemName: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefLev = ref();
-const cascaderOptions = ref([])
-const props1 = ref({
-  checkStrictly: true,
-})
-const detailJson = ref('')
-const parOptions = ref([])
-watch(inputNode, (val) => {
-  treeRef.value?.filter(val); // 调用树的过滤方法
-});
-const filterNode = (value, data) => {
-  if (!value) return true; // 空搜索时显示所有节点
-  return data.label.includes(value); // 检查节点标签是否包含关键字
-};
+  // 计算本周一的日期
+  const monday = new Date(date);
+  monday.setDate(date.getDate() + diffToMonday);
+  
+  // 计算本周日的日期(周一加6天)
+  const sunday = new Date(monday);
+  sunday.setDate(monday.getDate() + 6);
 
-const copied = ref(false);
-function showLog(row){
-  dialogVisibleLevel.value = true
-  var par = {
-    serId:row.srvId
+  // 格式化日期为 "YYYY-MM-DD"
+  function formatDate(dateObj) {
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0'); // 月份从0开始,需+1
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
   }
-  testLog(par).then(res=>{
-    tableDataLog.value = res.rows
-  })
-}
-function test(){
-  var par = detailJson.value
-  par.params = tableDataCan.value
-  testService(par).then(res=>{
-    console.log(res)
-    dataReturn.value = res.msg
-    var par1  = {
-      data:{id:parMdid.value}
-    }
-    handleNodeClick(null,par1,null)
-  })
-}
-function testSer(row){
-  getSerDe(row.srvId).then(res=>{
-    if(res.code===200){
-      detailJson.value = res.data.ptService
-      console.log(detailJson.value)
-      dialogVisibleTest.value = true
-      tableDataCan.value = res.data.list
-    }
-  })
-}
-function showDe(row){
-  getSerDe(row.srvId).then(res=>{
-    if(res.code===200){
-      dialogVisibleDe.value = true
-      parOptions.value.forEach(item=>{
-        if(res.data.ptService.cateCode === item.cateCode){
-          res.data.ptService.cateCode = item.cateName
-        }
-      })
-      if(res.data.ptService.rptype === '1'){
-        res.data.ptService.rptype = 'JSON'
-      }
-      if(res.data.ptService.rptype === '2'){
-        res.data.ptService.rptype = 'XML'
-      }
-      if(res.data.ptService.rptype === '3'){
-        res.data.ptService.rptype = 'HTML'
-      }
-      formJi.value = res.data.ptService
-    }
-  })
+
+  return {
+    startOfWeek: formatDate(monday), // 本周开始日期 (周一)
+    endOfWeek: formatDate(sunday)    // 本周结束日期 (周日)
+  };
 }
-function filterModelNodes(nodes) {
-  if (!Array.isArray(nodes)) return [];
-  
-  const result = [];
-  for (const node of nodes) {
-    // 递归处理子节点(如果有)
-    const filteredChildren = node.children ? filterModelNodes(node.children) : [];
+function getLastDayOfMonth(firstDay) {
+    // 从第一天字符串解析年月
+    const [year, month] = firstDay.split('-').map(Number);
     
-    if (node.nodeType === 'MODEL') {
-      // 保留当前节点,并更新其子节点
-      node.value = node.id
-      result.push({
-        ...node,
-        children: filteredChildren
-      });
-    } else {
-      // 删除当前节点,将其子节点提升到当前层级
-      result.push(...filteredChildren);
-    }
-  }
-  return result;
-}
-function clearAdd(){
-  tableDataCan.value = [
-  ]
-  dataReturn.value = ''
-}
-function extractModelNodesDFSIterative(root) {
-  const result = [];
-  const stack = root;
-  
-  while (stack.length > 0) {
-    const node = stack.pop();
-    if (node.nodeType === 'MODEL') {
-      result.push(node);
-    }
+    // 创建下个月第一天的日期对象
+    const nextMonthFirstDay = new Date(year, month, 1); // month是1-12,JS会自动处理跨年
     
-    // 子节点逆序入栈(保证从左到右遍历)
-    if (node.children) {
-      for (let i = node.children.length - 1; i >= 0; i--) {
-        stack.push(node.children[i]);
-      }
-    }
-  }
-  return result;
-}
-function delAll(){
-  proxy.$modal.confirm('是否确认删除?').then(function () {
-    return deTree(parTree.value.id);
-  }).then(() => {
-    getTreeLeft();
-    proxy.$modal.msgSuccess("删除成功");
-    dialogVisibleLevel.value = false
-  }).catch(() => {});
-}
-function clearFromLev(){
-  tableDataLog.value = []
-}
-function addNextLevel(){
-  dialogVisibleLevel.value = true
-  show1Lev.value = false
-}
-function saveAddNextLevel(){
-   formRefLev.value.validate((valid) => {
-    if(valid){
-      var par = formLev.value
-      par.treeType = 'MODEL'
-      par.treePid = parTree.value.id
-      addTree(par).then(res=>{
-        if(res.code===200){
-          proxy.$modal.msgSuccess("新增成功");
-          getTreeLeft()
-          dialogVisibleLevel.value = false
-        }
-      })
-    }
-  });
-}
-function add1Level(){
-  dialogVisibleLevel.value = true
-  show1Lev.value = true
-}
-function saveAdd1Level(){
-  formRefLev.value.validate((valid) => {
-    if(valid){
-      var par = formLev.value
-      par.treeType = 'MODEL'
-      par.treePid = parTree.value.pid
-      addTree(par).then(res=>{
-        if(res.code===200){
-          proxy.$modal.msgSuccess("新增成功");
-          getTreeLeft()
-          dialogVisibleLevel.value = false
-        }
-      })
-    }
-  });
-}
-async function delSer(){
-  proxy.$modal.confirm('是否确认删除?').then(function () {
-    return delService(parId.value.id);
-  }).then(() => {
-    getTreeLeft();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
-}
-async function addSer(){
-  console.log(JsonAdd.value)
-  var valid
-  await formRefAdd.value.validate((valid1) => {
-    valid = valid1
-  });
-  console.log(valid) 
-  if(valid){
-    var par = formAdd.value
-    par.example = exampleAdd.value
-    par.rpcontent = JsonAdd.value
-    par.cateCode = par.cateCode[0]
-    console.log(par)
-
-    await addService(par).then(res=>{
-      if(res.code===200){
-        var parCan = tableDataCanAdd.value
-        parCan.srvId = res.data.srvId
-        addServiceParam(parCan).then(res1=>{
-          if(res1.code===200){
-            proxy.$modal.msgSuccess("新增成功");
-            getTreeLeft()
-          }
-        })
-      }
-    })
+    // 获取当月最后一天(下个月第一天减1毫秒)
+    const lastDay = new Date(nextMonthFirstDay - 1);
     
+    // 格式化输出
+    const lastDayYear = lastDay.getFullYear();
+    const lastDayMonth = (lastDay.getMonth() + 1).toString().padStart(2, '0');
+    const lastDayDate = lastDay.getDate().toString().padStart(2, '0');
     
-  }
-
+    return `${lastDayYear}-${lastDayMonth}-${lastDayDate}`;
 }
-function showAdd(){
-  dialogVisible.value = true
+function getLastDayOfYear(firstDay) {
+    // 从输入字符串中提取年份
+    const year = parseInt(firstDay.split('-')[0]);
+    
+    // 计算下一年度的第一天
+    const nextYearFirstDay = new Date(year + 1, 0, 1); // 月份0代表1月
+    
+    // 计算本年度的最后一天(下一年第一天减去1毫秒)
+    const lastDay = new Date(nextYearFirstDay.getTime() - 1);
+    
+    // 格式化为 YYYY-MM-DD
+    const lastDayYear = lastDay.getFullYear();
+    const lastDayMonth = String(lastDay.getMonth() + 1).padStart(2, '0'); // 月份从0开始,需+1
+    const lastDayDate = String(lastDay.getDate()).padStart(2, '0');
+    
+    return `${lastDayYear}-${lastDayMonth}-${lastDayDate}`;
 }
-async function handleNodeClick(node,data,event){
-  // parTree.value = data.data
-  // currentNodeKey.value = data.data.id
- 
-  // isEdit.value = false
-  // parId.value = data.data
-  // await getSerDe(data.data.id).then(res=>{
-  //   if(res.data.ptService){
-  //     detail.value = res.data.ptService
-  //     tableDataCan.value = res.data.list
-  //     dataReturn.value = res.data.returnList
-  //     console.log(tableDataCan.value)
-  //     dataJsonXiang.value = res.data.ptService.rpcontent
-  //     formJi.value = res.data.ptService
-  //     example.value = res.data.ptService.example
-  //   }
+const getFirstDayOfMonthShort = () => {
+    const now = new Date();
+    return `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-01`;
+};
+function getFirstDayOfYear() {
+    const currentYear = new Date().getFullYear();
+    const firstDay = new Date(currentYear, 0, 1);
     
-  // })
-  console.log(data)
-  titleTest.value = data.data.label
-  parMdid.value = data.data.id
-  var par = {
-    mdid:data.data.id
-  }
-  console.log(data.data.id)
-  await getServiceInfo(par).then(res=>{
-    if(res.data){
-      tableData.value = res.data.serviceList
-      
-    }
-  })
-  parOptions.value.forEach(option => {
-    option.label = option.cateName;
-    option.value = option.cateCode;
-  });
-  console.log(parOptions.value)
-  for(var i = 0; i < parOptions.value.length; i++){
-    for(var i1 = 0; i1 < tableData.value.length; i1++){
-      console.log(i1);
-      if(parOptions.value[i].value === tableData.value[i1].cateCode){
-         tableData.value[i1].cateCode = parOptions.value[i].label
-      }
-    }
-  }
-  var par = [
-    {
-      value:'1',
-      label:'JSON'
-    },
-    {
-      value:'2',
-      label:'XML'
-    },
-    {
-      value:'3',
-      label:'HTML'
-    }
-  ]
-  for(var i = 0; i < par.length; i++){
-    for(var i1 = 0; i1 < tableData.value.length; i1++){
-      if(par[i].value === tableData.value[i1].rptype){
-         tableData.value[i1].rptype = par[i].label
-      }
-    }
-  }
+    // 格式化为 YYYY-MM-DD
+    const year = firstDay.getFullYear();
+    const month = String(firstDay.getMonth() + 1).padStart(2, '0');
+    const day = String(firstDay.getDate()).padStart(2, '0');
+    
+    return `${year}-${month}-${day}`;
 }
-async function getTreeLeft(){
+function setDate(){
+  timeMon.value = getFirstDayOfMonthShort()
+  timeYear.value = getFirstDayOfYear()
+}
+function getQualityList(){
+  
   var par = {
+    devkind:'APP',
     params:{
-      level:'2',
-      devkind:'APP'
+      beginTime:'',
+      endTime:''
     }
   }
-  await modelTreeSelect(par).then(res=>{
-    par = res.data
-    data.value = res.data
-    
-  })
-  optionsMdid.value = filterModelNodes(par)
-  console.log(optionsMdid.value)
-}
-function renameTreeProperties(tree) {
-  // 深拷贝避免修改原始数据(可选,根据需求)
-  const newTree = cloneDeep(tree); // 使用 lodash
-  // 或:const newTree = JSON.parse(JSON.stringify(tree)); // 原生方法(不兼容函数等)
-
-  // 递归处理函数
-  const processNode = (node) => {
-    // 重命名属性
-    if ('cateName' in node) {
-      node.label = node.cateName;
-      delete node.cateName;
-    }
-    if ('cateCode' in node) {
-      node.value = node.cateCode;
-      delete node.cateCode;
-    }
-
-    // 递归处理子节点
-    if (node.children && node.children.length > 0) {
-      node.children.forEach(child => processNode(child));
-    }
-  };
-
-  // 遍历根节点
-  newTree.forEach(rootNode => processNode(rootNode));
-  return newTree;
-}
-function fetchData() {
-  getCatalog().then((r) => {
-    parOptions.value = r.data
-    cascaderOptions.value = renameTreeProperties(buildTree(r.data))
-    console.log(parOptions.value)
-  });
+  if(activeName.value=='first'){
+    const weekRange = getWeekRange()
+    par.params.beginTime=weekRange.startOfWeek
+    par.params.endTime=weekRange.endOfWeek
+    getQuality(par).then((res)=>{
+      tableData.value=res.data
+    })
+  }else if(activeName.value=='second'){
+    par.params.beginTime=timeMon.value
+    par.params.endTime=getLastDayOfMonth(timeMon.value)
+    getQuality(par).then((res)=>{
+      tableData.value=res.data
+    })
+  }else if(activeName.value=='third'){
+    par.params.beginTime=timeYear.value
+    par.params.endTime=getLastDayOfYear(timeYear.value)
+    getQuality(par).then((res)=>{
+      tableData.value=res.data
+    })
+  }
+  
 }
-function buildTree(flatData, rootValue = '0') {
-      const nodeMap = new Map();
-      const tree = [];
-      flatData.forEach(item => {
-        nodeMap.set(item.cateCode, { ...item, children: [] });
-      });
-      for (const [code, node] of nodeMap) {
-        const parentCode = node.catePcode;
-        if (parentCode === rootValue || !parentCode) {
-          tree.push(node);
-          continue;
-        }
-        const parent = nodeMap.get(parentCode);
-        if (parent) {
-          parent.children.push(node);
-        } else {
-          console.warn(`Orphan node detected: ${code}. Parent ${parentCode} not found`);
-        }
-      }
 
-      return tree;
-    }
-function addPa(){
-    var par = {
-        itemName:''
-    }
-    tableDataCan.value.push(par)
-}
-function delCan(index){
-  tableDataCan.value.splice(index, 1)
-}
-function addCanAdd(){
-    var par = {
-        parName:''
-    }
-    tableDataCanAdd.value.push(par)
-}
-function delCanAdd(index){
-  tableDataCanAdd.value.splice(index, 1)
-}
 onMounted(() => {
-  fetchData()
-  getTreeLeft()
+  setDate()
+  getQualityList();
 });
 
 </script>
 <style scoped>
 
-.noBorSel :deep(.el-select__wrapper){
-  box-shadow: none !important; /* 去除阴影边框 */
-  border: 1px solid transparent !important; /* 设置透明边框 */
-  background-color: transparent !important; /* 可选:透明背景 */
-}
-.noBor :deep(.el-input__wrapper) {
-  box-shadow: none !important; /* 去除阴影边框 */
-  border: 1px solid transparent !important; /* 设置透明边框 */
-  background-color: transparent !important; /* 可选:透明背景 */
-}
-/* 节点垂直间距 */
-:deep(.el-tree-node) {
-  margin-bottom:5px !important; /* 增大节点间距 */
-}
-.el-popover.custom-popover {
-  min-width: 50px;
-  padding: 8px; /* 可选:调整内边距 */
-}
-</style>
-<style>
-.dot {
-  width: 20px;          /* 控制圆点直径 */
-  height: 20px;
-  background-color: #333; /* 实心颜色 */
-  border-radius: 50%;    /* 关键属性 */
-  display: inline-block; /* 确保与其他元素并排 */
-}
-/* 全局透明样式(不使用 scoped) */
-.transparent-select .el-select__wrapper {
-  background-color: transparent !important;
-  border-color: transparent !important;
-  box-shadow: none !important;
-}
-
-.transparent-select .el-select__selection {
-  background-color: transparent;
-}
-
-/* 处理悬停和聚焦状态 */
-.transparent-select .el-select__wrapper:hover,
-.transparent-select .el-select__wrapper.is-focused {
-  border-color: transparent !important;
-  box-shadow: none !important;
-}
-
-/* 下拉箭头图标 */
-.transparent-select .el-select__caret {
-  color: rgba(0, 0, 0, 0.5); /* 半透明图标 */
-}
-</style>
-<style scoped>
-:deep(.treeLeft) .el-tree-node__content {
-  display: flex !important;
-  height: 28px;                  /* 按设计稿调整高度 */
-  align-items: center;
-  padding-top: 0 !important;
-}
-:deep(.treeLeft) .el-tree-node__content:hover {
-  background-color: #e9e9eb;
-}
-:deep(.treeLeft) .el-tree-node__content:active {
-    background-color: rgka(69,157,255,0.1) !important;
-  }
-
-  /* 选中态(Active) */
-:deep(.treeLeft) .el-tree-node.is-current > .el-tree-node__content {
-    background-color: #c6e2ff !important;
-  }
-
-.tab-container {
-  height: 100vh; /* 关键:父容器明确高度 */
-  display: flex;
-  flex-direction: column;
-}
-.drag-handle {
-  cursor: move;
-}
-
-.ghost {
-  opacity: 0.5;
-  background: #c8ebfb;
-}
-
-/* 防止文字选中 */
-:deep(.el-table__row) {
-  user-select: none;
-  -webkit-user-select: none;
-}
-</style>
-<style scoped lang="scss">
-
-.custom-tree-node {
-  display: flex;       /* 启用 Flex 布局 */
-  align-items: center; /* 垂直居中 */
-  gap: 8px;            /* 图标与文字间距 */
-  justify-content: space-between;
-}
-.el-table .el-table__row td {
-  height: 60px !important; /* 行高 */
-}
-.custom-tree-node {
-  display: flex;       /* 启用 Flex 布局 */
-  align-items: center; /* 垂直居中 */
-  gap: 8px;            /* 图标与文字间距 */
-}
 </style>

+ 127 - 664
ruoyi-ui/src/views/evaluate/xiaolv.vue

@@ -5,15 +5,19 @@
         <div style="position: absolute;left: 80%;z-index: 1000;">
             <div>
                 <el-date-picker
-                v-model="time"
+                v-model="timeYear"
                 type="year"
                 v-if="activeName=='third'"
+                value-format="YYYY-MM-DD"
+                @change="getEfficiencyList"
                 placeholder="请选择年份"
                 />
                 <el-date-picker
-                v-model="time"
+                v-model="timeMon"
                 type="month"
                 v-if="activeName=='second'"
+                value-format="YYYY-MM-DD"
+                @change="getEfficiencyList"
                 placeholder="请选择月份"
                 />
             </div>
@@ -22,7 +26,7 @@
         v-model="activeName"
         type="card"
         class="demo-tabs"
-        @tab-click="handleClick"
+        @tab-click="getEfficiencyList"
         >
             <el-tab-pane label="周" name="first"></el-tab-pane>
             <el-tab-pane label="月" name="second"></el-tab-pane>
@@ -30,7 +34,7 @@
         </el-tabs>
         <el-table 
           :data="tableData" 
-          style="width: 100%;margin-left: 0%;margin-top: -0.8%;"
+          style="width: 100%;margin-left: 0%;margin-top: -0.8%;height: 80vh;"
           :cell-style="{ padding:'5px' }"
           :header-cell-style="{height: heightAll*0.01+'px',}"
           :row-style="{ fontSize: '16px',textAlign:'center'}"
@@ -42,19 +46,27 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="模型名称"  width="200">
+          <el-table-column prop="mdName" label="模型名称"  width="250">
+          </el-table-column>
+          <el-table-column prop="statisNum" label="调用次数"  show-overflow-tooltip/>
+          <el-table-column prop="statisNum" label="时长"/>
+          <el-table-column prop="rate" label="评价时长"/>
+          <el-table-column prop="rateLv" label="效率">
             <template #default="scope">
-              <div style="color: #409EFF;cursor: pointer;" @click="showDe(scope.row)">
-                {{scope.row.name}}
+              <div style="color:#67C23A" v-if="scope.row.rateLv==='优'">
+                {{ scope.row.rateLv }}
+              </div>
+              <div style="color:#67C23A" v-if="scope.row.rateLv==='良'">
+                {{ scope.row.E6A23C }}
+              </div>
+              <div style="color:#909399" v-if="scope.row.rateLv==='中'">
+                {{ scope.row.rateLv }}
+              </div>
+              <div style="color:#F56C6C" v-if="scope.row.rateLv==='差'">
+                {{ scope.row.rateLv }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="type" label="统计时间">
-          </el-table-column>
-          <el-table-column prop="url" label="调用次数"  show-overflow-tooltip/>
-          <el-table-column prop="rqtype" label="时长"/>
-          <el-table-column prop="rqtype" label="评价时长"/>
-          <el-table-column prop="rqtype" label="效率"/>
         </el-table>
       </div>
         <el-dialog @close="clearAdd" v-model="dialogVisible" title="" width="60%" destroy-on-close :key="tableKey">
@@ -190,680 +202,131 @@
   </div>
 </template>
 <script   setup>
-import {getCatalog} from "@/api/service/catalog";
-import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
-import { reactive } from 'vue'
-import { modelTreeSelect,getSerDe,addService,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,testLog } from "@/api/service/info";
-import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
-import JsonViewer from 'vue-json-viewer'
-import 'vue-json-viewer/style.css' 
-import  JsonEditorVue from 'json-editor-vue3'
-import { cloneDeep } from 'lodash'
-import { useClipboard } from "@vueuse/core";
+import { getEfficiency } from "@/api/service/info";
+
+const timeMon = ref('')
+const timeYear = ref('')
+const activeName = ref('first')
+const tableData = ref ([])
 
-const titleTest = ref('')
-const { proxy } = getCurrentInstance();
-const JsonAdd= ref(JSON.stringify({ data: "初始值1" }))
-const exampleAdd = ref('')
-const dialogVisibleLevel = ref(false)
-const dialogVisibleDe = ref(false) 
-const detail = ref({
-  name:'',
-  rqtype:'',
-  rptype:''
-})
-const tableDataLog = ref([])
-const show1Lev = ref(true)
-const inputNode =ref('')
-const isEdit = ref(true)
-const time = ref('')
-const dataReturn = ref('')
-const optionsCan = ref([
-  {
-    label:"string",
-    value:'string'
-  },
-  {
-    label:"int",
-    value:'int'
-  },
-  {
-    label:"boolean",
-    value:'boolean'
-  },
-  {
-    label:"array",
-    value:'array'
-  },
-  {
-    label:"object",
-    value:'object'
-  },
-  {
-    label:"number",
-    value:'number'
-  },
-  {
-    label:"null",
-    value:'null'
-  },
-  {
-    label:"any",
-    value:'any'
-  },
+function getWeekRange(date = new Date()) {
+  // 获取传入日期是本周的第几天(0是周日,1是周一,...,6是周六)
+  const dayOfWeek = date.getDay();
+  // 计算与本周第一天的天数差。如果今天是周日(0),则上周一需要减6天;否则减(当前星期数-1)天。
+  const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek;
   
-])
-const currentNodeKey = ref('')
-const options =  ref([
-    {label:'开发中',
-    value:'1'
-    },
-    {label:'运行中',
-    value:'2'
-    },
-])
-const dataJsonXiang = ref([])
-const parTree = ref({})
-const valueKet = ref(0)
-const tableDataCan = ref([
-    {
-      itemName:'',
-      itemCode:'',
-      paramType:'',
-      paramNote:''
-    }
-])
-const dialogVisibleTest = ref(false)
-const optionsMdid = ref([])
-const optionsRqtype = ref([
-    {label:'GET',
-    value:'GET'
-    },
-    {label:'POST',
-    value:'POST'
-    },
-])
-const optionsType=  ref([
-    {label:'RESTful',
-    value:'RESTful'
-    },
-    {label:'WebService',
-    value:'WebService'
-    },
-    {label:'HTTP',
-    value:'HTTP'
-    },
-    {label:'WebSocket',
-    value:'WebSocket'
-    },
-])
-const data =  ref([])
-const select =  ref('1')
-const activeName =  ref('first')
-const title =  ref('')
-const titleTree =  ref('')
-const currentPage =  ref(1)
-const total =  ref(1)
-const tableData = ref([])
-const tableheight = window.innerHeight*0.7
-const heightAll = window.innerHeight
-const dialogVisible = ref(false)
-const dialogVisibleTree = ref(false)
-const isAdd = ref(false)
-const isAddTa = ref(false)
-const treeId = ref('');
-const valueSta = ref('1');
-const parMdid = ref('')
-const example = ref('');
-const tableDataCanAdd = ref([
-  {
-      itemName:'',
-      itemCode:'',
-      paramType:'',
-      paramNote:''
-    }
-])
-const formZu = ref({
-  itemName:'',
-  itemTp:'',
-  itemEn:'',
-  itemTp:'',
-  itemDataTp:'',
-  itemDefaultVal:'',
-  itemUnit:'',
-  itemNotes:'',
-});
-const parId= ref('')
-const formJi = ref({
-  name:'',
-  cateCode:'',
-  type:'',
-  url:'',
-  rqtype:'',
-  rptype:'',
-  intro:'',
-});
-const rulesJi = reactive({
-  name: [{ required: true, message: '必填', trigger: 'blur' }],
-  url: [{ required: true, message: '必填', trigger: 'blur' }],
-  cateCode: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefJi = ref();
-const formAdd = ref({
-  name:'',
-  cateCode:'',
-  type:'',
-  url:'',
-  rqtype:'',
-  rptype:'',
-  intro:'',
-  mdid:''
-});
-const rulesAdd = reactive({
-  mdid: [{ required: true, message: '必填', trigger: 'blur' }],
-  name: [{ required: true, message: '必填', trigger: 'blur' }],
-  url: [{ required: true, message: '必填', trigger: 'blur' }],
-  cateCode: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefAdd = ref();
-const treeRef = ref(null);
-const formTree = ref({
-  itemName:'',
-  catePid:'',
-  itemNo:'',
-  itemNotes:''
-});
-const rulesTree = reactive({
-  itemNo: [{ required: true, message: '必填', trigger: 'blur' }],
-  catePid: [{ required: true, message: '必填', trigger: 'blur' }],
-  itemName: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefTree = ref();
-const formLev = ref({
-  itemName:'',
-  itemNo:'',
-  itemNotes:'',
-});
-const rulesLev = reactive({
-  itemNotes: [{ required: true, message: '必填', trigger: 'blur' }],
-  itemNo: [{ required: true, message: '必填', trigger: 'blur' }],
-  itemName: [{ required: true, message: '必填', trigger: 'blur' }],
-});
-const formRefLev = ref();
-const cascaderOptions = ref([])
-const props1 = ref({
-  checkStrictly: true,
-})
-const detailJson = ref('')
-const parOptions = ref([])
-watch(inputNode, (val) => {
-  treeRef.value?.filter(val); // 调用树的过滤方法
-});
-const filterNode = (value, data) => {
-  if (!value) return true; // 空搜索时显示所有节点
-  return data.label.includes(value); // 检查节点标签是否包含关键字
-};
+  // 计算本周一的日期
+  const monday = new Date(date);
+  monday.setDate(date.getDate() + diffToMonday);
+  
+  // 计算本周日的日期(周一加6天)
+  const sunday = new Date(monday);
+  sunday.setDate(monday.getDate() + 6);
 
-const copied = ref(false);
-function showLog(row){
-  dialogVisibleLevel.value = true
-  var par = {
-    serId:row.srvId
+  // 格式化日期为 "YYYY-MM-DD"
+  function formatDate(dateObj) {
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0'); // 月份从0开始,需+1
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
   }
-  testLog(par).then(res=>{
-    tableDataLog.value = res.rows
-  })
-}
-function test(){
-  var par = detailJson.value
-  par.params = tableDataCan.value
-  testService(par).then(res=>{
-    console.log(res)
-    dataReturn.value = res.msg
-    var par1  = {
-      data:{id:parMdid.value}
-    }
-    handleNodeClick(null,par1,null)
-  })
-}
-function testSer(row){
-  getSerDe(row.srvId).then(res=>{
-    if(res.code===200){
-      detailJson.value = res.data.ptService
-      console.log(detailJson.value)
-      dialogVisibleTest.value = true
-      tableDataCan.value = res.data.list
-    }
-  })
-}
-function showDe(row){
-  getSerDe(row.srvId).then(res=>{
-    if(res.code===200){
-      dialogVisibleDe.value = true
-      parOptions.value.forEach(item=>{
-        if(res.data.ptService.cateCode === item.cateCode){
-          res.data.ptService.cateCode = item.cateName
-        }
-      })
-      if(res.data.ptService.rptype === '1'){
-        res.data.ptService.rptype = 'JSON'
-      }
-      if(res.data.ptService.rptype === '2'){
-        res.data.ptService.rptype = 'XML'
-      }
-      if(res.data.ptService.rptype === '3'){
-        res.data.ptService.rptype = 'HTML'
-      }
-      formJi.value = res.data.ptService
-    }
-  })
+
+  return {
+    startOfWeek: formatDate(monday), // 本周开始日期 (周一)
+    endOfWeek: formatDate(sunday)    // 本周结束日期 (周日)
+  };
 }
-function filterModelNodes(nodes) {
-  if (!Array.isArray(nodes)) return [];
-  
-  const result = [];
-  for (const node of nodes) {
-    // 递归处理子节点(如果有)
-    const filteredChildren = node.children ? filterModelNodes(node.children) : [];
+function getLastDayOfMonth(firstDay) {
+    // 从第一天字符串解析年月
+    const [year, month] = firstDay.split('-').map(Number);
     
-    if (node.nodeType === 'MODEL') {
-      // 保留当前节点,并更新其子节点
-      node.value = node.id
-      result.push({
-        ...node,
-        children: filteredChildren
-      });
-    } else {
-      // 删除当前节点,将其子节点提升到当前层级
-      result.push(...filteredChildren);
-    }
-  }
-  return result;
-}
-function clearAdd(){
-  tableDataCan.value = [
-  ]
-  dataReturn.value = ''
-}
-function extractModelNodesDFSIterative(root) {
-  const result = [];
-  const stack = root;
-  
-  while (stack.length > 0) {
-    const node = stack.pop();
-    if (node.nodeType === 'MODEL') {
-      result.push(node);
-    }
+    // 创建下个月第一天的日期对象
+    const nextMonthFirstDay = new Date(year, month, 1); // month是1-12,JS会自动处理跨年
     
-    // 子节点逆序入栈(保证从左到右遍历)
-    if (node.children) {
-      for (let i = node.children.length - 1; i >= 0; i--) {
-        stack.push(node.children[i]);
-      }
-    }
-  }
-  return result;
-}
-function delAll(){
-  proxy.$modal.confirm('是否确认删除?').then(function () {
-    return deTree(parTree.value.id);
-  }).then(() => {
-    getTreeLeft();
-    proxy.$modal.msgSuccess("删除成功");
-    dialogVisibleLevel.value = false
-  }).catch(() => {});
-}
-function clearFromLev(){
-  tableDataLog.value = []
-}
-function addNextLevel(){
-  dialogVisibleLevel.value = true
-  show1Lev.value = false
-}
-function saveAddNextLevel(){
-   formRefLev.value.validate((valid) => {
-    if(valid){
-      var par = formLev.value
-      par.treeType = 'MODEL'
-      par.treePid = parTree.value.id
-      addTree(par).then(res=>{
-        if(res.code===200){
-          proxy.$modal.msgSuccess("新增成功");
-          getTreeLeft()
-          dialogVisibleLevel.value = false
-        }
-      })
-    }
-  });
-}
-function add1Level(){
-  dialogVisibleLevel.value = true
-  show1Lev.value = true
-}
-function saveAdd1Level(){
-  formRefLev.value.validate((valid) => {
-    if(valid){
-      var par = formLev.value
-      par.treeType = 'MODEL'
-      par.treePid = parTree.value.pid
-      addTree(par).then(res=>{
-        if(res.code===200){
-          proxy.$modal.msgSuccess("新增成功");
-          getTreeLeft()
-          dialogVisibleLevel.value = false
-        }
-      })
-    }
-  });
-}
-async function delSer(){
-  proxy.$modal.confirm('是否确认删除?').then(function () {
-    return delService(parId.value.id);
-  }).then(() => {
-    getTreeLeft();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
-}
-async function addSer(){
-  console.log(JsonAdd.value)
-  var valid
-  await formRefAdd.value.validate((valid1) => {
-    valid = valid1
-  });
-  console.log(valid) 
-  if(valid){
-    var par = formAdd.value
-    par.example = exampleAdd.value
-    par.rpcontent = JsonAdd.value
-    par.cateCode = par.cateCode[0]
-    console.log(par)
-
-    await addService(par).then(res=>{
-      if(res.code===200){
-        var parCan = tableDataCanAdd.value
-        parCan.srvId = res.data.srvId
-        addServiceParam(parCan).then(res1=>{
-          if(res1.code===200){
-            proxy.$modal.msgSuccess("新增成功");
-            getTreeLeft()
-          }
-        })
-      }
-    })
+    // 获取当月最后一天(下个月第一天减1毫秒)
+    const lastDay = new Date(nextMonthFirstDay - 1);
     
+    // 格式化输出
+    const lastDayYear = lastDay.getFullYear();
+    const lastDayMonth = (lastDay.getMonth() + 1).toString().padStart(2, '0');
+    const lastDayDate = lastDay.getDate().toString().padStart(2, '0');
     
-  }
-
+    return `${lastDayYear}-${lastDayMonth}-${lastDayDate}`;
 }
-function showAdd(){
-  dialogVisible.value = true
+function getLastDayOfYear(firstDay) {
+    // 从输入字符串中提取年份
+    const year = parseInt(firstDay.split('-')[0]);
+    
+    // 计算下一年度的第一天
+    const nextYearFirstDay = new Date(year + 1, 0, 1); // 月份0代表1月
+    
+    // 计算本年度的最后一天(下一年第一天减去1毫秒)
+    const lastDay = new Date(nextYearFirstDay.getTime() - 1);
+    
+    // 格式化为 YYYY-MM-DD
+    const lastDayYear = lastDay.getFullYear();
+    const lastDayMonth = String(lastDay.getMonth() + 1).padStart(2, '0'); // 月份从0开始,需+1
+    const lastDayDate = String(lastDay.getDate()).padStart(2, '0');
+    
+    return `${lastDayYear}-${lastDayMonth}-${lastDayDate}`;
 }
-async function handleNodeClick(node,data,event){
-  // parTree.value = data.data
-  // currentNodeKey.value = data.data.id
- 
-  // isEdit.value = false
-  // parId.value = data.data
-  // await getSerDe(data.data.id).then(res=>{
-  //   if(res.data.ptService){
-  //     detail.value = res.data.ptService
-  //     tableDataCan.value = res.data.list
-  //     dataReturn.value = res.data.returnList
-  //     console.log(tableDataCan.value)
-  //     dataJsonXiang.value = res.data.ptService.rpcontent
-  //     formJi.value = res.data.ptService
-  //     example.value = res.data.ptService.example
-  //   }
+const getFirstDayOfMonthShort = () => {
+    const now = new Date();
+    return `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-01`;
+};
+function getFirstDayOfYear() {
+    const currentYear = new Date().getFullYear();
+    const firstDay = new Date(currentYear, 0, 1);
     
-  // })
-  console.log(data)
-  titleTest.value = data.data.label
-  parMdid.value = data.data.id
-  var par = {
-    mdid:data.data.id
-  }
-  console.log(data.data.id)
-  await getServiceInfo(par).then(res=>{
-    if(res.data){
-      tableData.value = res.data.serviceList
-      
-    }
-  })
-  parOptions.value.forEach(option => {
-    option.label = option.cateName;
-    option.value = option.cateCode;
-  });
-  console.log(parOptions.value)
-  for(var i = 0; i < parOptions.value.length; i++){
-    for(var i1 = 0; i1 < tableData.value.length; i1++){
-      console.log(i1);
-      if(parOptions.value[i].value === tableData.value[i1].cateCode){
-         tableData.value[i1].cateCode = parOptions.value[i].label
-      }
-    }
-  }
-  var par = [
-    {
-      value:'1',
-      label:'JSON'
-    },
-    {
-      value:'2',
-      label:'XML'
-    },
-    {
-      value:'3',
-      label:'HTML'
-    }
-  ]
-  for(var i = 0; i < par.length; i++){
-    for(var i1 = 0; i1 < tableData.value.length; i1++){
-      if(par[i].value === tableData.value[i1].rptype){
-         tableData.value[i1].rptype = par[i].label
-      }
-    }
-  }
+    // 格式化为 YYYY-MM-DD
+    const year = firstDay.getFullYear();
+    const month = String(firstDay.getMonth() + 1).padStart(2, '0');
+    const day = String(firstDay.getDate()).padStart(2, '0');
+    
+    return `${year}-${month}-${day}`;
 }
-async function getTreeLeft(){
+function setDate(){
+  timeMon.value = getFirstDayOfMonthShort()
+  timeYear.value = getFirstDayOfYear()
+}
+function getEfficiencyList(){
+  
   var par = {
+    devkind:'APP',
     params:{
-      level:'2',
-      devkind:'APP'
+      beginTime:'',
+      endTime:''
     }
   }
-  await modelTreeSelect(par).then(res=>{
-    par = res.data
-    data.value = res.data
-    
-  })
-  optionsMdid.value = filterModelNodes(par)
-  console.log(optionsMdid.value)
-}
-function renameTreeProperties(tree) {
-  // 深拷贝避免修改原始数据(可选,根据需求)
-  const newTree = cloneDeep(tree); // 使用 lodash
-  // 或:const newTree = JSON.parse(JSON.stringify(tree)); // 原生方法(不兼容函数等)
-
-  // 递归处理函数
-  const processNode = (node) => {
-    // 重命名属性
-    if ('cateName' in node) {
-      node.label = node.cateName;
-      delete node.cateName;
-    }
-    if ('cateCode' in node) {
-      node.value = node.cateCode;
-      delete node.cateCode;
-    }
-
-    // 递归处理子节点
-    if (node.children && node.children.length > 0) {
-      node.children.forEach(child => processNode(child));
-    }
-  };
-
-  // 遍历根节点
-  newTree.forEach(rootNode => processNode(rootNode));
-  return newTree;
-}
-function fetchData() {
-  getCatalog().then((r) => {
-    parOptions.value = r.data
-    cascaderOptions.value = renameTreeProperties(buildTree(r.data))
-    console.log(parOptions.value)
-  });
+  if(activeName.value=='first'){
+    const weekRange = getWeekRange()
+    par.params.beginTime=weekRange.startOfWeek
+    par.params.endTime=weekRange.endOfWeek
+    getEfficiency(par).then((res)=>{
+      tableData.value=res.data
+    })
+  }else if(activeName.value=='second'){
+    par.params.beginTime=timeMon.value
+    par.params.endTime=getLastDayOfMonth(timeMon.value)
+    getEfficiency(par).then((res)=>{
+      tableData.value=res.data
+    })
+  }else if(activeName.value=='third'){
+    par.params.beginTime=timeYear.value
+    par.params.endTime=getLastDayOfYear(timeYear.value)
+    getEfficiency(par).then((res)=>{
+      tableData.value=res.data
+    })
+  }
+  
 }
-function buildTree(flatData, rootValue = '0') {
-      const nodeMap = new Map();
-      const tree = [];
-      flatData.forEach(item => {
-        nodeMap.set(item.cateCode, { ...item, children: [] });
-      });
-      for (const [code, node] of nodeMap) {
-        const parentCode = node.catePcode;
-        if (parentCode === rootValue || !parentCode) {
-          tree.push(node);
-          continue;
-        }
-        const parent = nodeMap.get(parentCode);
-        if (parent) {
-          parent.children.push(node);
-        } else {
-          console.warn(`Orphan node detected: ${code}. Parent ${parentCode} not found`);
-        }
-      }
 
-      return tree;
-    }
-function addPa(){
-    var par = {
-        itemName:''
-    }
-    tableDataCan.value.push(par)
-}
-function delCan(index){
-  tableDataCan.value.splice(index, 1)
-}
-function addCanAdd(){
-    var par = {
-        parName:''
-    }
-    tableDataCanAdd.value.push(par)
-}
-function delCanAdd(index){
-  tableDataCanAdd.value.splice(index, 1)
-}
 onMounted(() => {
-  fetchData()
-  getTreeLeft()
+  setDate()
+  getEfficiencyList();
 });
 
 </script>
 <style scoped>
 
-.noBorSel :deep(.el-select__wrapper){
-  box-shadow: none !important; /* 去除阴影边框 */
-  border: 1px solid transparent !important; /* 设置透明边框 */
-  background-color: transparent !important; /* 可选:透明背景 */
-}
-.noBor :deep(.el-input__wrapper) {
-  box-shadow: none !important; /* 去除阴影边框 */
-  border: 1px solid transparent !important; /* 设置透明边框 */
-  background-color: transparent !important; /* 可选:透明背景 */
-}
-/* 节点垂直间距 */
-:deep(.el-tree-node) {
-  margin-bottom:5px !important; /* 增大节点间距 */
-}
-.el-popover.custom-popover {
-  min-width: 50px;
-  padding: 8px; /* 可选:调整内边距 */
-}
-</style>
-<style>
-.dot {
-  width: 20px;          /* 控制圆点直径 */
-  height: 20px;
-  background-color: #333; /* 实心颜色 */
-  border-radius: 50%;    /* 关键属性 */
-  display: inline-block; /* 确保与其他元素并排 */
-}
-/* 全局透明样式(不使用 scoped) */
-.transparent-select .el-select__wrapper {
-  background-color: transparent !important;
-  border-color: transparent !important;
-  box-shadow: none !important;
-}
-
-.transparent-select .el-select__selection {
-  background-color: transparent;
-}
-
-/* 处理悬停和聚焦状态 */
-.transparent-select .el-select__wrapper:hover,
-.transparent-select .el-select__wrapper.is-focused {
-  border-color: transparent !important;
-  box-shadow: none !important;
-}
-
-/* 下拉箭头图标 */
-.transparent-select .el-select__caret {
-  color: rgba(0, 0, 0, 0.5); /* 半透明图标 */
-}
-</style>
-<style scoped>
-:deep(.treeLeft) .el-tree-node__content {
-  display: flex !important;
-  height: 28px;                  /* 按设计稿调整高度 */
-  align-items: center;
-  padding-top: 0 !important;
-}
-:deep(.treeLeft) .el-tree-node__content:hover {
-  background-color: #e9e9eb;
-}
-:deep(.treeLeft) .el-tree-node__content:active {
-    background-color: rgka(69,157,255,0.1) !important;
-  }
-
-  /* 选中态(Active) */
-:deep(.treeLeft) .el-tree-node.is-current > .el-tree-node__content {
-    background-color: #c6e2ff !important;
-  }
-
-.tab-container {
-  height: 100vh; /* 关键:父容器明确高度 */
-  display: flex;
-  flex-direction: column;
-}
-.drag-handle {
-  cursor: move;
-}
-
-.ghost {
-  opacity: 0.5;
-  background: #c8ebfb;
-}
-
-/* 防止文字选中 */
-:deep(.el-table__row) {
-  user-select: none;
-  -webkit-user-select: none;
-}
-</style>
-<style scoped lang="scss">
-
-.custom-tree-node {
-  display: flex;       /* 启用 Flex 布局 */
-  align-items: center; /* 垂直居中 */
-  gap: 8px;            /* 图标与文字间距 */
-  justify-content: space-between;
-}
-.el-table .el-table__row td {
-  height: 60px !important; /* 行高 */
-}
-.custom-tree-node {
-  display: flex;       /* 启用 Flex 布局 */
-  align-items: center; /* 垂直居中 */
-  gap: 8px;            /* 图标与文字间距 */
-}
 </style>