diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index 6f295c2..2756b1b 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -25,10 +25,15 @@
                 </span>
               </el-form-item>
 
-              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input :disabled="item.deviceRunstatus == true ? false : true" class="tempInput" v-model="inputs.tempValue"/></el-form-item>
-<!--              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input class="tempInput"/></el-form-item>-->
+              <el-form-item style="margin-left: 27px" v-for="inputs in item.control_elements" :label="inputs.nowTempRemark" v-if="data.show2">{{inputs.tempValue}}</el-form-item>
+              <!--              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input class="tempInput"/></el-form-item>-->
+
+              <el-button class="mybtn" type="primary" v-show="item.control_elements.length > 0 ? true : false" :disabled="item.deviceRunstatus == true ? false : true" @click="getSetTemperatureFun1()" v-if="data.show2">设定温度</el-button>
 
-              <el-button class="mybtn" type="primary" v-show="item.control_elements.length > 0 ? true : false" :disabled="item.deviceRunstatus == true ? false : true" @click="getSetTemperatureFun(item)">确定</el-button>
+              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark" v-if="data.show1"><input :disabled="item.deviceRunstatus == true ? false : true" class="tempInput" v-model="inputs.tempValue"/></el-form-item>
+<!--              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input class="tempInput"/></el-form-item>-->
+              <el-button class="mybtn"  v-show="item.control_elements.length > 0 ? true : false" :disabled="item.deviceRunstatus == true ? false : true" @click="getSetTemperatureFun2()" v-if="data.show1">取消</el-button>
+              <el-button class="mybtn1" type="primary" v-show="item.control_elements.length > 0 ? true : false" :disabled="item.deviceRunstatus == true ? false : true" @click="getSetTemperatureFun(item)" v-if="data.show1">确定</el-button>
 
             </el-form>
           </div>
@@ -118,6 +123,8 @@ import { ref,reactive,onMounted  } from 'vue'
 import { ElMessageBox,ElMessage, ElLoading} from 'element-plus'
 import { getDevice,getControlLogList,getStrategyList,getStartAndStop,getSetTemperature,getSenceControl,getControlDeviceList,ControlInfo ,ControlResult} from '@/api/control/manual'
 const data = reactive({
+  show1:false,
+  show2:true,
   strategyCode:'',
   info:'',
   result:'',
@@ -585,8 +592,18 @@ function handleDevChangeFun(id,sta){
 //   })
 // }
 
+function getSetTemperatureFun1(){
+  data.show2=false
+  data.show1=true
+}
+function getSetTemperatureFun2(){
+  data.show2=true
+  data.show1=false
+}
 /** 设置温度*/
 function getSetTemperatureFun(item){
+  data.show2=true
+  data.show1=false
   let dataArr = [];
   for(let i = 0;i < item.control_elements.length;i++){
     let dataObject = {
@@ -758,6 +775,11 @@ function getSetTemperatureFun(item){
   float: right;
   margin-top: 5px;
 }
+.mybtn1{
+  float: right;
+  margin-top: 5px;
+  margin-right: 5px;
+}
 ::v-deep .el-form-item--default .el-form-item__label{
   height: 32px;
   line-height: 32px;