修改

src/components/schedul/schedul-orderlist.vue

@@ -30,6 +30,8 @@
     height: 30px;
     line-height: 30px;
     padding: 0;
+    border-bottom: 1px solid #d1d1d1;
+    border-radius: 0;
   }
 
   .sche_Fenye {
@@ -80,7 +82,7 @@
   }
 
   .secondList_Bottom {
-    margin: 15px 20px 0 20px;
+    margin: 10px 20px 0 20px;
     font-size: 14px;
     color: #000000;
     min-height: 100px;
@@ -243,6 +245,29 @@
     -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
     background-color: #0ae;
   }
+  .OtherListContent{
+    height:135px;
+    overflow: auto;
+  }
+  .OtherListContent::-webkit-scrollbar {
+    width: 3px;
+    height: 3px;
+    background-color: #F5F5F5;
+  }
+
+  /*!*定义滚动条轨道 内阴影+圆角*!*/
+  .OtherListContent::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    border-radius: 10px;
+    background-color: #F5F5F5;
+  }
+
+  /*!*定义滑块 内阴影+圆角*!*/
+  .OtherListContent::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
+    background-color: #0ae;
+  }
 
 </style>
 <template>
@@ -269,6 +294,12 @@
           </span>
         </div>
         <div style="min-height:135px;">
+          <div style="margin:10px 20px 0 20px">
+            <el-tabs v-model="WorkActive">
+              <el-tab-pane label="规则" name="1"></el-tab-pane>
+              <el-tab-pane label="工作清单" name="2"></el-tab-pane>
+            </el-tabs>
+            <template v-if="WorkActive==2">
               <div class="scheList_Bottom">
                 <div class="sche_List_in" v-if="WorkObj">
                   <template v-if="WorkObj.ItemType==1">
@@ -305,7 +336,7 @@
               </div>
               <div>
                 <template v-if="WorkObj.ItemType==2">
-              <div style="margin:10px 20px;">
+                  <div style="margin:10px 0;">
                     <template v-if="workAuthObj.isShowEditAndDelete">
                       <span v-if="!isShowSure&&WorkObj.WorkContent" title="点击进行修改" @click="isShowSure=true">{{WorkObj.WorkContent}}</span>
                       <el-input v-else v-model="WorkObj.WorkContent" @focus="isShowSure=true" placeholder="完成情况怎么样">
@@ -317,8 +348,23 @@
                   </div>
                 </template>
               </div>
+            </template>
+            <template v-else>
+              <div class="OtherListContent">
+                <div v-for="(item,index) in WorkRuleList">
+                  <div style="margin-bottom:10px;">{{index+1}}.{{item.ItemName}}</div>
+                  <div v-if="item.ItemImgList&&item.ItemImgList.length>0" style="width:100%;display:flex;flex-wrap:wrap">
+                    <div v-for="subItem in item.ItemImgList" style="width:40px;height:40px;margin:0 10px 10px 0;">
+                      <el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
+                      </el-image>
+                    </div>
+                  </div> 
+                </div>
+              </div>
+            </template>
+          </div>
         </div>
-        <div class="tufa_btm">
+        <div class="tufa_btm" v-if="WorkActive==2">
           <div>
             <div class="tufa_xiugai">
               <template v-if="WorkObj.ItemType==1 && workAuthObj.isShowEditAndDelete">
@@ -378,6 +424,11 @@
           </el-popover>
         </div>
         <div class="secondList_Bottom">
+          <el-tabs v-model="TufaActive">
+            <el-tab-pane label="规则" name="1"></el-tab-pane>
+            <el-tab-pane label="突发事件" name="2"></el-tab-pane>
+          </el-tabs>
+          <template v-if="TufaActive==2">
             <div class="tufa_List">
               <template v-if="EmergenciesObj&&EmergenciesObj.FileList&&EmergenciesObj.FileList.length>0">
                 <div class="tufa_left">
@@ -389,8 +440,22 @@
                 {{EmergenciesObj.OtherContent}}
               </div>
             </div>
+          </template>
+          <template v-else>
+            <div class="OtherListContent">
+              <div v-for="(item,index) in EmergenciesRuleList">
+                <div style="margin-bottom:10px;">{{index+1}}.{{item.ItemName}}</div>
+                <div v-if="item.ItemImgList&&item.ItemImgList.length>0" style="width:100%;display:flex;flex-wrap:wrap">
+                  <div v-for="subItem in item.ItemImgList" style="width:40px;height:40px;margin:0 10px 10px 0;">
+                    <el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
+                    </el-image>
+                  </div>
+                </div> 
+              </div>
             </div>
-        <div class="tufa_btm">
+          </template>
+        </div>
+        <div class="tufa_btm" v-if="TufaActive==2">
           <div>
             <div class="tufa_xiugai">
               <template
@@ -470,6 +535,11 @@
           </el-popover>
         </div>
         <div class="secondList_Bottom">
+          <el-tabs v-model="handActive">
+            <el-tab-pane label="规则" name="1"></el-tab-pane>
+            <el-tab-pane label="交接说明" name="2"></el-tab-pane>
+          </el-tabs>
+          <template v-if="handActive==2">
             <div class="tufa_List">
               <div class="tufa_left" v-if="HandoverObj&&HandoverObj.FileList&&HandoverObj.FileList.length>0">
                 <el-image :src="HandoverObj.FileList[0]" :preview-src-list="HandoverObj.FileList">
@@ -479,8 +549,22 @@
                 {{HandoverObj.OtherContent}}
               </div>
             </div>
+          </template>
+          <template v-else>
+            <div class="OtherListContent">
+              <div v-for="(item,index) in HandoverRuleList">
+                <div style="margin-bottom:10px;">{{index+1}}.{{item.ItemName}}</div>
+                <div v-if="item.ItemImgList&&item.ItemImgList.length>0" style="width:100%;display:flex;flex-wrap:wrap">
+                  <div v-for="subItem in item.ItemImgList" style="width:40px;height:40px;margin:0 10px 10px 0;">
+                    <el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
+                    </el-image>
+                  </div>
                 </div> 
-        <div class="tufa_btm">
+              </div>
+            </div>
+          </template>
+        </div>
+        <div class="tufa_btm" v-if="handActive==2">
           <div>
             <div class="tufa_xiugai">
               <template
@@ -594,6 +678,12 @@
           Shift: 0,
           DutyMan: 0
         },
+        WorkActive:'1',
+        TufaActive:'1',
+        handActive:'1',
+        WorkRuleList:[],
+        EmergenciesRuleList:[],
+        HandoverRuleList:[]
       }
     },
     watch: {
@@ -624,8 +714,9 @@
         }
       },
       getWorkList() {
-        queryDutyWork(this.qMsg).then(res => {
+        queryDutyWork_V2(this.qMsg).then(res => {
           if (res.Code == 1) {
+            console.log(res,'数据');
             this.HandoverList = res.Data.HandoverList;
             this.EmergenciesList = res.Data.EmergenciesList;
             this.WorkList = res.Data.WorkList;
@@ -638,9 +729,13 @@
             if (this.WorkList && this.WorkList.length > 0) {
               this.WorkObj = this.WorkList[this.WorkIndex];
             }
+            this.WorkRuleList = res.Data.WorkRuleList;
+            this.EmergenciesRuleList = res.Data.EmergenciesRuleList;
+            this.HandoverRuleList = res.Data.HandoverRuleList;
           }
         });
       },
+      
       //初始化权限信息
       initAuth() {
         if (this.authObj) {

src/pages/classroom/courseInfo.vue

@@ -236,7 +236,6 @@
   }
 
   .scheList_Bottom {
-    margin: 15px 20px 0 20px;
     font-size: 14px;
     color: #000000;
     height: 46px;

src/pages/scheduling/scheduleBoard.vue

@@ -205,7 +205,6 @@
   }
 
   .scheList_Bottom {
-    margin: 15px 20px 0 20px;
     font-size: 14px;
     color: #000000;
     height: 46px;
@@ -336,7 +335,7 @@
     methods: {
       //请求数据
       getList() {
-        OnDuty(this.msg).then(res => {
+        OnDuty_V2(this.msg).then(res => {
           if (res.Code == 1) {
             this.dataList = res.Data;
             this.msg.PlanDate = res.Data.PlanDate;

src/pages/scheduling/scheduleInfo.vue

@@ -212,7 +212,6 @@
   }
 
   .scheList_Bottom {
-    margin: 15px 20px 0 20px;
     font-size: 14px;
     color: #000000;
     height: 46px;