Merge branch 'stmms_ft_dev' of http://git.qmth.com.cn/luoshi/stmms-ft into stmms_ft_dev

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkLibraryDao.java

@@ -59,7 +59,7 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
             LibraryStatus status);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.markerId=?1 and m.status!=?3 and m.status!=?4 ")
+    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.headerId=null , m.headerTime=null , m.headerScore=null , m.headerScoreList=null  where m.markerId=?1 and m.status!=?3 and m.status!=?4 ")
     void resetByMarkerId(Integer markerId, LibraryStatus status,LibraryStatus libraryStatus1,LibraryStatus libraryStatus2);
 
     @Modifying(clearAutomatically = true)

stmms-web/src/main/webapp/static/mark-new/js/modules/specialTag.js

@@ -85,6 +85,12 @@ SpecialTag.prototype.init = function() {
         		$(this).addClass('selected');
         	}
         }
+        if(self.tagName != undefined){
+        	self.markControl.trigger('special.tag.enable');
+        }else{
+        	self.markControl.trigger('special.tag.disable');
+        }
+        
     });
     this.container.find('#undo-button').click(function(){
     	if(self.task!=undefined){
@@ -116,12 +122,12 @@ SpecialTag.prototype.init = function() {
 SpecialTag.prototype.toggle = function(show) {
     if (show == true) {
         this.show = true;
-        this.markControl.trigger('special.tag.enable');
         this.container.show();
     } else {
         this.show = false;
         this.markControl.trigger('special.tag.disable')
         this.container.hide();
+        this.onclickList.find('a').removeClass('selected');
     }
 }
 

stmms-web/src/main/webapp/static/mark-track/js/mark-control.js

@@ -497,13 +497,13 @@ MarkControl.prototype.submitTask = function(submitUrl) {
 
     if (task != undefined && this.context.submitting != true) {
     	
-        //开启强制标记
-        if(this.option.forceSpecialTag===true){
-        	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
-        		markControl.trigger('task.submit.forceSpecialTag');
-        		return;
-        	}
-        }
+//开启强制标记
+//        if(this.option.forceSpecialTag===true){
+//        	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
+//        		markControl.trigger('task.submit.forceSpecialTag');
+//        		return;
+//        	}
+//        }
         
         var submitObj = $.extend(true, {}, task);
         submitObj.markStepList = undefined;

stmms-web/src/main/webapp/static/mark-track/js/modules/mark-history.js

@@ -84,11 +84,11 @@ MarkHistory.prototype.init = function() {
 	this.container.header = getDom(this.header_dom, this.markControl).appendTo(this.container);
 	this.container.paginator = getDom(this.paginator_dom, this.markControl).appendTo(this.container);
 	this.container.list = getDom(this.history_list_dom, this.markControl).appendTo(this.container).find('#history-list');
-
+	var self = this;
 	this.container.header.find('#close-history-button').click(this, function(event) {
 		event.data.toggle(false);
-		this.markControl.context.task = undefined;
-		this.markControl.getTask();
+		self.markControl.context.task = undefined;
+		self.markControl.getTask();
 	})
 	this.container.paginator.find('#last-page-button').click(this, function(event) {
 		var markHistory = event.data;