Skip to content

A
admin-base
Commit 411e01ab authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

3.12bug修改

parent 0cfb053d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 20 deletions
config/index.js
View file @ 411e01ab
...@@ -12,8 +12,8 @@ module.exports = { ...@@ -12,8 +12,8 @@ module.exports = {
//本地代理设置 //本地代理设置
proxyTable: { proxyTable: {
'/api': { '/api': {
// target: 'http://10.1.23.103', // 接口的域名 target: 'http://10.1.23.103', // 接口的域名
target: 'https://wechat-test.changchangenglish.com/', // target: 'https://wechat-test.changchangenglish.com/',
changeOrigin: true, // 如果接口跨域，需要进行这个参数配置 changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
} }
}, },
......
dev/index.html
View file @ 411e01ab
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.d5f090db8ac79d70eed8.js></script><script type=text/javascript src=/static/js/vendor.70bf4e4bb70d2410e3da.js></script><script type=text/javascript src=/static/js/app.0b278597ec52464b3125.js></script></body><script>let el = document.getElementsByTagName("script"); <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.1a68bd5b764da3559e55.js></script><script type=text/javascript src=/static/js/vendor.70bf4e4bb70d2410e3da.js></script><script type=text/javascript src=/static/js/app.0b278597ec52464b3125.js></script></body><script>let el = document.getElementsByTagName("script");
el.onerror = function(a,b,c){ el.onerror = function(a,b,c){
console.log('error:',a,b,c); console.log('error:',a,b,c);
}; };
......
dev/static/js/0.81b6319fed20d7bf9f4c.js 0 → 100644
View file @ 411e01ab
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/3.9fcea91aae4a936fd413.js 0 → 100644
View file @ 411e01ab
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/6.28fb8d2e04ae517dbd9d.js 0 → 100644
View file @ 411e01ab
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.1a68bd5b764da3559e55.js 0 → 100644
View file @ 411e01ab
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var b,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(b in n)Object.prototype.hasOwnProperty.call(n,b)&&(e[b]=n[b]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={55:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"81b6319fed20d7bf9f4c",1:"094e0a39d2ea2c0b3ea7",2:"4b71b12547a8b204ba37",3:"9fcea91aae4a936fd413",4:"aa3dfeba931920737ee6",5:"f1e36289be0dfc0fc80c",6:"28fb8d2e04ae517dbd9d",7:"f28c6cc3df01ebfadbad",8:"ddf91ed592b26cbf1ee2",9:"2db2b09cab42850f9f26",10:"1ff8edfee2c8721b36c0",11:"e0c520d7f029bf62afe7",12:"f0097be0f243ba4a8052",13:"d93d1f456bc1fb9c6e92",14:"a815e26184f343f97633",15:"4909f7c6277a35047068",16:"fe9f9325f74cb223ba9a",17:"7d00abccf513eefd8ee7",18:"781c313481da9653f7a6",19:"a66eddbaae7b143687bd",20:"7cff79306223d3eeb9aa",21:"d5a73551e8734400a9e1",22:"a33d773b2fd64d3285ee",23:"326e189db342bf666f36",24:"54521e18d0637a058cc7",25:"50b42181811a4433ed96",26:"7e8df12980bc1e0eff55",27:"f9e7d6b746c3a97d523d",28:"38ec4fd75650d1d1ebab",29:"03bc7ff16e60e70cb585",30:"e4da61f3813e569eee45",31:"133be2acbaa6dd41ecd4",32:"dd81adc3211ca0bccc62",33:"5668bcb0081199a23ce6",34:"c21a25c9a8b2634a3409",35:"984e0d161494d483d764",36:"49bec82a6f38140e51e3",37:"ad56d9513151bb74efb7",38:"c9ac686bffefcac1e6c3",39:"d7e34e5f5344ccdf2608",40:"58364afa53dce5e2a76b",41:"43118fc831fa62e8622f",42:"a051ca9d7ec18884e919",43:"17f3298a0525478a460d",44:"5761502a50174bd4d274",45:"f002ee4b50549513cd1e",46:"16953183f358c6957981",47:"8ae8fd74a78e0066ecf9",48:"ac2fa0fc062a4a432a86",49:"8ce4fca4dd8f4f498bcd",50:"877d2d50b6d2af42ac05",51:"b090b7f79ec829da3aa6",52:"b4b2fea683dee6659798"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="/",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/index.html
View file @ 411e01ab
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.cf7b96b669330057e673e420b26249ce.css rel=stylesheet></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.fcffaa77309be0a661a2.js></script><script type=text/javascript src=/static/js/vendor.d78a529943511c3b7597.js></script><script type=text/javascript src=/static/js/app.f97f95f29cfb109a1f2a.js></script></body><script>let el = document.getElementsByTagName("script"); <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.4e59fea7d4d5732da1c8ffb9c444e9a4.css rel=stylesheet></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.035d571b569ecd0e751b.js></script><script type=text/javascript src=/static/js/vendor.d78a529943511c3b7597.js></script><script type=text/javascript src=/static/js/app.f97f95f29cfb109a1f2a.js></script></body><script>let el = document.getElementsByTagName("script");
el.onerror = function(a,b,c){ el.onerror = function(a,b,c){
console.log('error:',a,b,c); console.log('error:',a,b,c);
}; };
......
dist/static/css/app.4e59fea7d4d5732da1c8ffb9c444e9a4.css 0 → 100644
View file @ 411e01ab
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.d601ea32b9d45c5d65eb.js 0 → 100644
View file @ 411e01ab
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.22a6c3abb4a9b5f47285.js 0 → 100644
View file @ 411e01ab
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.2d32cc66d574af6634e6.js 0 → 100644
View file @ 411e01ab
This diff is collapsed.
dist/static/js/manifest.035d571b569ecd0e751b.js 0 → 100644
View file @ 411e01ab
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={55:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"d601ea32b9d45c5d65eb",1:"c51f1028bfcf53a8c95a",2:"552c207f172b0a39e1b3",3:"22a6c3abb4a9b5f47285",4:"67755362b966c6c3a691",5:"6798586278efaa31042d",6:"2d32cc66d574af6634e6",7:"d406f3d0ae85ddcaad11",8:"7a73226f29c6e3b376c4",9:"1f85e9f6b7a53375c27f",10:"8456cbd7cc0dee8b488a",11:"0cd25f58231bcecdd9d8",12:"cb9f752a2b691bb2b4bb",13:"256e0035dd71e6f74f00",14:"d74ee6cf464970cfe0e8",15:"cf49e9e0f60b869459f9",16:"610ac2e80ecc52557c55",17:"ebe3c959be92e8990578",18:"377df91c11348f88b273",19:"3eac4c462c385d366b95",20:"c843bd3859cc64b422d9",21:"2820febf955ab7737aa5",22:"717e2fe77b61ffe7ad73",23:"66e9a1a61f3916b91258",24:"adce830861e0291d96b5",25:"b436d77aaf189cc1890f",26:"fd194b22f9e543042f06",27:"8d102e3198928fbaf345",28:"9a1cd5215acc7c472d43",29:"56910baa0b41a33ddfae",30:"5f52e011ccc19e26b1df",31:"c725cf3588a373cc64c4",32:"18f7a0052e0608fed752",33:"7901ef2e63517f9b2bf0",34:"78ac0100b6cc7a48b318",35:"3202d188789cdcb31d74",36:"7fa4750b4bc1913021a1",37:"76636683799dcf5a4d38",38:"8026ac864776e2ed24c5",39:"2888cb4820aac11efeca",40:"d62e884a8ec5ad85868e",41:"4724e9dc1da513851984",42:"bfcf4d980f9588d2fc8b",43:"e726959196920839e6a6",44:"41d94a4a3cd4d099811d",45:"ea65b9d011a496f849ea",46:"17911576296bf17082a8",47:"938f2f0ce0fdbf9501c6",48:"b163cd5e2750e3f00800",49:"a37bb82f5a938a3f2522",50:"d60e56664d4a5a767ab6",51:"b4d6bb32c72bf03f64a6",52:"a23aa3ba418a2db03bd7"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="/",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/teacherDetail/sourceByDateDialog.vue
View file @ 411e01ab
...@@ -40,7 +40,11 @@ export default { ...@@ -40,7 +40,11 @@ export default {
methods: { methods: {
initPage() { initPage() {
this.loading = true this.loading = true
getSourceByDateApi(this.dialogObj.periods_id,this.dialogObj.user_id,this.dialogObj.json).then(res => { let pageJson = {
limit:this.dialogObj.json.limit,
page:this.dialogObj.json.page
}
getSourceByDateApi(this.dialogObj.periods_id,this.dialogObj.user_id,pageJson).then(res => {
this.detail = res.list; this.detail = res.list;
this.total = res.total; this.total = res.total;
this.loading = false this.loading = false
......
src/components/teacherDetail/task2.vue
View file @ 411e01ab
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
<sourceByDateDialog :dialogObj = sourceByDateDialogJson ref="sourceByDateDialogDom"></sourceByDateDialog>
</div> </div>
</template> </template>
...@@ -150,12 +151,14 @@ ...@@ -150,12 +151,14 @@
import {task2Api,editUserWeightApi,userLookApi,allDescApi} from "../../service/api"; import {task2Api,editUserWeightApi,userLookApi,allDescApi} from "../../service/api";
import teacherDesc from '../framework/teacherDesc' import teacherDesc from '../framework/teacherDesc'
import userWeight from '../framework/userWeight' import userWeight from '../framework/userWeight'
import sourceByDateDialog from './sourceByDateDialog'
export default { export default {
name: "task2", name: "task2",
props:['teacherId'], props:['teacherId'],
components: {teacherDesc,userWeight}, components: {teacherDesc,userWeight,sourceByDateDialog},
data(){ data(){
return { return {
sourceByDateDialogJson:{},
task2List:[], task2List:[],
lookDetail:{ lookDetail:{
show:false, show:false,
...@@ -222,21 +225,32 @@ ...@@ -222,21 +225,32 @@
this.lookDetail.nowPage = 1; this.lookDetail.nowPage = 1;
this.showLook(); this.showLook();
}, },
showLook(data){ showLook(row){
if(data){ console.log(row)
this.lookDetail.data = data // if(data){
// this.lookDetail.data = data
// }
// this.lookDetail.show = true;
// this.lookDetail.loading = true;
// let json = {
// limit: this.lookDetail.limit,
// page: this.lookDetail.nowPage
// };
// userLookApi(this.lookDetail.data.periods_id,this.lookDetail.data.user_id, json).then(res=>{
// this.lookDetail.list = res.list;
// this.lookDetail.loading = false;
// this.lookDetail.total = res.total;
// })
this.sourceByDateDialogJson = {
"periods_id":row.periods_id,
"user_id":row.user_id,
json:{
limit: 10,
page:0
}
} }
this.lookDetail.show = true; this.$refs.sourceByDateDialogDom.dialogShow = true
this.lookDetail.loading = true;
let json = {
limit: this.lookDetail.limit,
page: this.lookDetail.nowPage
};
userLookApi(this.lookDetail.data.periods_id,this.lookDetail.data.user_id, json).then(res=>{
this.lookDetail.list = res.list;
this.lookDetail.loading = false;
this.lookDetail.total = res.total;
})
}, },
initPage(){ initPage(){
task2Api(this.teacherId).then(res=>{ task2Api(this.teacherId).then(res=>{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment