Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl

src/assets/js/http.js

@@ -72,11 +72,12 @@ 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://118.121.198.147:23232/'//港投(成润)正式
     // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
     // axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
+    axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
     // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
     // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上

src/components/GlobalUploader.vue

@@ -51,7 +51,7 @@
         data() {
             return {
                 options: {
-                    target: this.$http.defaults.baseURL+'filetransfer/uploadfile', // 目标上传 URL
+                    target: this.$http.defaults.baseURL+'/filetransfer/uploadfile', // 目标上传 URL
                     chunkSize: 1024 * 1024,
                     fileParameterName: 'file',
                     maxChunkRetries: 3,

src/components/account.vue

@@ -70,16 +70,16 @@
             class="width_100"
             @click="goProjectBackstage"
             v-if="
-              $route.path.indexOf('/projectIndex') == -1 ||
+              $route.path.indexOf('/equipmentCenterIndx') == -1 &&
-              ($route.path.indexOf('/equipmentCenterIndx') == -1 &&
                 $store.state.userInfo.accountType != 5 &&
                 $store.state.userInfo.accountType != 6 &&
-                $store.state.userInfo.enterProjectBackType == 0)
+                $store.state.userInfo.enterProjectBackType === 0
             "
           >
             <img src="@/assets/images/xmht.png" width="15px" height="15px" />
             <!--  $t("message.companyDiagram.projectBackEnd") -->
-            <span>{{ projectBackground }}</span>
+            <span>{{ projectBackground }}
+            </span>
           </div>
           <!--  设备中台 -->
           <div

src/store/index.js

@@ -44,8 +44,8 @@ export default new Vuex.Store({
   
   state: {
     PAGESIZRS: [10, 20, 30, 50],
-    UPLOADURL:'http://192.168.34.221:12360/upload/image',// 郭圣雄
+    UPLOADURL:'http://192.168.34.221:30001/upload/image/',// 郭圣雄
-    FILEURL:'http://192.168.34.221:12360/image/',//郭圣雄
+    FILEURL:'http://192.168.34.221:30001/image/',//郭圣雄
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl

src/views/companyAdmin/bigScreen/index.vue

@@ -124,7 +124,7 @@
                 <li>
                   <span>质量</span>
                   <p>
-                    待整改：<b>{{ qualityCount.notCloseNum }}</b>
+                    待整改：<b>{{ qualityCount.rectificationNum }}</b>
                   </p>
                   <p>
                     整改率：<b>{{ qualityCount.completeRatio }}%</b>
@@ -133,7 +133,7 @@
                 <li>
                   <span>安全</span>
                   <p>
-                    待整改：<b>{{ securityCount.notRectificationNum }}</b>
+                    待整改：<b>{{ securityCount.rectificationNum }}</b>
                   </p>
                   <p>
                     整改率：<b>{{ securityCount.completeRatio }}%</b>
@@ -583,7 +583,7 @@ export default {
         selectProjectWorkAndInspectCount({
                 projectSn: data.projectSn,
               }).then((res) => {
-                console.log(res);
+                console.log('大屏项目',res);
                 if (res.code == 200) {
                   this.personCount = res.result.personCount;
                   this.attendancePerson = this.personCount.attendancePerson;
@@ -653,7 +653,7 @@ export default {
         sn: this.projectSn,
       };
       selectCompanyProjectTypeCountApi(data).then((res) => {
-        // console.log(res.result)
+        console.log('大屏顶部数据',res.result)
         if (res.code == 200) {
           this.companyProjectData = res.result;
           this.projectCount = res.result.count;

src/views/companyAdmin/bigScreen/leftMenu.vue

@@ -268,6 +268,7 @@ export default {
             }
             arr.sort(sortNum)
             this.newProjectData = arr
+            console.log("项目概览数据",arr)
             if (this.pageType == 1 ){
                 this.$nextTick(()=>{
                     this.createEchart1();
@@ -468,6 +469,7 @@ export default {
             let data1 = [],
                 data2 = [],
                 data3 = [];
+            console.log("左上角数据",this.projectData)
             this.projectData.list.forEach((item)=>{
                 for(let j = 1; j < 13; j++){
                     if(Number(item.monthTitle.split('-')[1]) == j){
@@ -593,7 +595,7 @@ export default {
                     }
                 ]
             }
-            
+            // console.log("左上角项目概览数据",data1,data2,data3)
             echart1.setOption(this.option1);
         },
         createEchart2(){
@@ -949,7 +951,7 @@ export default {
 
 .seamless-warp{
     width: 100%;
-    height: 164px;
+    height: 80px;
     overflow: auto;
     li:nth-child(2n){
         background: rgba(2, 251, 226, 0.07);

src/views/companyAdmin/bigScreen/rightMenu.vue

@@ -19,9 +19,10 @@
             <div class="list-item" v-if="pageType == 1">
                 <div class="item-content">
                     <div class="item-title"><span></span>巡检情况</div>
-                    <div class="item-detail">暂无数据
+                    <div class="item-detail">
-                       <!-- <div class="condition-title">检查总数<span>208</span></div>
+                        <!-- 暂无数据 -->
-                         <div ref="echart1" style="width:100%; height:148px"></div> -->
+                       <div class="condition-title">检查总数<span>208</span></div>
+                         <div ref="echart1" style="width:100%; height:148px"></div>
                     </div>
                 </div>
             </div>
@@ -29,8 +30,9 @@
             <div class="list-item" v-if="pageType == 1">
                 <div class="item-content">
                     <div class="item-title"><span></span>累计预警工程排行</div>
-                    <div class="item-detail">暂无数据
+                    <div class="item-detail">
-                        <!-- <div ref="echart2" style="width:100%; height:177px"></div> -->
+                        <!-- 暂无数据 -->
+                        <div ref="echart2" style="width:100%; height:177px"></div>
                     </div>
                 </div>
             </div>

src/views/projectAdmin/dataBoard/laborManage.vue

@@ -593,9 +593,9 @@ export default {
       }).then((res) => {
         console.log('在场人员', res)
         this.inSecenList = res.result
-        this.timer = window.setTimeout(() => {
+        // this.timer = window.setTimeout(() => {
-          this.selectProjectPresentWorkerList()
+        //   this.selectProjectPresentWorkerList()
-        }, 5000)
+        // }, 5000)
       })
     },
     //项目人员统计
@@ -610,17 +610,17 @@ export default {
         var json2 = this.statisticsCount.workercount
         var yData1 = [
           json1.age18,
-          json1.age18to25,
+          json1.age18to25 + json1.age25to35 + json1.age35to45,
-          json1.age25to35,
+          // json1.age25to35,
-          json1.age35to45,
+          // json1.age35to45,
           json1.age45to60,
           json1.age60
         ]
         var yData2 = [
           json2.age18,
-          json2.age18to25,
+          json2.age18to25 + json1.age25to35 + json1.age35to45,
-          json2.age25to35,
+          // json2.age25to35,
-          json2.age35to45,
+          // json2.age35to45,
           json2.age45to60,
           json2.age60
         ]

src/views/projectFront/concreteMonitoring/devManage.vue

@@ -321,6 +321,7 @@
                 >
                   <el-input
                   type="number"
+                  oninput="if(value.length>5)value=value.slice(0,5)"
                     v-model="item.temperatureThreshold"
                     style="width: 120px"
                     :placeholder="$t('message.safeManage.placeholder')"

src/views/projectFront/highModulus/pointManage.vue

@@ -164,8 +164,7 @@
                 <el-input
                   size="medium"
                   v-model="scope.row.warningValue"
-                  onkeyup="if(isNaN(value))execCommand('undo')"
+                  type="number"
-                  onafterpaste="if(isNaN(value))execCommand('undo')"
                   oninput="if(value.length>3)value=value.slice(0,3)"
                 ></el-input>
               </template>
@@ -179,8 +178,7 @@
                 <el-input
                   size="medium"
                   v-model="scope.row.alarmValue"
-                  onkeyup="if(isNaN(value))execCommand('undo')"
+                  type="number"
-                  onafterpaste="if(isNaN(value))execCommand('undo')"
                   oninput="if(value.length>3)value=value.slice(0,3)"
                 ></el-input>
               </template>
@@ -213,7 +211,7 @@
     >
       <div class="dialog_content">
         <div class="filterBox">
-          <el-select
+          <!-- <el-select
             size="medium"
             :placeholder="$t('message.highModulus.realData')"
             v-model="filterForm.alarmState"
@@ -226,7 +224,7 @@
               :value="index + 1"
               :label="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
           <el-date-picker
             size="medium"
             v-model="daterange"

src/views/projectFront/laborManage/personModule/administration.vue

@@ -2028,7 +2028,7 @@ export default {
     exportM() {
       window.location.href =
         this.$http.defaults.baseURL +
-        'xmgl/download/exporExcelWorkerTemplate?projectSn=' +
+        '/xmgl/download/exporExcelWorkerTemplate?projectSn=' +
         this.projectSn
     },
     // 下发通行设备

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -2301,7 +2301,7 @@ export default {
     exportM() {
       window.location.href =
         this.$http.defaults.baseURL +
-        'xmgl/download/exporExcelWorkerTemplate?projectSn=' +
+        '/xmgl/download/exporExcelWorkerTemplate?projectSn=' +
         this.projectSn
     },
     // 下发通行设备

src/views/projectFront/laborManage/safetyTrainManage.vue

@@ -830,14 +830,14 @@ export default {
             return;
           }
           this.cardForm.workernum = this.cardForm.list.length;
-          var json = this.cardForm;
+          let json = this.cardForm;
-          var arr = [];
+          let arr = [];
           console.log(json.list);
           json.list.forEach((element) => {
-            var item = {
+            let item = {
               isQualified: element.isQualified,
               score: element.score,
-              workerId: this.isAdd ? element.id : element.workerId,
+              workerId: element.id,
               projectSn: this.$store.state.projectSn,
             };
             if (!this.isAdd) {
@@ -848,7 +848,7 @@ export default {
           });
           json.list = arr;
           if (this.isAdd) {
-            console.log(json);
+            console.log(json,"新增");
             workerSafeEducationAddApi(json).then((res) => {
               this.cardDialog = false;
               this.loadCardData();
@@ -858,7 +858,8 @@ export default {
             });
           } else {
             // console.log(this.cardForm)
-            workerSafeEducationEditApi(this.cardForm).then((res) => {
+            console.log(json,"修改")
+            workerSafeEducationEditApi(json).then((res) => {
               this.cardDialog = false;
               this.loadCardData();
               this.$message.success(

src/views/projectFront/towerCrane/alarmsTable.vue

@@ -346,7 +346,7 @@ export default {
       pageSize: 10,
       total: 0,
       moment: moment,
-      valueTime: '',
+      valueTime: null,
       selectAlarmType: '',
       // 1力矩，2风速，3高度上限位，4幅度内限位，5幅度外限位，6顺时针回转限位,7逆时针回转限位,8倾角,9环境防撞,10多机防撞
       alarmTypeList: [
@@ -404,7 +404,7 @@ export default {
   created() {
     this.projectSn = this.sn ? this.sn : this.$store.state.projectSn;
     this.queryDev()
-    this.selectNowDate()
+    // this.selectNowDate()
     this.queryTowerAlarmList()
   },
   computed: {

src/views/projectFront/towerCrane/liveDataTable.vue

@@ -425,7 +425,7 @@ export default {
         this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
         this.startTime = this.endTime = moment(new Date()).format('YYYY-MM-DD')
         console.log(this.startTime, this.endTime)
-        this.selectNowDate()
+        // this.selectNowDate()
         this.queryDev()
         this.queryTowerCurrentDataList()
     },

src/views/projectFront/towerCrane/violationData.vue

@@ -157,7 +157,7 @@ export default {
   created() {
     this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
     this.queryDev()
-    this.selectNowDate()
+    // this.selectNowDate()
     this.queryTowerWorkCycle()
   },
   computed: {

src/views/projectFront/towerCrane/workCycleTable.vue

@@ -458,7 +458,7 @@ export default {
   created() {
     this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
     this.queryDev()
-    this.selectNowDate()
+    // this.selectNowDate()
     this.queryTowerWorkCycle()
   },
   computed: {