Inicio Explorar Ayuda
Iniciar sesión
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

SanHQin hace 1 año
padre
e665dc32b4 029e3cd1e7
commit
da378c97c1
Se han modificado 16 ficheros con 465 adiciones y 212 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css
  3. 0 0
      dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css.map
  4. 0 0
      dist/static/js/app.faf25f48644049cb70ad.js
  5. 0 0
      dist/static/js/app.faf25f48644049cb70ad.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 0 0
      src/components/json.json
  8. 13 153
      src/components/json2.json
  9. 0 0
      src/components/json3.json
  10. 30 30
      src/components/pages/course.vue
  11. 350 0
      src/components/pages/kindStudentEva/test/component/sharePdf.vue
  12. 25 8
      src/components/pages/kindStudentEva/test/report.vue
  13. 3 0
      src/components/pages/kindStudentEva/test/score.vue
  14. 1 1
      src/components/pages/newCourse/addCourse.vue
  15. 13 7
      src/components/pages/sz/dataBoardCity/dataCenter/chartList/schoolRank/index.vue
  16. 29 12
      src/components/pages/sz/dataBoardCity/dataCenter/index.vue

+ 1 - 1
dist/index.html
Ver fichero 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: 'Source Han Sans SC', sans-serif;
 
-    }</style><link href=./static/css/app.c254a9bb375badf894d07871bdc29ebe.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.11d8a4dfbebdec332b5f.js></script><script type=text/javascript src=./static/js/app.d20d9d8094b9c919a2d3.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.11d8a4dfbebdec332b5f.js></script><script type=text/javascript src=./static/js/app.faf25f48644049cb70ad.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.faf25f48644049cb70ad.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.faf25f48644049cb70ad.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
src/components/json.json


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 13 - 153
src/components/json2.json


+ 0 - 0
src/components/json3.json
Ver fichero


+ 30 - 30
src/components/pages/course.vue
Ver fichero 

@@ -30,8 +30,8 @@
 
             <div v-show="btnDisplay" class="buttonBox">
 
               <div type="primary" @click="goToCourse3()">极简式课程</div>
 
               <!-- <div type="primary" @click="goToCourse2()">任务式课程</div> -->
 
-              <div type="primary" @click="goToCourse()">阶段式课程</div>
 
-              <div type="primary" @click="goToCourse4()">高级模式</div>
 
+              <!-- <div type="primary" @click="goToCourse()">阶段式课程</div> -->
 
+              <div type="primary" @click="goToCourse4()">阶段式课程</div>
 
             </div>
 
           </button>
 
         </div>
 
@@ -459,35 +459,35 @@ export default {
 
       this.getCourse();
 
     },
 
     goToCourse(courseId) {
 
-      if(this.org !== '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
-        if (courseId) {
 
-          this.$router.push(
 
-            "/course/addCourse?cid=" +
 
-            courseId +
 
-            "&userid=" +
 
-            this.userid +
 
-            "&oid=" +
 
-            this.oid +
 
-            "&org=" +
 
-            this.org +
 
-            "&role=" +
 
-            this.role
 
-          );
 
-        } else {
 
-          this.$router.push(
 
-            "/course/addCourse?userid=" +
 
-            this.userid +
 
-            "&oid=" +
 
-            this.oid +
 
-            "&org=" +
 
-            this.org +
 
-            "&role=" +
 
-            this.role
 
-          );
 
-        }
 
-      }else{
 
+      // if(this.org !== '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
+      //   if (courseId) {
 
+      //     this.$router.push(
 
+      //       "/course/addCourse?cid=" +
 
+      //       courseId +
 
+      //       "&userid=" +
 
+      //       this.userid +
 
+      //       "&oid=" +
 
+      //       this.oid +
 
+      //       "&org=" +
 
+      //       this.org +
 
+      //       "&role=" +
 
+      //       this.role
 
+      //     );
 
+      //   } else {
 
+      //     this.$router.push(
 
+      //       "/course/addCourse?userid=" +
 
+      //       this.userid +
 
+      //       "&oid=" +
 
+      //       this.oid +
 
+      //       "&org=" +
 
+      //       this.org +
 
+      //       "&role=" +
 
+      //       this.role
 
+      //     );
 
+      //   }
 
+      // }else{
 
          this.goToCourse4(courseId)
 
-      }
 
+      // }
 
       // this.$router.push(path);
 
     },
 
     goToCourse4(courseId) {

+ 350 - 0
src/components/pages/kindStudentEva/test/component/sharePdf.vue
Ver fichero 

@@ -0,0 +1,350 @@
 
+<template>
 
+  <el-dialog
 
+    title="提醒"
 
+    :visible.sync="localDialogVisibleShare"
 
+    :append-to-body="true"
 
+    width="560px"
 
+    :before-close="handleClose"
 
+    class="dialog_diy"
 
+  >
 
+    <div class="share_box">
 
+      <div class="info">
 
+        <span>姓名：</span>
 
+        <span>{{ info.username }}</span>
 
+      </div>
 
+      <div class="info">
 
+        <span>班级：</span>
 
+        <span>{{ info.cname }}</span>
 
+      </div>
 
+      <div class="url_box">
 
+        <div class="title">
 
+          分享链接
 
+        </div>
 
+        <div class="url">
 
+          <el-tooltip :content="origin" placement="top" effect="dark">
 
+            <!-- content to trigger tooltip here -->
 
+            <span>{{ origin }}</span>
 
+          </el-tooltip>
 
+          <span @click="copy" :data-clipboard-text="copyText" class="tag-read"
 
+            >复制链接</span
 
+          >
 
+        </div>
 
+      </div>
 
+      <div class="qrcode_box">
 
+        <div class="title">
 
+          分享二维码
 
+        </div>
 
+        <div class="qrcode">
 
+          <span class="qrcodeUrl" ref="qrCodeUrl"></span>
 
+          <span @click="downQr">下载二维码</span>
 
+        </div>
 
+      </div>
 
+      <div class="btn_box">
 
+        <button
 
+          class="c_pub_button_confirm tag-read2"
 
+          @click="copy2"
 
+          :data-clipboard-text="copyText2"
 
+        >
 
+          复制信息
 
+        </button>
 
+      </div>
 
+    </div>
 
+    <!-- <span slot="footer" class="dialog-footer">
 
+      <el-button @click="close()">关 闭</el-button>
 
+    </span> -->
 
+  </el-dialog>
 
+</template>
 
+
 
+<script>
 
+import Clipboard from "clipboard";
 
+import QRCode from "qrcodejs2";
 
+export default {
 
+  props: {
 
+    dialogVisibleShare: {
 
+      type: Boolean,
 
+      default: false
 
+    },
 
+    info: {
 
+      type: Object
 
+    },
 
+    userid: {
 
+      type: String
 
+    },
 
+    oid: {
 
+      type: String
 
+    },
 
+    org: {
 
+      type: String
 
+    },
 
+    cid: {
 
+      type: String
 
+    }
 
+  },
 
+  data() {
 
+    return {
 
+      origin: "",
 
+      copyText: "",
 
+      copyText2: "",
 
+      noCount: 0,
 
+      pname: [],
 
+      localDialogVisibleShare: this.dialogVisibleShare
 
+    };
 
+  },
 
+  methods: {
 
+    handleClose(done) {
 
+      this.close();
 
+      done();
 
+    },
 
+    close() {
 
+    //   this.$emit("update:dialogVisibleShare", false);
 
+      this.$emit('shareBtn');
 
+
 
+    },
 
+    setQr() {
 
+      setTimeout(() => {
 
+        let url = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}&org=${this.org}`;
 
+        this.origin = url;
 
+        this.$refs.qrCodeUrl.innerHTML = "";
 
+        var qrcode = new QRCode(this.$refs.qrCodeUrl, {
 
+          text: url, // 需要转换为二维码的内容
 
+          width: 100,
 
+          height: 100,
 
+          colorDark: "#000000",
 
+          colorLight: "#ffffff",
 
+          correctLevel: QRCode.CorrectLevel.H
 
+        });
 
+      }, 500);
 
+    },
 
+    downQr() {
 
+      // 创建一个虚拟链接，并将 canvas 转换为图片文件
 
+      const link = document.createElement("a");
 
+      link.href = this.$refs.qrCodeUrl.querySelector("img").src;
 
+      link.download = "qrcode.png";
 
+
 
+      // 模拟点击链接进行下载
 
+      link.click();
 
+    },
 
+    copy() {
 
+      this.copyText = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}&org=${this.org}`;
 
+      var clipboard = new Clipboard(".tag-read");
 
+      clipboard.on("success", e => {
 
+        this.$message.success("复制成功");
 
+        console.log("复制成功");
 
+        clipboard.destroy(); // 释放内存
 
+      });
 
+      clipboard.on("error", e => {
 
+        console.log("不支持复制,该浏览器不支持自动复制");
 
+        clipboard.destroy(); // 释放内存
 
+      });
 
+    },
 
+    copy2() {
 
+      let url = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}&org=${this.org}`;
 
+      this.copyText2 = `姓名：${this.info.username}\n班级${this.info.cname}\n链接提醒：${url}`;
 
+      var clipboard = new Clipboard(".tag-read2");
 
+      clipboard.on("success", e => {
 
+        this.$message.success("复制成功");
 
+        console.log("复制成功");
 
+        clipboard.destroy(); // 释放内存
 
+      });
 
+      clipboard.on("error", e => {
 
+        console.log("不支持复制,该浏览器不支持自动复制");
 
+        clipboard.destroy(); // 释放内存
 
+      });
 
+    }
 
+    // getData() {
 
+    //   // if(!this.testJson.juriP){
 
+    //   //     return;
 
+    //   // }
 
+    //   let params = {
 
+    //     id: this.testJson.courseId
 
+    //   };
 
+    //   this.ajax
 
+    //     .get(this.$store.state.api + "getTestWorkShare", params)
 
+    //     .then(res => {
 
+    //       let parray = res.data[0];
 
+    //       let is = res.data[1];
 
+    //       this.noCount = parray.length - is.length;
 
+    //       let isA = [];
 
+    //       for (var i = 0; i < is.length; i++) {
 
+    //         isA.push(is[i].userid);
 
+    //       }
 
+    //       let pname = [];
 
+    //       for (var i = 0; i < parray.length; i++) {
 
+    //         if (isA.indexOf(parray[i].userid) == -1) {
 
+    //           pname.push(parray[i].username);
 
+    //         }
 
+    //       }
 
+    //       this.pname = pname;
 
+    //     })
 
+    //     .catch(err => {
 
+    //       console.error(err);
 
+    //     });
 
+    // }
 
+  },
 
+  watch: {
 
+    dialogVisibleShare(newValue, oldValue) {
 
+      console.log("newValue", newValue);
 
+      if (newValue) {
 
+        this.localDialogVisibleShare=newValue
 
+        this.setQr();
 
+        // this.getData();
 
+        // console.log(top.origin);
 
+        // this.origin = top.origin
 
+      }
 
+    }
 
+  },
 
+  mounted() {
 
+    // console.log("this.info", this.info);
 
+
 
+    // console.log(top.origin);
 
+    // this.origin = top.origin
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.dialog_diy >>> .el-dialog {
 
+  /* height: 100%; */
 
+  /* margin: 0 auto !important; */
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #fff !important;
 
+  padding: 15px 20px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__body {
 
+  height: calc(100% - 124px);
 
+  box-sizing: border-box;
 
+  padding: 0px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #000;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn {
 
+  top: 19px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
 
+  color: #000;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
 
+  color: #000;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__body,
 
+.dialog_diy >>> .el-dialog__footer {
 
+  background: #fff;
 
+}
 
+
 
+.share_box {
 
+  width: 100%;
 
+  height: 100%;
 
+  padding: 0 20px 15px;
 
+  box-sizing: border-box;
 
+}
 
+
 
+.info_box {
 
+  margin: 0 0 20px;
 
+}
 
+
 
+.info_box > .info {
 
+  line-height: 18px;
 
+}
 
+
 
+.info_box > .info > span:nth-child(1) {
 
+  color: #00000099;
 
+}
 
+
 
+.info_box > .info > span:nth-child(2) {
 
+  color: #000000;
 
+}
 
+
 
+.info_box > .info + .info {
 
+  margin-top: 10px;
 
+}
 
+
 
+.url_box {
 
+  margin-bottom: 20px;
 
+}
 
+
 
+.qrcode_box {
 
+  margin-bottom: 20px;
 
+}
 
+
 
+.url_box > .url {
 
+  width: 100%;
 
+  display: flex;
 
+  align-items: center;
 
+  border: 1px solid #e7e7e7;
 
+  border-radius: 4px;
 
+  height: 35px;
 
+  padding: 0 7px;
 
+  box-sizing: border-box;
 
+}
 
+
 
+.url_box > .url > span {
 
+  font-size: 16px;
 
+  color: #000000;
 
+}
 
+
 
+.url_box > .url > span:nth-child(1) {
 
+  width: 100%;
 
+  white-space: nowrap;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+}
 
+
 
+.url_box > .url > span:nth-child(2) {
 
+  margin-left: auto;
 
+  border-left: 1px solid #e7e7e7;
 
+  padding-left: 7px;
 
+  cursor: pointer;
 
+  min-width: fit-content;
 
+}
 
+
 
+.url_box > .title,
 
+.qrcode_box > .title {
 
+  font-size: 16px;
 
+  font-weight: 700;
 
+  margin-bottom: 10px;
 
+}
 
+
 
+.qrcode_box > .qrcode {
 
+  padding: 7px;
 
+  border: 1px solid #e7e7e7;
 
+  width: fit-content;
 
+  border-radius: 4px;
 
+  display: flex;
 
+  align-items: flex-end;
 
+}
 
+
 
+.qrcode_box > .qrcode > span:nth-child(1) {
 
+  width: 100px;
 
+  display: block;
 
+  height: 100px;
 
+}
 
+
 
+.qrcode_box > .qrcode > span:nth-child(2) {
 
+  background: #f0f2f5;
 
+  padding: 7px 15px;
 
+  font-size: 16px;
 
+  border-radius: 4px;
 
+  cursor: pointer;
 
+  color: #000;
 
+  margin-left: 7px;
 
+}
 
+
 
+.btn_box {
 
+  display: flex;
 
+  justify-content: flex-end;
 
+}
 
+
 
+.more {
 
+  cursor: pointer;
 
+  color: #0061ff;
 
+}
 
+</style>

+ 25 - 8
src/components/pages/kindStudentEva/test/report.vue
Ver fichero 

@@ -33,7 +33,7 @@
 
           <div v-if="!isPdf" class="btn" @click="savePop">
 
             生成pdf
 
           </div>
 
-          <!-- <div class="btn">分享报告</div> -->
 
+          <div class="btn" @click="shareBtn">分享报告</div>
 
         </div>
 
       </div>
 
       <div style="margin: 20px 10px;">学期综合表现</div>
 
@@ -85,6 +85,16 @@
 
           ></fieldMap>
 
         </div>
 
       </div>
 
+
 
+      <sharePdf
 
+        :dialogVisibleShare="dialogVisibleShare"
 
+        :userid="userid"
 
+        :oid="oid"
 
+        :org="org"
 
+        :cid="cid"
 
+        :info="info"
 
+        @shareBtn="shareBtn"
 
+      ></sharePdf>
 
     </div>
 
   </div>
 
 </template>
 
@@ -93,7 +103,7 @@
 
 import radar from "./component/radar.vue";
 
 
 import croColumnar from "./component/croColumnar";
 
-// import verColumnar from "./component/verColumnar";
 
+import sharePdf from "./component/sharePdf";
 
 import popTable from "./component/popTable";
 
 import fieldMap from "./component/fieldMap";
 
 
@@ -103,7 +113,7 @@ export default {
 
   components: {
 
     radar,
 
     croColumnar,
 
-    // verColumnar,
 
+    sharePdf,
 
     popTable,
 
     fieldMap
 
   },
 
@@ -127,6 +137,9 @@ export default {
 
       // 学期数组
 
       termList: [],
 
 
+      dialogVisibleShare: false,
 
+      testJson: {},
 
+
 
       // 单个班级学生人数
 
       claStuNum: 0,
 
       // 班级分数数据
 
@@ -162,6 +175,11 @@ export default {
 
     };
 
   },
 
   methods: {
 
+    shareBtn() {
 
+      this.dialogVisibleShare = !this.dialogVisibleShare;
 
+      // console.log("this.dialogVisibleShare", this.dialogVisibleShare);
 
+      // console.log(111);
 
+    },
 
     //获取分类
 
     getVeidooType() {
 
       let params = {
 
@@ -293,9 +311,9 @@ export default {
 
 
     // 获取班级平均
 
     getClassAva() {
 
-      this.claStuNum= 0,
 
+      this.claStuNum = 0;
 
       // 班级分数数据
 
-      this.classScoreData= []
 
+      // this.classScoreData= []
 
       this.classScoreData = []; //数据
 
       let params = {
 
         cid: this.cid,
 
@@ -417,7 +435,7 @@ export default {
 
       });
 
       // 个人平均分数据结束
 
 
-// 班级平均分数据开始
 
+      // 班级平均分数据开始
 
       // console.log("????", this.classScoreData);
 
       // 先将每个学生的小分类整理好，放在child里面
 
       // console.log('this.classScoreData',this.classScoreData);
 
@@ -442,7 +460,6 @@ export default {
 
           let arr = [];
 
           i[j].child2 = [];
 
           i[j].child.forEach(e => {
 
-
 
             arr = this.addArrays(arr, e);
 
           });
 
           // console.log(i[j].child);
 
@@ -487,7 +504,7 @@ export default {
 
 
       // console.log("this.classScoreData", this.classScoreData);
 
 
-// 班级平均分数据结束
 
+      // 班级平均分数据结束
 
 
       // 雷达图数据---- 最后把每个大分类下的num按照，第一次第二次第三次，存储到raDataCopy中，为
 
       let raDataCopy = [[], [], []];

+ 3 - 0
src/components/pages/kindStudentEva/test/score.vue
Ver fichero 

@@ -304,6 +304,7 @@ export default {
 
         this.$refs.dialogRef.getData();
 
       });
 
     },
 
+    // 切换学期的时候更新
 
     saveSRJson2(val) {
 
       let params = {
 
         uid: this.userid,
 
@@ -342,8 +343,10 @@ export default {
 
   },
 
   beforeDestroy() {
 
     this.saveSRJson();
 
+    window.removeEventListener('beforeunload', this.saveSRJson);
 
   },
 
   mounted() {
 
+    window.addEventListener('beforeunload', this.saveSRJson);
 
     // this.$nextTick(()=>{
 
     //   console.log(this.$refs.dialogRef);
 
     // })

+ 1 - 1
src/components/pages/newCourse/addCourse.vue
Ver fichero 

@@ -7399,7 +7399,7 @@ export default {
 
       chapCount: 0,
 
       courseName: "",
 
       isTeacherSee: false,
 
-      highSetting: true,
 
+      highSetting: false,
 
       courseText: "",
 
       preTime: 0,
 
       formLabelWidth: "100px",

+ 13 - 7
src/components/pages/sz/dataBoardCity/dataCenter/chartList/schoolRank/index.vue
Ver fichero 

@@ -6,19 +6,22 @@
 
         <el-table-column label="排名" min-width="50" align="center">
 
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
 
         </el-table-column>
 
-        <el-table-column prop="schoolName" label="学校名称" min-width="80" align="center">
 
+        <el-table-column prop="name" label="学校名称" min-width="80" align="center">
 
         </el-table-column>
 
-        <el-table-column prop="area" label="区域" min-width="90" align="center">
 
+        <el-table-column prop="dest" label="区域" min-width="90" align="center">
 
         </el-table-column>
 
-        <el-table-column prop="teacherLogin" label="教师登录" min-width="90" align="center">
 
+        <el-table-column prop="teacherCount" label="教师数量" min-width="90" align="center">
 
         </el-table-column>
 
-				<el-table-column prop="studentLogin" label="学生登录" min-width="90" align="center">
 
+				<el-table-column prop="studentCount" label="学生数量" min-width="90" align="center">
 
         </el-table-column>
 
-        <el-table-column prop="teaching" label="授课次数" min-width="90" align="center">
 
+        <el-table-column prop="courseCount" label="课程数量" min-width="90" align="center">
 
         </el-table-column>
 
-        <el-table-column prop="submitJob" label="提交作业" min-width="80" align="center">
 
+        <el-table-column prop="workcount" label="提交作业" min-width="80" align="center">
 
         </el-table-column>
 
-        <el-table-column prop="score" label="综合得分" min-width="80" align="center">
 
+        <el-table-column label="综合得分" min-width="80" align="center">
 
+          <template slot-scope="{ row }">
 
+            {{ row.score}}
 
+          </template>
 
         </el-table-column>
 
       </el-table>
 
     </div>
 
@@ -47,6 +50,9 @@ export default {
 
     },
 
     setArray(array){
 
       this.tableData = JSON.parse(JSON.stringify(array))
 
+      this.tableData.forEach(item => {
 
+        item.score = item.teacherCount + item.studentCount + item.courseCount + item.workcount
 
+      })
 
       this.tableData = this.tableData.sort(function(a,b){
 
         return b.score - a.score;
 
       })

+ 29 - 12
src/components/pages/sz/dataBoardCity/dataCenter/index.vue
Ver fichero 

@@ -63,6 +63,7 @@
 
           <el-select v-model="selectArea2" @change="typeChangeArea2" class="selectBox">
 
             <el-option label="全部" value=""></el-option>
 
             <!-- <el-option label="南山区" :value="0"></el-option> -->
 
+            <el-option :label="item.dest" :value="item.dest" v-for="(item,index) in areaArray" :key="index"></el-option>    
           </el-select>
 
         </div>
 
 				<div class="dataBox">
 
@@ -96,9 +97,10 @@
 
       <div class="bottom">
 
 				<div class="titleBox">
 
           <div class="title">课程排行榜</div>
 
-          <el-select v-model="selectArea3" @change="typeChangeArea2" class="selectBox">
 
+          <el-select v-model="selectArea3" @change="typeChangeArea3" class="selectBox">
 
             <el-option label="全部" value=""></el-option>
 
             <!-- <el-option label="南山区" :value="0"></el-option> -->
 
+            <el-option :label="item.dest" :value="item.dest" v-for="(item,index) in areaArray" :key="index"></el-option>    
           </el-select>
 
         </div>
 
 				<div class="dataBox">
 
@@ -155,21 +157,25 @@ export default {
 
 			loginCountYearArray:{},
 
 			monthArray:[],
 
 			schoolRankData:[
 
-				{schoolName:"深圳市南山实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"海滨实验小学逾...",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市南山实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"海滨实验小学逾...",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
 			],
 
+      schoolRankData2: [],
 
 			courseRankData:[
 
 			],
 
+      courseRankData2:[
 
+			],
 
 			weekCourse2:[
 
 			],
 
       selectArea2:"",
 
       selectArea3:"",
 
+      areaArray: []
 
     };
 
   },
 
   mounted() {
 
@@ -231,6 +237,16 @@ export default {
 
         toWeek: currentMonthDates, //本月
 
       };
 
     },
 
+    typeChangeArea2(){
 
+      this.schoolRankData = this.schoolRankData2.filter(el => {
 
+        return  this.selectArea2 == '' ? el : el.dest == this.selectArea2
 
+      })
 
+    },
 
+    typeChangeArea3(){
 
+      this.courseRankData = this.courseRankData2.filter(el => {
 
+        return  this.selectArea3 == '' ? el : el.dest == this.selectArea3
 
+      })
 
+    },
 
     getData() {
 
       this.isLoading = true;
 
       let params = [
 
@@ -297,7 +313,7 @@ export default {
 
           let _courseNow = []
 
           for (var i = 0; i < _courseRank.length; i++) {
 
             _courseLastWeek.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].lastweek})
 
-            _courseNow.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].week,compare:0})
 
+            _courseNow.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].week,compare:0, dest: _courseRank[i].dest})
 
           }
 
           _courseLastWeek = _courseLastWeek.sort((a,b)=>b.total - a.total)
 
 
@@ -309,7 +325,7 @@ export default {
 
             })
 
             return item
 
           })
 
-          this.courseRankData = _courseNow
 
+          this.courseRankData = this.courseRankData2 = _courseNow
 
 
           let _userOnlineTime = (res.data[7][0].time / 60 / 60).toFixed(0); //在线时间
 
           this.yearArray = this.OnlineDuration[0] = _userOnlineTime
 
@@ -390,7 +406,8 @@ export default {
 
           }
 
           this.weekCourse2 = weekCourse2;
 
 
-
 
+          this.areaArray = res.data[12]
 
+          this.schoolRankData = this.schoolRankData2 = res.data[13]
 
           this.$forceUpdate();
 
         })
 
         .catch((err) => {

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio