成润项目（页面bug修复）

src/assets/js/http.js

@@ -86,9 +86,9 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
-  // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
+  axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
-    axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+    // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
     // axios.defaults.baseURL ='http://192.168.34.221:8070' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
 

src/views/companyAdmin/companyDiagram.vue

@@ -450,6 +450,7 @@
       :visible.sync="addProjectDialog"
       :modal-append-to-body="false"
       width="1100px"
+      @close="close"
     >
       <div class="dialog_content">
         <el-form
@@ -930,6 +931,7 @@
       :title="jobDialogTitle"
       :visible.sync="addJobDialog"
       width="667px"
+      @close="close"
     >
       <div class="dialog_content">
         <el-form
@@ -1787,6 +1789,10 @@ export default {
         jobId: '',
         externalAccount: ''
       }
+      this.addJobForm={
+        jobName: '',
+        jobDuty: '',
+      },
       this.addCompanyDialog=false
     },
     leftChangeState(item) {

src/views/companyFront/environManage/overview.vue

@@ -561,8 +561,8 @@ export default {
         },
         grid: {
           top: 35,
-          right: 20,
+          right: 40,
-          left: 0,
+          left: 10,
           bottom: 0,
           containLabel: true,
         },

src/views/companyFront/project/overview.vue

@@ -1008,10 +1008,10 @@ export default {
 
       let xAxisData = echartData.map((v) => v.name);
       //  ["1", "2", "3", "4", "5", "6", "7", "8"]
-      let yAxisData1 = echartData.map((v) => v.value1);
+      let yAxisData1 = echartData.map((v) => v.value1?v.value1:0)
       // [100, 138, 350, 173, 180, 150, 180, 230]
-      let yAxisData2 = echartData.map((v) => v.value2);
+      let yAxisData2 = echartData.map((v) => v.value2? v.value2:0)
-      let yAxisData3 = echartData.map((v) => v.value3);
+      let yAxisData3 = echartData.map((v) => v.value3?v.value3:0)
       // [233, 233, 200, 180, 199, 233, 210, 180]
       const hexToRgba = (hex, opacity) => {
         let rgbaColor = "";
@@ -1065,8 +1065,8 @@ export default {
         },
         grid: {
           top: 35,
-          right: 20,
+          right: 45,
-          left: 0,
+          left: 15,
           bottom: 0,
           containLabel: true,
         },

src/views/companyFront/towerManage/towerManage.vue

@@ -710,7 +710,15 @@ export default {
       selectTowerAlarmViolationTrendListApi({sn: this.searchsn,selectType: this.activeNav2}).then(res=>{
         console.log(res,'---报警违章趋势')
         if(res.code == 200){
-          this.tendencyData = res.result ? res.result:[]
+          if(type==1){
+            this.tendencyData = res.result ? res.result:[]
+          }else if(type==2){
+            this.tendencyData = res.result ? res.result:[]
+
+          }else{
+            this.tendencyData = res.result ? res.result:[]
+
+          }
           this.$nextTick(()=>{
             this.createEchart6()
           })
@@ -1295,7 +1303,7 @@ export default {
         dataList2.push(item.violationNum)
       })
       if(this.activeNav2 == 2){
-        titleData = [...new Set([...titleData,...this.makeDate()])]
+        // titleData = [...new Set([...titleData,...this.makeDate()])]
       } else if(this.activeNav2 == 3){
         titleData = [...new Set([...titleData,...this.getMounth()])]
       }

src/views/projectAdmin/dataBoard/homePage/personOverview.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="personOverview">
     <div class="title">
-      {{ $t('message.companyDiagram.peopleOverview') }}
+      <!-- {{ $t('message.companyDiagram.peopleOverview') }} -->
+      支付管理
     </div>
-    <div class="content">
+    <!-- <div class="content">
       <div class="personCount">
         <div class="countItem">
           <img src="@//assets/images/dataBoard/numImg_purple.png" />
@@ -11,7 +12,6 @@
             <div class="num">
               {{ statisticsCount.presencecount.totalPerson }}
             </div>
-            <!-- 实名制人数 -->
             <div class="label">
               {{ $t('message.companyDiagram.registerPeopleNum') }}
             </div>
@@ -23,7 +23,6 @@
             <div class="num">
               {{ statisticsCount.presencecount.lwPersonTotal }}
             </div>
-            <!-- 在场人数 -->
             <div class="label">
               {{ $t('message.companyDiagram.onlineLabourPeople') }}
             </div>
@@ -33,7 +32,7 @@
 
       <div class="manager">
         <div class="manager-title">
-          <!-- 管理人员 -->{{ $t('message.companyDiagram.onlineManagePeople') }}
+       {{ $t('message.companyDiagram.onlineManagePeople') }}
         </div>
         <div class="manager-persons">
           <div class="person">
@@ -43,7 +42,7 @@
                 >/{{ statisticsCount.workercount.jfGlPersonTotal }}
               </div>
               <div class="person-label">
-                <!-- 监理人员 -->{{ $t('message.dataBoard.PartyAPersonnel') }}
+              {{ $t('message.dataBoard.PartyAPersonnel') }}
               </div>
             </div>
           </div>
@@ -54,7 +53,7 @@
                 >/{{ statisticsCount.workercount.jlGlPersonTotal }}
               </div>
               <div class="person-label">
-                <!-- 甲方人员 -->{{ $t('message.dataBoard.supervisoryStaff') }}
+               {{ $t('message.dataBoard.supervisoryStaff') }}
               </div>
             </div>
           </div>
@@ -65,12 +64,19 @@
                 >/{{ statisticsCount.workercount.yfGlPersonTotal }}
               </div>
               <div class="person-label">
-                <!-- 乙方人员 -->{{ $t('message.dataBoard.PartyBPersonnel') }}
+              {{ $t('message.dataBoard.PartyBPersonnel') }}
               </div>
             </div>
           </div>
         </div>
       </div>
+    </div> -->
+    <div class="content">
+      <img
+        src="@/assets/images/ysptImg.jpg"
+        alt=""
+        style="width: 97%; height: 100%; margin-left: 4px"
+      />
     </div>
   </div>
 </template>
@@ -97,7 +103,7 @@ export default {
   }
   .content {
     position: relative;
-    padding: 10px 20px;
+    // padding: 10px 20px;
     height: calc(100% - 20px - 24px);
     z-index: 2;
     .personCount {

src/views/projectFront/configManage/roleManage.vue

@@ -238,7 +238,7 @@ export default {
         roleName: "",
         roleDesc: "",
         projectSn: "",
-        seeEquipment: 1
+        seeEquipment: '0'
       },
       formRules: {
         roleName: [

src/views/projectFront/examination/test.vue

@@ -6,49 +6,29 @@
     <div class="pageContent">
       <div class="tips">交卷之前离开当前页面会导致本次考试作废！</div>
       <vue-scroll style="height: 2000px">
-        <div
+        <div class="blockBox" v-for="(item, index) in courseDetail.questionList" :key="index">
-          class="blockBox"
-          v-for="(item, index) in courseDetail.questionList"
-          :key="index"
-        >
           <div class="testTilte">
             {{ index + 1 }}、{{ item.questionName }}（{{
               item.questionScore
             }}分）
           </div>
           <!-- 多选 -->
-          <el-checkbox-group
+          <el-checkbox-group class="optionsBox" v-if="item.questionType == 2" v-model="form.checkboxArray[index]" @change="(e) => {
-            class="optionsBox"
+              changeChecked(e, item.questionId, index)
-            v-if="item.questionType == 2"
+            }
-            v-model="radioList"
+            ">
-            @change="
+            <el-checkbox v-for="(data, index2) in item.optionList" :label="data.optionId" :key="index2">{{
-              (e) => {
+              indexList[index2] }}、{{ data.optionName }}</el-checkbox>
-                changeChecked(e, item.questionId, index)
-              }
-            "
-          >
-            <el-checkbox
-              v-for="(data, index2) in item.optionList"
-              :label="data.optionId"
-              :key="index2"
-              >{{ indexList[index2] }}、{{ data.optionName }}</el-checkbox
-            >
           </el-checkbox-group>
 
           <!-- 单选 -->
-          <el-radio-group   v-for="(data, index2) in item.optionList"    v-model="index2"  class="optionsBox">
+          <el-radio-group v-if="item.questionType == 1" v-model="form.radioArray[index]" @change="(e) => {
-            <el-radio
+              changeChecked(e, item.questionId, index)
+            }
+            " class="optionsBox">
 
-              @change="
+            <el-radio v-for="(data, index2) in item.optionList" :key="index2" :label="data.optionId">{{ indexList[index2]
-                (e) => {
+            }}、{{ data.optionName }}</el-radio>
-                  changeChecked(e, item.questionId, index)
-                }
-              "
-            
-              :key="data.optionId"
-              :label="data.optionId"
-              >{{ indexList[index2] }}、{{ data.optionName }}</el-radio
-            >
           </el-radio-group>
         </div>
       </vue-scroll>
@@ -68,13 +48,7 @@
                 <text class="star">*</text>身份证号码
               </div>
               <div class="uni-form-input">
-                <input
+                <input class="uni-input" placeholder-class="cl" name="idCard" v-model="idCard" placeholder="请输入" />
-                  class="uni-input"
-                  placeholder-class="cl"
-                  name="idCard"
-                  v-model="idCard"
-                  placeholder="请输入"
-                />
               </div>
             </div>
             <button form-type="submit" type="primary" class="btn submitBtn">
@@ -85,11 +59,7 @@
       </template>
     </dialogs>
     <div class="testResultBox" v-if="showResult">
-      <img
+      <img v-if="isQualified == 1" src="@/assets/images/Pass.png" class="resultImg" />
-        v-if="isQualified == 1"
-        src="@/assets/images/Pass.png"
-        class="resultImg"
-      />
       <img v-else src="@/assets/images/noPass.png" class="resultImg" />
       <div class="score">
         <span>{{ score }}分</span>
@@ -110,6 +80,11 @@ export default {
   data() {
     return {
       radio: 6,
+      form: {
+        //单选部分渲染数据
+        radioArray: [],
+        checkboxArray: []
+      },
       radioList: [],
       indexList: [
         'A',
@@ -209,6 +184,13 @@ export default {
         (result) => {
           if (result.result) {
             that.courseDetail = result.result.safeEducation
+            for (var i = 0; i < this.courseDetail.questionList.length; i++) {
+                let indexArry = []
+                this.form.checkboxArray.push(indexArry)
+            }
+
+            console.log("得到的课程详细数据 ：", result.result)
+            console.log("得到的checkboxArray  ：", this.form.checkboxArray)
           }
         }
       )
@@ -249,6 +231,7 @@ export default {
   margin: 5rem 5rem;
   text-align: center;
 }
+
 .blockBox {
   box-shadow: 0 2rem 12rem 0px rgba(212, 220, 236, 0.69);
   border-radius: 4rem;
@@ -256,18 +239,22 @@ export default {
   padding: 5rem;
   position: relative;
 }
+
 .optionItem {
   /* padding-left: 20px; */
   margin-top: 5rem;
   font-size: 7rem;
   display: block;
 }
+
 .desc {
   margin-left: 2.5rem;
 }
+
 .checkbox {
   transform: scale(0.8);
 }
+
 .submitBtn {
   margin: -70rem 5rem;
   position: fixed;
@@ -281,6 +268,7 @@ export default {
   font-size: 7.5rem;
   border-radius: 10rem;
 }
+
 .testResultBox {
   position: fixed;
   width: 100%;
@@ -289,11 +277,13 @@ export default {
   top: 0;
   z-index: 99999;
 }
+
 .resultImg {
   width: 100%;
   height: 307%;
   margin: -70rem 0rem;
 }
+
 .score {
   position: relative;
   left: 50%;
@@ -316,6 +306,7 @@ export default {
     margin-left: -28rem;
   }
 }
+
 .headers {
   /* border-bottom: 0.5rem solid #f3f3f3; */
   height: 8rem;
@@ -326,6 +317,7 @@ export default {
   margin-top: -55%;
   /* background-color: pink; */
 }
+
 .testTilte {
   font-size: 6rem;
 }
@@ -334,6 +326,7 @@ export default {
   font-size: 4rem;
   line-height: 10rem;
 }
+
 ::v-deep .el-checkbox__inner {
   margin-top: -2rem;
 
@@ -343,6 +336,7 @@ export default {
 
   /* border: 0.5rem solid #fff; */
 }
+
 ::v-deep .el-radio__inner {
   margin-top: -2rem;
 
@@ -350,6 +344,7 @@ export default {
   height: 4rem;
   line-height: 10rem;
 }
+
 ::v-deep .el-radio__label {
   font-size: 4rem;
   line-height: 10rem;

src/views/projectFront/markingRoom/devManage.vue

@@ -305,13 +305,13 @@
                 <el-form v-if="Popup.type === 'ybj'||Popup.type === 'bjz'" size="medium" ref="warningForm"
                          label-width="140px" class="dialogFormBox yj-dialogFormBox">
                     <el-form-item :label="$t('message.markRoomOverview.tempSet.start1')" prop="maxTemperature">
-                        <el-input v-model="warningInfo.maxTemperature" disabled
+                        <el-input v-model="warningInfo.maxTemperature" 
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
                                   <!-- <el-input value="没有限制" disabled
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input> -->
                     </el-form-item>
                     <el-form-item :label="$t('message.markRoomOverview.tempSet.end1')" prop="minTemperature">
-                        <el-input v-model="warningInfo.minTemperature" disabled
+                        <el-input v-model="warningInfo.minTemperature" 
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
                     </el-form-item>
                     
@@ -320,11 +320,11 @@
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input> -->
 
                                   <!-- 没有限制 -->
-                                  <el-input :value="$t('message.alarmValueSet.noRestrictions')" disabled
+                                  <el-input :value="$t('message.alarmValueSet.noRestrictions')" 
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('message.markRoomOverview.tempSet.end3')" prop="minHumidity">
-                        <el-input v-model="warningInfo.minHumidity" disabled
+                        <el-input v-model="warningInfo.minHumidity" 
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
                     </el-form-item>
                    

src/views/projectFront/projectSummary/cooperatorDatails.vue

@@ -373,7 +373,7 @@ export default {
     getEnterpriseInfoById() {
       let data = {
         enterpriseId: this.$props.detailId,
-        projectSn: this.projectSn,
+        projectSn: this.$store.state.userInfo.headquartersSn,
       };
       getEnterpriseInfoByIdApi(data).then((res) => {
         if (res.code == 200) {