Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-system/src/main/resources/mapper/system/TWorkOrderMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </choose>
             </when>
             <otherwise>
-                o.order_status > 0
+                 o.order_status = #{waitingtype}
             </otherwise>
         </choose>
         <if test="searchStr!=null and searchStr!=''">

gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue

@@ -171,7 +171,7 @@
               </el-timeline-item>
             </el-timeline>
           </div>
-          <div style="width: 95%;position: relative;" @click="changeDisplay(scope)">
+          <div style="width: 95%;position: relative;" @click="changeDisplay()">
             <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;margin-bottom: 15px;">
               <span style="text-decoration:underline;">显示全部</span>
             </i>
@@ -628,7 +628,7 @@ export default {
       });
     },
       // 点击按钮显示隐藏
-      changeDisplay(e) {
+      changeDisplay() {
         this.isDisplay = !this.isDisplay
         let $timeline = this.$refs.timeline;
         if (!this.showAndHide) {

gassafety-web/src/views/workOrder/detail/index.vue

@@ -208,7 +208,7 @@
             </el-timeline-item>
           </el-timeline>
         </div>
-        <div style="width: 95%;position: relative;" @click="changeDisplay(scope)">
+        <div style="width: 95%;position: relative;" @click="changeDisplay()">
           <!-- <el-button type="primary"> -->
           <i class="el-icon-arrow-down" v-if="isDisplay==false"
             style="margin-left: 100px;color: #909399;font-size: 14px;">
@@ -440,7 +440,7 @@
         });
       },
       // 点击按钮显示隐藏
-      changeDisplay(e) {
+      changeDisplay() {
         this.isDisplay = !this.isDisplay
         let $timeline = this.$refs.timeline;
         if (!this.showAndHide) {