coys hace 1 año
padre
commit
44579affed

+ 1 - 1
.env.development

@@ -17,7 +17,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 #VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

+ 2 - 1
src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -85,8 +85,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
+           
             <el-col :span="4">
-              <el-form-item prop="buildTaskNow" label="立即生效:" v-if="(!id&&!isDistribute)">
+              <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!(id&&(isDistribute==1))">
                 <el-checkbox v-model="formData.buildTaskNow" size="medium"
                   >勾选后当前周期开始生效</el-checkbox
                 >

+ 1 - 1
src/views/resumptionEvaluate/evaluate/index.vue

@@ -283,7 +283,7 @@ export default {
       list(this.queryParams).then((res) => {
         this.dataList = res?.data.rows || [];
         this.isEdit = res?.isEdit;
-        this.total = res?.total || [];
+        this.total = res.data.total || [];
         this.loading = false;
       });
     },