Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

SanHQin 1 year ago
parent
e0d351d325 916c8a3e4d
commit
c7d7fd30c0
11 changed files with 38 additions and 6 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.719f98ff47f4e9a7c7651a86de190cde.css
  3. 0 0
      dist/static/css/app.719f98ff47f4e9a7c7651a86de190cde.css.map
  4. 0 0
      dist/static/js/app.23fc70341a8d3e1de70f.js
  5. 0 0
      dist/static/js/app.23fc70341a8d3e1de70f.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 2 1
      src/components/pages/aiAddCourse/addCourse.vue
  8. 1 1
      src/components/pages/sz/dataBoardArea/dataCenter/chartList/toolUser/index.vue
  9. 2 2
      src/components/pages/sz/dataBoardArea/dataCenter/index.vue
  10. 28 0
      src/components/tools/hevue-img-preview/package-lock.json
  11. 4 1
      src/components/tools/hevue-img-preview/package.json

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.6edb538d1b1fe6484ba9360ec0ea493e.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.a82b79982b082928b294.js></script><script type=text/javascript src=./static/js/app.cdff75ba46c2d3c4dbe0.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.719f98ff47f4e9a7c7651a86de190cde.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.a82b79982b082928b294.js></script><script type=text/javascript src=./static/js/app.23fc70341a8d3e1de70f.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.719f98ff47f4e9a7c7651a86de190cde.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.719f98ff47f4e9a7c7651a86de190cde.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.23fc70341a8d3e1de70f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.23fc70341a8d3e1de70f.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 2 - 1
src/components/pages/aiAddCourse/addCourse.vue
View File 

@@ -16086,7 +16086,7 @@ export default {
 
       }
 
     },
 
     setAgentid(){
 
-      if(this.agentid.trim()){
 
+      if(!this.agentid.trim()){
 
         this.$message.error('请输入工作流链接')
 
         return;
 
       }
 
@@ -27035,6 +27035,7 @@ ol {
 
   border-radius: 5px;
 
   box-shadow: 0px 0px 2px 1px #00000017;
 
   padding: 10px;
 
+  z-index: 999;
 
 }
 
 .panel_title{
 
   text-align: center;

+ 1 - 1
src/components/pages/sz/dataBoardArea/dataCenter/chartList/toolUser/index.vue
View File 

@@ -138,7 +138,7 @@ export default {
 
       return data;
 
     },
 
     setData() {
 
-      let year = Object.keys(this.Josn)[0].split('-')[0];
 
+      // let year = Object.keys(this.Josn)[0].split('-')[0];
 
       var t = this.gettime();
 
       this.ooption = this.getVirtualData(t)
 
       if (!this.chartObj) {

+ 2 - 2
src/components/pages/sz/dataBoardArea/dataCenter/index.vue
View File 

@@ -300,7 +300,7 @@ export default {
 
               }
 
             }
 
           }
 
-          let _yearCount = _monthArray[_monthArray.length - 1].usernum - _monthArray[_monthArray.length - 2].usernum 
+          let _yearCount = _monthArray.length ? _monthArray[_monthArray.length - 1].usernum - _monthArray[_monthArray.length - 2].usernum : 0
 
           this.BasicOverview[2] = _yearCount > 0 ? _yearCount : 0 //较上月新增登录次数
 
 
           this.monthArray = loginCountMonthArray
 
@@ -339,7 +339,7 @@ export default {
 
           for(let i = 0;i < _loginTime.length;i++){
 
             _loginTimearray[_loginTime[i].time] = _loginTime[i].usernum
 
           }
 
-          this.loginCountYearArray = _loginTimearray
 
+          this.loginCountYearArray = _loginTime.length ? _loginTimearray : []
 
 
           let _course = res.data[11] // 带分类的课程
 
           let weekArray = {

+ 28 - 0
src/components/tools/hevue-img-preview/package-lock.json
View File 

@@ -0,0 +1,28 @@
 
+{
 
+  "name": "hevue-img-preview",
 
+  "version": "5.0.3",
 
+  "lockfileVersion": 2,
 
+  "requires": true,
 
+  "packages": {
 
+    "": {
 
+      "name": "hevue-img-preview",
 
+      "version": "5.0.3",
 
+      "license": "MIT",
 
+      "dependencies": {
 
+        "hevue-img-preview": "file:"
 
+      }
 
+    },
 
+    "node_modules/hevue-img-preview": {
 
+      "resolved": "",
 
+      "link": true
 
+    }
 
+  },
 
+  "dependencies": {
 
+    "hevue-img-preview": {
 
+      "version": "file:",
 
+      "requires": {
 
+        "hevue-img-preview": "file:"
 
+      }
 
+    }
 
+  }
 
+}

+ 4 - 1
src/components/tools/hevue-img-preview/package.json
View File 

@@ -58,5 +58,8 @@
 
     "type": "git",
 
     "url": "git+https://github.com/heyongsheng/hevue-img-preview.git"
 
   },
 
-  "version": "5.0.3"
 
+  "version": "5.0.3",
 
+  "dependencies": {
 
+    "hevue-img-preview": "file:"
 
+  }
 
 }

Some files were not shown because too many files changed in this diff