Merge branch 'master' into gcj

src/components/Adult/inputModules/SentenceSegwordChs/components/ClauseresultChs.vue

@@ -32,14 +32,7 @@ export default {
     };
   },
   computed: {},
-  watch: {
-    "curQue.detail": {
-      handler: function (newVal, oldVal) {
-        this.handleSentence(JSON.parse(JSON.stringify(newVal)));
-      },
-      deep: true,
-    },
-  },
+  watch: {},
   //方法集合
   methods: {
     onBlur(item, field) {

src/components/Adult/inputModules/VoiceMatrix.vue

@@ -80,8 +80,9 @@
                   v-if="Object.keys(column.lrc_data).length > 0"
                   class="lrc"
                 >
-                  {{ column.lrc_data.begin_time / 1000 }}s ~
-                  {{ column.lrc_data.end_time / 1000 }}s
+                  <el-input v-model="column.lrc_data.begin_time" />
+                  <span> ~ </span>
+                  <el-input v-model="column.lrc_data.end_time" />
                   {{ column.lrc_data.text }}
                 </span>
               </div>