update

src/components/pages/components/worksDetail2.vue

@@ -2419,10 +2419,24 @@ export default {
           //     index
           //   );
           // });
-          const result = [];
+          let result = [];
           for (var wi = 0; wi < Object.keys(workJson).length; wi++) {
             result.push(workJson[Object.keys(workJson)[wi]]);
           }
+          var resultNewArray = result.sort(function (x, y) {
+            // 以stagetask字段为排序依据
+            var x_parts = x.stagetask.split("-");
+            var y_parts = y.stagetask.split("-");
+
+            // 首先比较第一个数字
+            if (x_parts[0] !== y_parts[0]) {
+              return parseInt(x_parts[0]) - parseInt(y_parts[0]);
+            }
+
+            // 如果第一个数字相同，则比较第二个数字
+            return parseInt(x_parts[1]) - parseInt(y_parts[1]);
+          });
+          result = resultNewArray
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2523,19 +2537,6 @@ export default {
             }
           }
 
-          // var resultNewArray = result.sort(function (x, y) {
-          //   // 以stagetask字段为排序依据
-          //   var x_parts = x.stagetask.split("-");
-          //   var y_parts = y.stagetask.split("-");
-
-          //   // 首先比较第一个数字
-          //   if (x_parts[0] !== y_parts[0]) {
-          //     return parseInt(x_parts[0]) - parseInt(y_parts[0]);
-          //   }
-
-          //   // 如果第一个数字相同，则比较第二个数字
-          //   return parseInt(x_parts[1]) - parseInt(y_parts[1]);
-          // });
 
           this.worksDetail = result;
 

src/components/pages/course.vue

@@ -29,7 +29,7 @@
           >任务模式</el-button
         >
         <el-button type="primary" class="bgColor" @click="goToCourse()"
-          >添加课程</el-button
+          >阶段模式</el-button
         >
       </div>
     </div>

src/components/tools/message.js

@@ -0,0 +1,19 @@
+// resetMessage.js
+// 重置message，防止重复点击重复弹出message弹框
+import { Message } from 'element-ui'
+
+let messageDom = null
+const resetMessage = (options) => {
+  if (messageDom) messageDom.close() // 判断弹窗是否已存在,若存在则关闭
+  messageDom = Message(options)
+}
+// message类型
+const typeArr = ['success', 'error', 'warning', 'info']
+typeArr.forEach(type => {
+  resetMessage[type] = options => {
+    if (typeof options === 'string') options = { message: options }
+    options.type = type
+    return resetMessage(options)
+  }
+})
+export const myMessage = resetMessage

src/main.js

@@ -4,7 +4,9 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import store from './config/config'
-import { Message, Loading } from 'element-ui';
+import {  Loading } from 'element-ui';
+// Message,
+import { myMessage } from './components/tools/message';
 import ajax from './common/axios.config'
 import qs from 'qs'
 import './common/player.css'
@@ -25,7 +27,8 @@ Vue.config.productionTip = false
 Vue.prototype.$store = store; // 将store实例挂在vue原型上
 Vue.prototype.ajax = ajax
 Vue.prototype.Clipboard = Clipboard
-Vue.prototype.$message = Message
+// Vue.prototype.$message = Message
+Vue.prototype.$message = myMessage
 Vue.prototype.$loading = Loading
 Vue.prototype.$echarts = echarts
 Vue.prototype.openLoading = function(target) {