Merge remote-tracking branch 'origin/master'

psdc-ui/src/views/control/manual/index.vue

@@ -419,7 +419,7 @@ function getSetTemperatureFun(item){
         margin-right: 10px;
         .txt{
           display: inline-block;
-          width: 80px;
+          width: 95px;
           text-align: right;
         }
         input{

psdc-ui/src/views/control/timer/index.vue

@@ -87,7 +87,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="任务描述" prop="content">
-              <el-input v-model="timingForm.controlContext" placeholder="请输入任务描述"/>
+              <el-input disabled v-model="timingForm.controlContext" placeholder="请输入任务描述"/>
             </el-form-item>
           </el-col>