任务看板修改

b3889527 · wangwei · 656db75e · b3889527 · b3889527 · b3889527
Commit b3889527 authored Feb 21, 2019 by wangwei
16 changed files
--- a/dev/index.html
+++ b/dev/index.html
-<!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://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.f2fbb89dec7aeb9fbccb.js></script><script type=text/javascript src=/static/js/vendor.19b07206259747695190.js></script><script type=text/javascript src=/static/js/app.72d338797308d851576a.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://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.187d5b347ea591204efb.js></script><script type=text/javascript src=/static/js/vendor.19b07206259747695190.js></script><script type=text/javascript src=/static/js/app.72d338797308d851576a.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dev/static/js/0.92a69ba280f735d56e8d.js
+++ b/dev/static/js/0.92a69ba280f735d56e8d.js
--- a/dev/static/js/3.84e14cf426e13dd9facd.js
+++ b/dev/static/js/3.84e14cf426e13dd9facd.js
--- a/dev/static/js/6.b998a642452d0103e9bb.js
+++ b/dev/static/js/6.b998a642452d0103e9bb.js
--- a/dev/static/js/manifest.187d5b347ea591204efb.js
+++ b/dev/static/js/manifest.187d5b347ea591204efb.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={54:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"92a69ba280f735d56e8d",1:"bc1f624ac97c48f80183",2:"f66948bc0e7defc7f71a",3:"84e14cf426e13dd9facd",4:"075e1e39d430555dce24",5:"3b6352448b4fbe7fe93e",6:"b998a642452d0103e9bb",7:"4e43fbfd60ff31caec56",8:"d3544989b3c885cdb8df",9:"efebf7bed988f94a17a6",10:"23091968a14ca70d8ec4",11:"b872a01d27134b8888b1",12:"a07cc022d0e2d4a76c24",13:"02e7f8ecb3824d08eb26",14:"3454eff49e55d323a3ee",15:"cfd022022fad6aab7bbf",16:"b719e4006fb1f8279a07",17:"7738da43f094d5baa2a1",18:"23a932e9668160d73f31",19:"a6165a81ad65cabea676",20:"c56d2a275c7787cc6389",21:"1005d573fa57b7f32c9a",22:"2831ec1112e58c0050b9",23:"488fe6af82dcd1d30c7b",24:"75f047b001efaebc181c",25:"865f766b54cfb9a4410e",26:"bb5b684378696066777b",27:"867016154086b2675ede",28:"211c717d09e6e0ada9b1",29:"fd5991d2029f1fc6019a",30:"b80061a2afb0bd7c94f1",31:"1df61e40c6befada4d05",32:"b853eb9cf064bbdab597",33:"f97bc77b3118d50d8c20",34:"7276b6fb04b58d02336a",35:"f750bab7bea444aea2e0",36:"450d2689bf1b11b40efe",37:"fecbb78697b72433399a",38:"a56702c3c27000c8c5b2",39:"0d0e2775b96a95b5e0ff",40:"d4b619636f1316754987",41:"0d39705018432cce0de6",42:"b44529aaa35c8b216c7e",43:"e9f3128a23ab2752f999",44:"ed76889093bd1bf3e83a",45:"f002ee4b50549513cd1e",46:"a233b9882991bc9f7cef",47:"8606732f0c40c4945356",48:"40316b04844bf33e17bf",49:"fd111e5e00fa2185c14e",50:"192c108e5e368c18b219",51:"bdfb5c9dc604feddb5b1"}[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,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="/",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
-<!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://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.3b54a9eb4fc2a46475c81262d31f8435.css rel=stylesheet></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.ae6743b573dc18d9fc3a.js></script><script type=text/javascript src=/static/js/vendor.dabb3afa5856b271bc7f.js></script><script type=text/javascript src=/static/js/app.b44a659fceb1c1bcc783.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://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.91d6079917cd0ac8d38e1be258a19a4c.css rel=stylesheet></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.b94426b5823b9a60d920.js></script><script type=text/javascript src=/static/js/vendor.dabb3afa5856b271bc7f.js></script><script type=text/javascript src=/static/js/app.b44a659fceb1c1bcc783.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dist/static/css/app.91d6079917cd0ac8d38e1be258a19a4c.css
+++ b/dist/static/css/app.91d6079917cd0ac8d38e1be258a19a4c.css
--- a/dist/static/js/0.7dc88f1ece3bf6d2bab2.js
+++ b/dist/static/js/0.7dc88f1ece3bf6d2bab2.js
--- a/dist/static/js/3.851efa309769836421ad.js
+++ b/dist/static/js/3.851efa309769836421ad.js
--- a/dist/static/js/6.a406facbf8fd3f9214fd.js
+++ b/dist/static/js/6.a406facbf8fd3f9214fd.js
--- a/dist/static/js/manifest.b94426b5823b9a60d920.js
+++ b/dist/static/js/manifest.b94426b5823b9a60d920.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var b,t,o,i=0,u=[];i<a.length;i++)t=a[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(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var a={},f={54: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 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:"7dc88f1ece3bf6d2bab2",1:"943a210ffb0c026e69d2",2:"b54be2b4c71e45f1ec5b",3:"851efa309769836421ad",4:"5f081acbd9611a8bff56",5:"daee40e2f12e61b5c9a1",6:"a406facbf8fd3f9214fd",7:"9b0e6627aaac96b2d605",8:"de37c899072e36027067",9:"b28c4de0f82093f0ddcc",10:"25e2fa924776fabad3ce",11:"db33c997a1bb5f1fb711",12:"48490bc7c0465546430b",13:"5c2965941aeb0a4d08a9",14:"c99970caa8e56cc31aa2",15:"6935bd6112df27385112",16:"4bd0010d10f00aebeff0",17:"c71ad1ca3ff336ed15b1",18:"3f4c9ca1cbb92c628308",19:"49c2905277035109fcd7",20:"e82e1f1dcaabe9e1b31c",21:"b876085e72860fc9b97e",22:"c3631def5f9ceaedb038",23:"deed46e5cb314d84362d",24:"2dbdec1a5c9cac528595",25:"d99bca4ef1fadffb2e75",26:"b00486280f1fda23ae06",27:"7f5ca549a27f3d2209e8",28:"1724215a96d73618e17f",29:"2cc9ee4337480292b8dd",30:"7c9bd46953d3a545398f",31:"0af99c8f542af5be1834",32:"a1be5c765361edef4b67",33:"f8c74f92662d1349857a",34:"5372ea97c43744a1d6a7",35:"747c43ab2235075950b5",36:"0e507622ee9851392154",37:"38c9d9f3db50651ac4d1",38:"6caecae55fd3e437c47a",39:"0e27cc4c920ef6be8158",40:"0a7bd580c27c12e2babf",41:"359b3f5626a8dbcd6220",42:"31e09ef2f7cbff86f90f",43:"553e79772f0d564eeee2",44:"653dd7bde870663c43ba",45:"61a09408886437dcaefa",46:"238bb5d747696c53193b",47:"3dcb1dc1897da81050f0",48:"b163cd5e2750e3f00800",49:"195668f19694f0166d0a",50:"565351c282e7afcce2e4",51:"8a2e48baf2e202404c95"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),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
--- a/src/components/framework/teacherDesc.vue
+++ b/src/components/framework/teacherDesc.vue
@@ -160,10 +160,7 @@
          this.$message.error('请输入沟通话术');
          return false;
        }
-        if(this.newDialog.is_reply === 1 && this.newDialog.reply_content === ''){
+       if(this.newDialog.reply_content){
-          this.$message.error('请输入用户回复');
-          return false;
-        }else if(this.newDialog.is_reply === 1){
          json.reply_content = this.newDialog.reply_content
        }
        addPeriodsClassUserDescApi(this.row.id,json).then(res=>{

--- a/src/components/framework/userWeight.vue
+++ b/src/components/framework/userWeight.vue
@@ -39,7 +39,8 @@
              type:'success',
              message:'数据更改成功'
            });
-            this.$emit('onSuccess')
+            this.$emit('onSuccess');
+            this.weight = this.row.weight
          })
        }).catch(() => {
          this.weight = this.row.weight

--- a/src/components/teacher/index.vue
+++ b/src/components/teacher/index.vue
@@ -47,7 +47,7 @@
    </el-tabs>
    <el-table
      :data="userList"
-      height="calc(100vh - 350px)"
+      height="calc(100vh - 325px)"
      style="width: 100%">
      <el-table-column
        prop="name"

--- a/src/components/teacherDetail/task.vue
+++ b/src/components/teacherDetail/task.vue
@@ -7,7 +7,7 @@
    </el-row>
    <el-row :gutter="20" style="margin-top: 20px">
      <el-col :span="24">
-        <task3 :task3List="task3List" :teacherId="id" :refDesc3="refDesc3"></task3>
+        <task3 :task3List="task3List" :teacherId="id" @refDesc3="refDesc3"></task3>
      </el-col>
    </el-row>
    <el-row :gutter="20" style="margin-top: 20px">
@@ -522,6 +522,7 @@
        })
      },
      refDesc3(){
+        console.log(this.task3Detail)
          if(this.task3Detail.type === 1){
              let json={
                is_true:this.task3Detail.is_true,

--- a/src/components/teacherDetail/task3.vue
+++ b/src/components/teacherDetail/task3.vue
@@ -256,6 +256,11 @@
    },
    methods:{
      refDesc3(){
+        console.log(123);
+        getRecallListApi(this.task3Detail.periods_id,this.teacherId,{}).then(res=>{
+          this.task3Detail.loading = false;
+          this.task3Detail.list = res
+        });
        this.$emit('refDesc3')
      },
      showLook(data,a){