|  | @@ -1090,7 +1090,7 @@
 | 
	
		
			
				|  |  |              <template #footer>
 | 
	
		
			
				|  |  |                <div class="dialog-footer">
 | 
	
		
			
				|  |  |                  <el-button @click="dialog.Taxs = false">取消</el-button>
 | 
	
		
			
				|  |  | -                <el-button type="primary">
 | 
	
		
			
				|  |  | +                <el-button type="primary" @click="dialog.Taxs = false">
 | 
	
		
			
				|  |  |                    确定
 | 
	
		
			
				|  |  |                  </el-button>
 | 
	
		
			
				|  |  |                </div>
 | 
	
	
		
			
				|  | @@ -1311,12 +1311,13 @@
 | 
	
		
			
				|  |  |              <div class="main_container">
 | 
	
		
			
				|  |  |                <div class="main_model">
 | 
	
		
			
				|  |  |                  <div class="jindutiao" v-show="progressshow">
 | 
	
		
			
				|  |  | +                  <span style="width: 150px;">运行进度</span>
 | 
	
		
			
				|  |  |                    <!-- <el-progress :text-inside="true" :stroke-width="26" :percentage="70" /> -->
 | 
	
		
			
				|  |  |                    <div class="demo-progress">
 | 
	
		
			
				|  |  | -                    <el-progress :percentage="percentage" :stroke-width="15" :color="customColors">
 | 
	
		
			
				|  |  | -                      <template #default="{ percentage }">
 | 
	
		
			
				|  |  | +                    <el-progress :percentage="percentage" :color="customColor">
 | 
	
		
			
				|  |  | +                      <!-- <template #default="{ percentage }">
 | 
	
		
			
				|  |  |                          <span class="percentage-value">当前进度:{{ percentage }}%</span>
 | 
	
		
			
				|  |  | -                      </template>
 | 
	
		
			
				|  |  | +                      </template> -->
 | 
	
		
			
				|  |  |                      </el-progress>
 | 
	
		
			
				|  |  |                      <!-- <button @click="tbn">点我</button> -->
 | 
	
		
			
				|  |  |                    </div>
 | 
	
	
		
			
				|  | @@ -1567,7 +1568,7 @@
 | 
	
		
			
				|  |  |                              <div class="sev_ruwu">
 | 
	
		
			
				|  |  |                                <div class="disflex flexend">
 | 
	
		
			
				|  |  |                                  <el-form-item label="新增变量数:" v-if="activeIndex2 === 0">
 | 
	
		
			
				|  |  | -                                  <el-input v-model="tableval" maxlength="18"
 | 
	
		
			
				|  |  | +                                  <el-input v-model="tableval" maxlength="6"
 | 
	
		
			
				|  |  |                                      oninput="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')" class="w-50 m-2"
 | 
	
		
			
				|  |  |                                    /> 
 | 
	
		
			
				|  |  |                                  </el-form-item>
 | 
	
	
		
			
				|  | @@ -2196,6 +2197,9 @@ const tasktable = ref([
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    // },
 | 
	
		
			
				|  |  |  ])
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +const customColor = ref('#2267B1')
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  const customColors = [
 | 
	
		
			
				|  |  |    { color: '#f56c6c', percentage: 20 },
 | 
	
		
			
				|  |  |    { color: '#f56c6c', percentage: 40 },
 | 
	
	
		
			
				|  | @@ -3249,7 +3253,7 @@ const onAddItem = () => {
 | 
	
		
			
				|  |  |      for (let i = 0; i < tablevalnum; i++) {
 | 
	
		
			
				|  |  |        eloptimize.value.push({
 | 
	
		
			
				|  |  |          name: `c${i + 1}`,
 | 
	
		
			
				|  |  | -        optdir: 1,
 | 
	
		
			
				|  |  | +        optdir: '1',
 | 
	
		
			
				|  |  |          weight: 0,
 | 
	
		
			
				|  |  |          scaling: 0,
 | 
	
		
			
				|  |  |          factor: 0,
 | 
	
	
		
			
				|  | @@ -4642,15 +4646,25 @@ color: #2267B1;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  .jindutiao {
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +  margin: 20px;
 | 
	
		
			
				|  |  | +  width: 60%;
 | 
	
		
			
				|  |  |    padding: 0 0 2px 0px;
 | 
	
		
			
				|  |  | -  background: #9FCDFF;
 | 
	
		
			
				|  |  | +  /* background: #9FCDFF; */
 | 
	
		
			
				|  |  | +  display: flex;
 | 
	
		
			
				|  |  | +  justify-content: center;
 | 
	
		
			
				|  |  | +  align-items: center;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  .jindutiao .demo-progress {
 | 
	
		
			
				|  |  |    width: 100%;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +.jindutiao .demo-progress .el-progress__text {
 | 
	
		
			
				|  |  | +  font-size: 13px;
 | 
	
		
			
				|  |  | +  color: #333333;
 | 
	
		
			
				|  |  | +  font-family: 'Microsoft YaHei';
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  .jindutiao .percentage-value {
 | 
	
		
			
				|  |  |    font-size: 13px;
 | 
	
		
			
				|  |  |    color: #333333;
 |