Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/views/system/info/index.vue

@@ -125,20 +125,20 @@
           <span v-if="scope.row.hiddenTroubleDealStatus == 3" style="color: #30B46B">已完成</span>
         </template>
       </el-table-column>
-      <el-table-column label="隐患处理情况" align="center" prop="hiddenTroubleDealCondition" >
-        <span slot-scope="scope" v-if="scope.row.hiddenTroubleDealCondition">{{scope.row.hiddenTroubleDealCondition}}</span>
-        <span v-else>-</span>
-      </el-table-column>
-      <el-table-column label="隐患处理完成时间" align="center" prop="hiddenTroubleDealFinishTime" width="180">
-        <template slot-scope="scope">
-          <span v-if="scope.row.hiddenTroubleDealFinishTime">{{ parseTime(scope.row.hiddenTroubleDealFinishTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" >
-        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
-        <span v-else>-</span>
-      </el-table-column>
+<!--      <el-table-column label="隐患处理情况" align="center" prop="hiddenTroubleDealCondition" >-->
+<!--        <span slot-scope="scope" v-if="scope.row.hiddenTroubleDealCondition">{{scope.row.hiddenTroubleDealCondition}}</span>-->
+<!--        <span v-else>-</span>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="隐患处理完成时间" align="center" prop="hiddenTroubleDealFinishTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.hiddenTroubleDealFinishTime">{{ parseTime(scope.row.hiddenTroubleDealFinishTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>-->
+<!--          <span v-else>-</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="备注" align="center" prop="remarks" >-->
+<!--        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>-->
+<!--        <span v-else>-</span>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -309,33 +309,33 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="11">
-            <el-form-item label="隐患处理完成时间" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealFinishTime">
-              <el-date-picker clearable size="small"
-                              v-model="form.hiddenTroubleDealFinishTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="选择隐患处理完成时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="11">-->
+<!--            <el-form-item label="隐患处理完成时间" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealFinishTime">-->
+<!--              <el-date-picker clearable size="small"-->
+<!--                              v-model="form.hiddenTroubleDealFinishTime"-->
+<!--                              type="datetime"-->
+<!--                              value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                              placeholder="选择隐患处理完成时间">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
 
-        <el-row>
-          <el-col :span="22">
-            <el-form-item label="隐患处理情况" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealCondition">
-              <el-input v-model="form.hiddenTroubleDealCondition" type="textarea" placeholder="请输入隐患处理情况" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="22">-->
+<!--            <el-form-item label="隐患处理情况" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealCondition">-->
+<!--              <el-input v-model="form.hiddenTroubleDealCondition" type="textarea" placeholder="请输入隐患处理情况" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
-        <el-row>
-          <el-col :span="22">
-            <el-form-item label="备注" prop="remarks">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="22">-->
+<!--            <el-form-item label="备注" prop="remarks">-->
+<!--              <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
       </el-form>