chenmy 6 年 前
コミット
b9b6224514

+ 2 - 2
TEAMModelOS/ClientApp/app.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import axios from 'axios'
+//import axios from 'axios'
 import router from './router/index'
 import store from './store'
 import { sync } from 'vuex-router-sync'
@@ -23,7 +23,7 @@ Vue.prototype.$echarts = echarts
 // Registration of global components
 Vue.component('icon', FontAwesomeIcon)
 
-Vue.prototype.$http = axios
+//Vue.prototype.$http = axios
 
 Vue.use(iView, {
   i18n: (key, value) => i18n.t(key, value)

+ 1 - 1
TEAMModelOS/ClientApp/components/ChooseAttention.vue

@@ -64,7 +64,7 @@
       init() {
         this.$get('/api/class/getGrade?identity=Grade')
           .then((response) => {
-            //console.log(response.result.data,11111);
+            console.log(response.result.data,11111);
             this.xueduan = response.result.data;
             //console.log(this.xueduan,333333)
           })

+ 31 - 26
TEAMModelOS/ClientApp/components/ChooseExam.vue

@@ -1,11 +1,11 @@
 <template>
    <Row class="exam_box">
      <Col span="24">
-       <li v-for="(index,item) in list" class="list_box" @click="select_box(index)">
-         <p class="box_title">2018年第 <span v-text="item+1"></span>次学情诊断-校考</p>
-         <p class="box_time">2018-{{item}}-15</p>
-         <p class="box_type">诊断类型:校级联考</p>
-         <p class="box_num">测试人数:888</p>
+       <li v-for="item in list" class="list_box" @click="select_box(index)">
+         <p class="box_title">{{item.title}}-{{item.type}}</p>
+         <p class="box_time">{{item.time}}</p>
+         <p class="box_type">诊断类型:{{item.typename}}</p>
+         <p class="box_num">测试人数:{{item.num}}</p>
        </li>
        <infinite-loading @infinite="onInfinite" ref="infiniteLoading"></infinite-loading>
      </Col>
@@ -34,27 +34,32 @@
         },
       };
     },
+    created() {
+      this.init();
+              },
     methods: {
-      onInfinite() {
-        setTimeout(() => {
-          const temp = [];
-          // let suiji=Math.ceil(Math.random()*10);
-          for (let i = this.list.length + 1; i <= this.list.length + 3; i++) {
-            // temp.id=i;
-            // temp.type='联考';
-            // temp.time='2018-'+i+'i+2';
-            // temp.typetext='区级联考';
-            // temp.num=10+i*suiji;
-            temp.push(i);
-          }
-          this.list = this.list.concat(temp);
-          this.$refs.infiniteLoading.$emit('$InfiniteLoading:loaded');
-        }, 300);
-      },
-      select_box(index){
-        alert('这是点击的第'+index+'次考试');
-        // alert('这是点击的第'index'次考试');
-      }
+//      onInfinite() {
+//        setTimeout(() => {
+//          const temp = [];
+//          // let suiji=Math.ceil(Math.random()*10);
+//          for (let i = this.list.length + 1; i <= this.list.length + 3; i++) {
+//            temp.push(i);
+//          }
+//          this.list = this.list.concat(temp);
+//          this.$refs.infiniteLoading.$emit('$InfiniteLoading:loaded');
+//        }, 300);
+//      },
+//      select_box(index){
+//        alert('这是点击的第'+index+'次考试');
+//      },
+      init() {
+        this.$get('/api/class/getExam?identity=Exam')
+          .then((response) => {
+            console.log(response.result.data,11111);
+            this.list= response.result.data[0].data;
+            console.log(this.list,333333)
+          })
+       }
     },
   };
 </script>
@@ -66,7 +71,7 @@
  }
  .list_box{
    width:100%;
-   height:110px;
+   height:130px;
    background-color:#b3bdc6;
    list-style:none;
    padding:3% 3% 3% 7%;

+ 4 - 0
TEAMModelOS/ClientApp/components/basics.vue

@@ -29,6 +29,10 @@
             ],
           }
         },
+    methods() {
+
+
+                }
     }
 </script>
 

+ 2 - 2
TEAMModelOS/ClientApp/utils/http.js

@@ -52,7 +52,7 @@ export function fetch(url,params={}){
     })
       .then(response => {
         resolve(response.data);
-        this.$Message.success('This is a success tip');
+        this.$Message.success('数据访问成功!');
       })
       .catch(err => {
         reject(err);
@@ -73,7 +73,7 @@ export function post(url,data = {}){
     axios.post(url,data)
       .then(response => {
         resolve(response.data);
-        this.$Message.success('This is a success tip');
+        this.$Message.success('数据访问成功!');
       },err => {
         reject(err);
         this.$Message.error('数据访问错误!');

+ 2 - 2
TEAMModelOS/Controllers/Analysis/ClassController.cs

@@ -48,7 +48,7 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         public BaseJosnRPCResponse getTerm(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
-            identity = "term";
+            //identity = "term";
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
@@ -63,7 +63,7 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         public BaseJosnRPCResponse getExam(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
-            identity = "exam";
+            //identity = "Exam";
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));

BIN
TEAMModelOS/JsonFile/Echars-zx.json


TEAMModelOS/JsonFile/Echars-l.json → TEAMModelOS/JsonFile/EcharsL.json


TEAMModelOS/JsonFile/Echars-y.json → TEAMModelOS/JsonFile/EcharsY.json


TEAMModelOS/JsonFile/Echars-z.json → TEAMModelOS/JsonFile/EcharsZ.json


+ 27 - 0
TEAMModelOS/JsonFile/EcharsZx.json

@@ -0,0 +1,27 @@
+{
+  "model": true,
+  "obj_name": [ "成都七中", "成都九中", "成都树德", "川师附中", "成都四中" ],
+  "obj_dara":[ "2019第一次区级联考", "2019第二次区级联考", "2019第三次区级联考", "2019第四次区级联考", "2019第五次区级联考" ],
+  "obj_series": [
+    {
+      "name": "成都七中",
+      "data": [ "580", "610", "530", "490", "550" ]
+    },
+    {
+      "name": "成都九中",
+      "data": [ "530", "620", "550", "500", "520" ]
+    },
+    {
+      "name": "成都树德",
+      "data": [ "560", "600", "540", "530", "510" ]
+    },
+    {
+      "name": "川师附中",
+      "data": [ "520", "580", "530", "510", "520" ]
+    },
+    {
+      "name": "成都四中",
+      "data": [ "540", "605", "548", "515", "540" ]
+    }
+  ]
+}

BIN
TEAMModelOS/JsonFile/Exam.json