update

src/common/request.js

@@ -8,9 +8,9 @@
  */
 // const baseUrl = 'http://39.100.230.190'
 // const baseUrl = 'http://8.140.188.124'
-const baseUrl = 'http://172.18.0.24:40046'
+// const baseUrl = 'http://172.18.0.24:40046'
 // const baseUrl =  'http://172.18.1.227:40046'
-// const baseUrl =  'https://s2t.jihengcc.cn/'
+const baseUrl =  'https://s2t.jihengcc.cn/'
 // const baseUrl = ''
 
 // import { showLoading,hideLoading } from './loading.js'

src/pages/index/index.vue

@@ -141,7 +141,7 @@
     </view>
     <view class="content-right" v-else-if="infoStatus === 2">
       <view class="d-flex a-center j-sb u-m-t-42 u-m-b-10 w-100">
-        <view class="d-flex a-center f-24" style="width: 50%; height: 28rpx">
+        <view class="d-flex a-center f-24" style="width: 42%; height: 28rpx">
           <image
             class="flex-shrink"
             src="../../static/return.png"
@@ -155,22 +155,22 @@
             >{{ recordName }}</view
           >
         </view>
-        <view class="d-flex f-w-900 f-20 j-end" style="width: 50%">
+        <view class="d-flex f-w-900 f-20 j-end" style="width: 58%">
           <view
             class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
             @click="lookCheckResult"
             :style="{
-              fontSize: responseClickStatusFc && '15px',
+              fontSize: responseClickStatusFc && '18px',
             }"
           >
-            查看
+            查看前一班
           </view>
           <view
             v-if="fcType !== 3"
             class="d-flex a-center content-right-chunk b-r-5"
             :style="{
               background: responseClickStatusFc ? '#4299D3' : '#046CB4',
-              fontSize: responseClickStatusFc && '15px',
+              fontSize: responseClickStatusFc && '18px',
             }"
           >
             <image
@@ -187,7 +187,7 @@
             class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
             :style="{
               background: submitClickStatusFc ? '#4299D3' : '#046CB4',
-              fontSize: responseClickStatusFc && '15px',
+              fontSize: responseClickStatusFc && '18px',
             }"
             @click="saveFc(2)"
           >
@@ -195,7 +195,7 @@
           </view>
           <view
             class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
-            :style="{ fontSize: responseClickStatusFc && '15px' }"
+            :style="{ fontSize: responseClickStatusFc && '18px' }"
             @click="lookFile(1)"
           >
             查看表头
@@ -243,7 +243,7 @@
             class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
             :style="{
               background: submitClickStatusFc ? '#4299D3' : '#046CB4',
-              fontSize: responseClickStatusFc && '15px',
+              fontSize: responseClickStatusFc && '18px',
             }"
             @click="saveFc(0)"
           >
@@ -347,18 +347,11 @@
           >
         </view>
         <view class="d-flex f-w-900 f-20 j-end" style="width: 45%">
-          <view
-            v-if="!ifResultPage"
-            class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
-            @click="showResInfo"
-          >
-            查看检查信息
-          </view>
           <view
             class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
             :style="{
               background: submitClickStatusFc ? '#4299D3' : '#046CB4',
-              fontSize: responseClickStatusFc && '15px',
+              fontSize: responseClickStatusFc && '18px',
             }"
             @click="saveFc(1)"
           >
@@ -393,19 +386,17 @@
         >
           <view class="d-flex a-center w-100">
             <view
-              class="f-24"
+              class="f-22"
               style="color: #fff; width: 62%; font-weight: bold"
             >
               <view class="u-m-b-6">
-                流程: {{ item.flow }} 项目: {{ item.longdyProject }} <text class="u-m-l-6" v-if="item.inspectClass">班次 : {{ item.inspectClass === 1 ? '白班' : '夜班'  }}</text>
+                流程: {{ item.flow }} 项目: {{ item.longdyProject }} <text class="u-m-l-6" v-if="item.inspectClass">班次 : {{ item.inspectClass === 1 ? '上一班' : '当前班'  }}</text>
               </view> 
               <view>
                 <text> 标准: {{ item.standard }}</text>
-                <text class="u-m-l-6" v-if="item.inspectContent"> 检查结果: {{ item.inspectContent }}</text>
-                <text class="u-m-l-6" v-if="item.remark"> 备注: {{ item.remark }}</text>
               </view>
             </view>
-            <view class="d-flex a-center j-end b-r-5 f-20" style="width: 38%">
+            <view class="d-flex a-center j-end b-r-5 f-22" style="width: 38%">
               <view
                 v-if="item.inspectContent === '√'"
                 class="b-r-5 f-20 button-chunk-check"
@@ -442,14 +433,13 @@
           </view>
         </view>
         <view
-        v-if="!ifResultPage"
           style="background: #046cb4; color: #fff"
           class="d-flex u-m-b-5 b-r-5 u-p-15"
         >
           <view class="w-100">
             <view class="d-flex j-sb u-m-b-8 f-w u-m-b-12">
-              <view class="f-24">备注:如有异常或停用请输入备注</view>
-              <view class="d-flex a-center f-20">
+              <view class="f-22">备注:如有异常或停用请输入备注</view>
+              <view class="d-flex a-center f-22">
                 <view
                   :class="[
                     useSpanner === 1 ? 'button-chunk-check' : 'button-chunk',
@@ -809,8 +799,6 @@ export default {
       showButton: false,
       // 其他责任人检查数据
       otherShowData: [],
-      // 是否为结果信息也
-      ifResultPage: false,
       // 当期那名
       nowName: ''
     };
@@ -847,7 +835,7 @@ export default {
             "已完成点检保养表",
             gFile,
             gItem,
-            "异常于停用点检保养表",
+            "异常与停用点检保养表",
             zFile,
             zItem,
           ];
@@ -864,10 +852,10 @@ export default {
           return "月";
         } else if (type === 4) {
           return "季度";
-        } else if (type === 4) {
+        } else if (type === 5) {
           return "半年";
         } else {
-          return "班每次";
+          return "班";
         }
       };
     },
@@ -990,6 +978,13 @@ export default {
           this.spannerRemark = data.remark;
           // 备注按钮 1.正常 2.异常 3.停用
           this.useSpanner = data.readIssue;
+          if (data.patrolClazzCheckresults) {
+            this.fcHeadData.push({ name: "班" });
+            if (!this.datafc.length) {
+              this.datafc = data.patrolClazzCheckresults;
+            }
+            this.shiftData = data.patrolClazzCheckresults;
+          }
           if (data.patrolDayCheckresults) {
             this.fcHeadData.push({ name: "日" });
             if (!this.datafc.length) {
@@ -1025,10 +1020,8 @@ export default {
             }
             this.halfYearData = data.patrolHalfYearCheckresults;
           }
-          if (data.patrolClazzCheckresults) {
-            this.shiftData = data.patrolClazzCheckresults
-          }
         } else {
+          console.log(111)
           this.hintCase(res.message || "获取失败");
         }
       });
@@ -1077,15 +1070,9 @@ export default {
     },
     // 首件详情页返回
     returnSjList() {
-      if(this.ifResultPage){
-        this.ifResultPage = false
-         this.recordName = this.nowName;
-        this.patrolWaitInfo();
-      } else {
-        this.infoStatus = 1;
-        this.showButton = false;
-        this.init();
-      }
+      this.infoStatus = 1;
+      this.showButton = false;
+      this.init();
     },
     // 响应(防错)
     responseClickFc() {
@@ -1109,7 +1096,9 @@ export default {
       if (this.headerData.length === 1) return;
       this.fcIndex = index;
       this.sjRecordPlName = name;
-      if (name === "日") {
+      if (name === "班") {
+        this.datafc = this.shiftData;
+      } else if (name === "日") {
         this.datafc = this.dayData;
       } else if (name === "周") {
         this.datafc = this.weekData;
@@ -1139,12 +1128,12 @@ export default {
             type: 1,
             versionId: this.sjRecordId,
           };
-          console.log(data);
         } else {
           let flag = false;
+          console.log(this.procedureRes)
           for (let i of this.procedureRes) {
             if (i.type === 2) {
-              this.hintCase("检查内容为填全");
+              this.hintCase("检查内容未填全");
               flag = true;
             }
           }
@@ -1399,13 +1388,6 @@ export default {
         console.log(res)
       })
     },
-    // 查看检查信息
-    showResInfo() {
-      this.recordName = '查看检查结果'
-      this.headerData = []
-      this.datafc = this.shiftData
-      this.ifResultPage = true
-    },
     // 提示框
     hintCase(msg) {
       this.$refs.uToast.show({

src/pages/login/login.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from "vuex";
+import { mapMutations } from "vuex";
 import { loginApp } from "@/common/api.js";
 export default {
   data() {