完善API调整 update

TEAMModelBI/ClientApp/src/api/index.js

@@ -253,9 +253,9 @@ export default {
     getSchoolStatistics(data) {
         return post('/activity/get-areastics', data)
     },
-    //获取研修进度内容
+    //获取数据占比 总数据、上周、本月
     getResearchdata(data) {
-        return post('/study/get-area', data)
+        return post('/lesson/get-schoolan', data)
     },
     //获取空间使用率和明细
     getEmploySizes(data) {
@@ -362,29 +362,29 @@ export default {
 
     //第三方相关API(BI)
     //创建or保存 第三方信息
-    setThirdparty(data) {
-        return post('/business/set-info', data)
-    },
-    //获取所有第三方企业信息
-    getAllthirdparty(data) {
-        return post('/business/get-info', data)
-    },
-    //查询企业相关的学校列表
-    relevanceSchool(data) {
-        return post('/business/get-companyschool', data)
-    },
-    //企业关联学校
-    correlationSchool(data) {
-        return post('/business/set-companyschool', data)
-    },
-    //重新生成token和密码
-    produceCipher(data) {
-        return post('/business/reset-bus', data)
-    },
-    //企业移除关联学校
-    enterpriseRemoveSchool(data) {
-        return post('/business/del-companysc', data)
-    },
+    // setThirdparty(data) {
+    //     return post('/business/set-info', data)
+    // },
+    // //获取所有第三方企业信息
+    // getAllthirdparty(data) {
+    //     return post('/business/get-info', data)
+    // },
+    // //查询企业相关的学校列表
+    // relevanceSchool(data) {
+    //     return post('/business/get-companyschool', data)
+    // },
+    // //企业关联学校
+    // correlationSchool(data) {
+    //     return post('/business/set-companyschool', data)
+    // },
+    // //重新生成token和密码
+    // produceCipher(data) {
+    //     return post('/business/reset-bus', data)
+    // },
+    // //企业移除关联学校
+    // enterpriseRemoveSchool(data) {
+    //     return post('/business/del-companysc', data)
+    // },
 
     //7.1更正API
     //获取企业列表

TEAMModelBI/ClientApp/src/view/areamanage/statistics.vue

@@ -1012,9 +1012,9 @@ export default {
             data: [
               // { value: 1340, name: '锦江区外国语小学' },
               // { value: 380, name: '川师大附小' },
-              { value: 58, name: '树德中学' },
-              { value: 36, name: '石室中学' },
-              { value: 100, name: '石室小学' },
+              // { value: 58, name: '树德中学' },
+              // { value: 36, name: '石室中学' },
+              // { value: 100, name: '石室小学' },
             ],
           },
         ],
@@ -1048,9 +1048,9 @@ export default {
               },
             },
             data: [
-              { value: 140, name: '锦江区外国语小学' },
-              { value: 380, name: '川师大附小' },
-              { value: 100, name: '石室小学' },
+              // { value: 140, name: '锦江区外国语小学' },
+              // { value: 380, name: '川师大附小' },
+              // { value: 100, name: '石室小学' },
             ],
           },
         ],
@@ -1590,17 +1590,6 @@ export default {
             aspectsData.value[3].addmonth = parseInt(res.monthActCnt) + parseInt(res.monthLess)
             aspectsLoading.value.headerBasics = false
           }
-          //版本占比
-          areaData.value.versions.series[0].data[0].value = res.basics
-          areaData.value.versions.series[0].data[1].value = res.standard
-          areaData.value.versions.series[0].data[2].value = res.major
-          aspectsLoading.value.basics = false
-          //课例活动数据
-          for (let s in res.schoolLessons) {
-            res.schoolLessons[s].value = res.schoolLessons[s].count
-          }
-          areaData.value.class.series[0].data = res.schoolLessons
-          aspectsLoading.value.class = false
           //处理研修进度
           let outer = [
             { value: 0, name: '线上研修' },
@@ -1634,7 +1623,7 @@ export default {
           getcounselor(areaids.id)
           getClassLivelys(areaids.id)
           employSize(areaids.id)
-          //researchData(areaids.id)
+          researchData(areaids.id)
           getAreaSchool(areaids.id)
         })
         .catch((res) => {
@@ -1664,6 +1653,21 @@ export default {
       let data = { areaId: val }
       proxy.$api.getAreaSchoolList(data).then((res) => {
         console.log(res, 'xuexiaoliebiao')
+        let basicsV = []; let standardV = []; let majorV = []
+        if (res.state === 200) {
+          schooltableData.value = res.areaSchool
+          aspectsLoading.value.schoolList = false
+          res.areaSchool.forEach((item) => {
+            item.scale === 0 ? basicsV.push(item) : ''
+            item.scale === 500 && item.serial === 0 && item.service === 0 ? standardV.push(item) : ''
+            item.scale === 500 && (item.serial !== 0 || item.service !== 0) ? majorV.push(item) : ''
+          })
+          //版本占比
+          areaData.value.versions.series[0].data[0].value = basicsV.length
+          areaData.value.versions.series[0].data[1].value = standardV.length
+          areaData.value.versions.series[0].data[2].value = majorV.length
+          aspectsLoading.value.basics = false
+        }
         res.state === 200 ? (schooltableData.value = res.areaSchool, aspectsLoading.value.schoolList = false) : ''
       }).catch((error) => {
         ElMessage.error('学区内学校列表获取异常')
@@ -1702,7 +1706,7 @@ export default {
           ElMessage.error('空间内容获取失败')
         })
     }
-    //获取研修进度数据
+    //某个学区 数据占比 总数据、上周、本月
     function researchData (areaIds) {
       if (!areaIds) {
         return ElMessage.error('无区域ID')
@@ -1711,38 +1715,24 @@ export default {
       proxy.$api
         .getResearchdata(data)
         .then((res) => {
-          console.log(res, '研修返回')
-          let outer = [
-            { value: 0, name: '线上研修' },
-            { value: 0, name: '校本研修' },
-            { value: 0, name: '认证材料' },
-            { value: 0, name: '课堂实录' },
-          ]
-          let within = [
-            { value: 0, name: '已完成' },
-            { value: 0, name: '进行中' },
-            { value: 0, name: '未完成' },
-          ]
+          console.log(res, '学区数据占比')
+          //课例活动数据
+          let totalData = []; let lastWeek = []; let nowMonths = []
           if (res.state === 200) {
-            outer[0].value = res.onLineCount
-            outer[1].value = res.offlineCount
-            outer[2].value = res.submitCount
-            outer[3].value = res.classRoomCount
-
-            within[0].value = res.fulfilCount
-            within[1].value = res.carryOnCount
-            within[2].value = res.noCount
-
-            console.log(outer, within)
-            areaData.value.schedule.data = within
-            areaData.value.schedule.legend.data = outer
-            areaData.value.schedule.series[0].data = within
-            areaData.value.schedule.series[1].data = outer
-            aspectsLoading.value.research = false
+            res.areaSchools.forEach((item) => {
+              let names = item.name
+              totalData.push({ name: names, value: item.allCnt })
+              lastWeek.push({ name: names, value: item.weekCnt })
+              nowMonths.push({ name: names, value: item.monthCnt })
+            })
+            areaData.value.class.series[0].data = totalData
+            areaData.value.lastweek.series[0].data = lastWeek
+            areaData.value.monthsContrast.series[0].data = nowMonths
           }
+          aspectsLoading.value.class = false
         })
         .catch((res) => {
-          ElMessage.error('研修进度获取异常')
+          ElMessage.error('API异常，学区数据占比获取失败')
         })
     }
     function getoption () {

TEAMModelBI/ClientApp/src/view/login.vue

@@ -82,6 +82,7 @@ export default {
     })
     let router = useRouter()
     let { proxy } = getCurrentInstance()
+    console.log(proxy.$api, '1111111111111')
     const store = useStore()
     console.log(store, 'VUEX')
     let comRef = ref(null)

TEAMModelBI/ClientApp/src/view/schoolmanage/schoolAnalyse.vue

@@ -934,10 +934,10 @@ export default {
         icon: '#icon-kecheng-1',
         subheading: '昨日对比',
         subheadingNum: '0%',
-        subheadingState: 'down',
+        subheadingState: '',
         subhead: '上月对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'purples',
         today: '今日数据',
         todayNum: 0,
@@ -949,10 +949,10 @@ export default {
         icon: '#icon-huodongxiangqu',
         subheading: '昨日对比',
         subheadingNum: '0%',
-        subheadingState: 'up',
+        subheadingState: '',
         subhead: '上月对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'oranges',
         today: '今日数据',
         todayNum: 0,
@@ -964,10 +964,10 @@ export default {
         icon: '#icon-zhishihudong',
         subheading: '昨日对比',
         subheadingNum: '0%',
-        subheadingState: 'up',
+        subheadingState: '',
         subhead: '上月对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'blues',
         today: '今日数据',
         todayNum: 0,
@@ -979,10 +979,10 @@ export default {
         icon: '#icon-shuju1',
         subheading: '上月对比',
         subheadingNum: '0%',
-        subheadingState: 'up',
+        subheadingState: '',
         subhead: '去年对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'total',
         today: '今日数据',
         todayNum: 0,
@@ -996,10 +996,10 @@ export default {
         icon: '#icon-kecheng-1',
         subheading: '昨日对比',
         subheadingNum: '0%',
-        subheadingState: 'down',
+        subheadingState: '',
         subhead: '上月对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'purples',
         today: '今日数据',
         todayNum: 0,
@@ -1011,10 +1011,10 @@ export default {
         icon: '#icon-huodongxiangqu',
         subheading: '昨日对比',
         subheadingNum: '0%',
-        subheadingState: 'up',
+        subheadingState: '',
         subhead: '上月对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'oranges',
         today: '今日数据',
         todayNum: 0,
@@ -1026,10 +1026,10 @@ export default {
         icon: '#icon-zhishihudong',
         subheading: '昨日对比',
         subheadingNum: '0%',
-        subheadingState: 'up',
+        subheadingState: '',
         subhead: '上月对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'blues',
         today: '今日数据',
         todayNum: 0,
@@ -1041,10 +1041,10 @@ export default {
         icon: '#icon-shuju1',
         subheading: '上月对比',
         subheadingNum: '0%',
-        subheadingState: 'up',
+        subheadingState: '',
         subhead: '去年对比',
         subheadNum: '0%',
-        subheadState: 'down',
+        subheadState: '',
         classname: 'total',
         today: '今日数据',
         todayNum: 0,
@@ -1641,9 +1641,10 @@ export default {
           let nowYear = res.lessYearCnt + res.yearActCnt + res.yearInterCnt
           let lastYear = res.lessLastYearCnt + res.lastYearInterCnt + res.lastYearActCnt
           console.log(nowYear, lastYear, '今年和去年数据')
-          centerbasics.value[3].subheadNum = nowYear === 0 && lastYear === 0 ? '0%' : lastYear === 0 ? '100%' : (((nowYear - lastYear) / lastYear) * 100).toFixed(2) + '%'
+          centerbasics.value[3].subheadNum = nowYear === 0 && lastYear === 0 ? '0%' : lastYear === 0 ? '100%' : ((nowYear - lastYear) / lastYear).toFixed(2) * 100 + '%'
           console.log(((nowYear - lastYear) / lastYear).toFixed(2), '结果')
-          centerbasics.value[3].subheadingState = nowYear - lastYear >= 0 ? 'up' : 'down'
+          centerbasics.value[3].subheadState = nowYear - lastYear >= 0 ? 'up' : 'down'
+          console.log(nowYear - lastYear >= 0, '标记')
           headerbasics.value[0].num === 0 ? centerbasics.value[3].subheadingNum = '0%' : ''
           allLoding.value.various = false
           //总数据趋势图
@@ -1860,7 +1861,7 @@ export default {
       let nowYear = res.lessYearCnt + res.yearActCnt + res.yearInterCnt
       let lastYear = res.lessLastYearCnt + res.lastYearActCnt + res.lastYearInterCnt
       detailsbasics.value[3].subheadNum = nowYear === 0 && lastYear === 0 ? '0%' : lastYear === 0 ? '100%' : (((nowYear - lastYear) / lastYear) * 100).toFixed(2) + '%'
-      detailsbasics.value[3].subheadingState = nowYear - lastYear >= 0 ? 'up' : 'down'
+      detailsbasics.value[3].subheadState = nowYear - lastYear >= 0 ? 'up' : 'down'
       detailsLoding.value.various = false
       let classedDatas = anSchool.value.classed; let activitysDatas = anSchool.value.activitys; let interactDatas = anSchool.value.interacts
       let tataldata1 = classedDatas.map((index, item) => { return index + activitysDatas[item]; })