Merge remote-tracking branch 'origin/master'

master
魔神煜修罗皇 2 years ago
commit 8147f37d7e
  1. 2
      psdc-ui/src/views/control/manual/index.vue
  2. 2
      psdc-ui/src/views/control/timer/index.vue

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

@ -87,7 +87,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="任务描述" prop="content"> <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-form-item>
</el-col> </el-col>

Loading…
Cancel
Save