解决冲突

src/assets/i18n/langs/cn/companyAdmin/companyDiagram.js

@@ -177,8 +177,8 @@ export default {
       qualityManage: '质量管理',
       // sunRainTable: '晴雨表',
       devAlarm:'设备报警',
-      rectificationQualityQuestion: '已整改安全问题',
+      rectificationQualityQuestion: '已整改',
-      noRectificationQualityQuestion: '未整改安全问题',
+      noRectificationQualityQuestion: '未整改',
       alarmRecord: '报警列表',
       noData: '暂无数据',
       optionList:[

src/assets/js/http.js

@@ -43,6 +43,7 @@ if (process.env.NODE_ENV == 'development') {
     // tag: 本地
     axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
+    // axios.defaults.baseURL = 'http://139.9.66.234:8/'; 
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
     // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
@@ -75,6 +76,7 @@ else if (process.env.NODE_ENV == 'debug') {
     axios.defaults.baseURL = window.location.protocol + "//" + host + "/"
     // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
     // axios.defaults.baseURL = 'http://192.168.34.125:6023/';
+    axios.defaults.baseURL = 'http://139.9.66.234:8/'
     // axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
 }
 

src/router/index.js

@@ -1406,6 +1406,7 @@ const routes2 = [
         name: '数据看板',
         // component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve),
         component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve),
+
         children: [{
                 path: 'index',
                 name: '数据看板-首页概览',

src/views/projectAdmin/dataBoard/dataBoard.vue

@@ -1,193 +1,229 @@
 <template>
-    <div class="fullHeight dataBoardPage" :class="{'dataBoardPage_blue':enabledProjectV2==3,'dataBoardPage_blue2':enabledProjectV2==4 ,'longguangBg':company=='longguang'}">
+  <div
-        <div class="headerBox">
+    class="fullHeight dataBoardPage"
-            <p class="projectName">{{ $store.state.currentProDetail.projectName }}</p>
+    :class="{
-            <h1 class="title">
+      dataBoardPage_blue: enabledProjectV2 == 3,
-                <img v-if="headerLogo" style="width: auto;height: 30px;margin-right: 16px;" :src="headerLogo" />
+      dataBoardPage_blue2: enabledProjectV2 == 4,
-                <span v-if="company != 'longguang'">
+      longguangBg: company == 'longguang',
-                <!-- 智慧工地云平台 -->
+    }"
-                {{$t('message.dataBoard.headerTitle')}}
+  >
-                </span>
+    <div class="headerBox">
-                <span v-else style="color:#fff;margin-top:15px">
+      <img
-                <!-- 龙光智慧工地平台 -->
+        style="
-                {{$t('message.dataBoard.headerTitle2')}}
+          width: auto;
-                </span>
+          height: 42px;
-                <!-- {{ $t("message.carOverview.vehicleStatistics") }} -->
+          width: auto;
-            </h1>
+          height: 42px;
-            <div class="headerDataBox">
+          margin-left: 280px;
-                <div class="date">{{date}}</div>
+          margin-top: 12px;
-                <div class="time">{{time}}</div>
+          position: absolute; 
+        "
+        src="@/assets/images/dataBoard/led_logo.png"
+        alt=""
+      />
+      <!-- <p class="projectName">{{ $store.state.currentProDetail.projectName }}</p> -->
+      <h1 class="title">
+        <img
+          v-if="headerLogo"
+          style="width: auto; height: 30px; margin-right: 16px"
+          :src="headerLogo"
+        />
 
-                <!-- <div class="weatherBox"> -->
+        <span v-if="company != 'longguang'">
-                    <img class="weaImg" :src="weatherInfo.url" width="26" height="26" />
+          <!-- 智慧工地云平台 -->
-                    <div class="tem">{{ weatherInfo.tem2 }} ~ {{ weatherInfo.tem1 }}</div>
+          <!-- {{ $t('message.dataBoard.headerTitle') }} -->
-                    <div class="wea">{{ weatherInfo.wea }}</div>
+          <p>中建四局数字建造管控平台</p>
-                <!-- </div> -->
+          <p style="font-size:24px">科创大厦项目</p>
-                <!-- <div style="text-align: center;"> -->
+        </span>
-                    <div class="win_speed">{{ weatherInfo.win_speed }}</div>
+        <span v-else style="color: #fff; margin-top: 15px">
-                    <!-- <div>风力</div> -->
+          <!-- 龙光智慧工地平台 -->
-                <!-- </div> -->
+          {{ $t('message.dataBoard.headerTitle2') }}
-            </div>
+        </span>
+        <!-- {{ $t("message.carOverview.vehicleStatistics") }} -->
+      </h1>
+      <div class="headerDataBox">
+        <div class="date">{{ date }}</div>
+        <div class="time">{{ time }}</div>
 
-            <closePage></closePage>
+        <!-- <div class="weatherBox"> -->
-        </div>
+        <img class="weaImg" :src="weatherInfo.url" width="26" height="26" />
-        <div class="leftLine" v-if="enabledProjectV2!=3"></div>
+        <div class="tem">{{ weatherInfo.tem2 }} ~ {{ weatherInfo.tem1 }}</div>
-        <div class="rightLine" v-if="enabledProjectV2!=3"></div>
+        <div class="wea">{{ weatherInfo.wea }}</div>
-        <div class="bottomLine" v-if="enabledProjectV2!=3"></div>
+        <!-- </div> -->
-        <div style="height: 40px" class="menuBox">
+        <!-- <div style="text-align: center;"> -->
-            <ul v-if="parameterUrl.COMPANY != 'longguang'" class="left">
+        <div class="win_speed">{{ weatherInfo.win_speed }}</div>
-                <li v-for="(item,index) in menuList" :key="index" :class="{'right':index > (menuList.length-1)/2,'active':$route.path==item.modulePath}" @click="menuClick(item,index)">{{item.moduleName}}</li>
+        <!-- <div>风力</div> -->
-            </ul>
+        <!-- </div> -->
-        </div>
+      </div>
-        <div class="dataBoardContent">
+
-            <router-view ></router-view>
+      <closePage></closePage>
-        </div>
     </div>
+    <div class="leftLine" v-if="enabledProjectV2 != 3"></div>
+    <div class="rightLine" v-if="enabledProjectV2 != 3"></div>
+    <div class="bottomLine" v-if="enabledProjectV2 != 3"></div>
+    <div style="height: 40px" class="menuBox">
+      <ul v-if="parameterUrl.COMPANY != 'longguang'" class="left">
+        <li
+          v-for="(item, index) in menuList"
+          :key="index"
+          :class="{
+            right: index > (menuList.length - 1) / 2,
+            active: $route.path == item.modulePath,
+          }"
+          @click="menuClick(item, index)"
+        >
+          {{ item.moduleName }}
+        </li>
+      </ul>
+    </div>
+    <div class="dataBoardContent">
+      <router-view></router-view>
+    </div>
+  </div>
 </template>
 <script>
-    function GetRequest() {
+function GetRequest() {
-        var url = decodeURI(window.location.href); //?id="123456"&Name="bicycle";
+  var url = decodeURI(window.location.href); //?id="123456"&Name="bicycle";
-        var object = {};
+  var object = {};
-        if(url.indexOf("?") != -1)//url中存在问号，也就说有参数。
+  if (url.indexOf("?") != -1)//url中存在问号，也就说有参数。
-        {
+  {
-            var str = url.substr(url.indexOf("?")+1); //得到?后面的字符串
+    var str = url.substr(url.indexOf("?") + 1); //得到?后面的字符串
-            var strs = str.split("&"); //将得到的参数分隔成数组[id="123456",Name="bicycle"];
+    var strs = str.split("&"); //将得到的参数分隔成数组[id="123456",Name="bicycle"];
-            for(var i = 0; i < strs.length; i ++)
+    for (var i = 0; i < strs.length; i++) {
-            {
+      object[strs[i].split("=")[0]] = strs[i].split("=")[1]
-                object[strs[i].split("=")[0]]=strs[i].split("=")[1]
+    }
-            }
+  }
-        }
+  return object;
-        return object;
+}//截取地址栏的参数
-    }//截取地址栏的参数
 import closePage from "@/components/closePage"
 import {
   getWeatherDataApi
 } from "@/assets/js/api/environmentManage";
 export default {
-    components:{closePage},
+  components: { closePage },
-    data(){
+  data() {
-        return{
+    return {
-            menuIndex:0,
+      menuIndex: 0,
-            menuList:[],
+      menuList: [],
-            enabledProjectV2:2,
+      enabledProjectV2: 2,
-            date:'',
+      date: '',
-            time:'',
+      time: '',
-            weatherInfo:{
+      weatherInfo: {
-                wea_img:'',
+        wea_img: '',
-                tem1:'',tem2:'',
+        tem1: '', tem2: '',
-                wea:'',win_speed:'',url:'',
+        wea: '', win_speed: '', url: '',
-                cityName: ""
+        cityName: ""
-            },
+      },
-            parameterUrl:'',
+      parameterUrl: '',
-            headerLogo: ""
+      headerLogo: ""
-        }
+    }
-    },
+  },
-    created(){
+  created() {
-        this.parameterUrl = GetRequest()
+    this.parameterUrl = GetRequest()
-        // COMPANY: "longguang"
+    // COMPANY: "longguang"
-        this.company = COMPANY;
+    this.company = COMPANY;
-        console.log(GetRequest().COMPANY != 'longguang');
+    console.log(GetRequest().COMPANY != 'longguang');
-    },
+  },
-    mounted(){
+  mounted() {
-        if(localStorage.getItem('systemInfo')){
+    if (localStorage.getItem('systemInfo')) {
-            this.headerLogo = JSON.parse(localStorage.getItem('systemInfo')).bigScreenLogo
+      this.headerLogo = JSON.parse(localStorage.getItem('systemInfo')).bigScreenLogo
-        }
+    }
+    this.getTime()
+    this.loadWeather()
+    this.enabledProjectV2 = enabledProjectV2
+    document.title = this.$store.state.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard')
+    this.getAllModule()
+  },
+  methods: {
+    getTime() {
+      var myDate = new Date(); //实例一个时间对象；
+      this.date = myDate.getFullYear();   //获取系统的年；
+      this.date += '-' + (myDate.getMonth() + 1);   //获取系统月份，由于月份是从0开始计算，所以要加1
+      this.date += '-' + myDate.getDate(); // 获取系统日，
+      this.time = ' ' + myDate.getHours(); //获取系统时，
+      this.time += ':' + myDate.getMinutes(); //分
+      this.time += ':' + myDate.getSeconds(); //秒
+
+      setTimeout(() => {
         this.getTime()
-        this.loadWeather()
+      }, 1000);
-        this.enabledProjectV2=enabledProjectV2
-        document.title=this.$store.state.currentProDetail.projectName+this.$t('message.dataBoard.dataBoard')
-        this.getAllModule()
     },
-    methods:{
+    loadWeather() {
-        getTime(){
+      var _this = this
-            var myDate = new Date(); //实例一个时间对象；
+      getWeatherDataApi({ cityid: this.$store.state.currentProDetail.cityCode }).then((res) => {
-            this.date=myDate.getFullYear();   //获取系统的年；
+        var json = JSON.parse(res.result);
-            this.date+='-'+(myDate.getMonth()+1);   //获取系统月份，由于月份是从0开始计算，所以要加1
+        console.log(json);
-            this.date+='-'+myDate.getDate(); // 获取系统日，
+        this.weatherInfo = json.data[0]
-            this.time=' '+myDate.getHours(); //获取系统时，
+        this.weatherInfo.url = require('@/assets/images/weather/' + this.weatherInfo.wea_img + '.png')
-            this.time+=':'+myDate.getMinutes(); //分
+      });
-            this.time+=':'+myDate.getSeconds(); //秒
+    },
+    getAllModule() {
+      var half = this.$store.state.userInfo.menuAuthority.moduleList
+      console.log(half)
+      half.forEach(element => {
+        console.log(element.moduleName)
+        if (element.moduleType == 4) {
+          console.log(element)
+          this.menuList.push(element)
+        }
+      });
+    },
+    menuClick(item, index) {
+      console.log('item', item)
+      this.menuIndex = index;
 
-            setTimeout(() => {
+      if (item.modulePath.includes('http://') || item.modulePath.includes('https://')) {
-                this.getTime()
+        return window.open(item.modulePath)
-            }, 1000);
+      }
-        },
-        loadWeather(){
-            var _this = this
-            getWeatherDataApi({cityid:this.$store.state.currentProDetail.cityCode}).then((res) => {
-                var json = JSON.parse(res.result);
-                console.log(json);
-                this.weatherInfo = json.data[0]
-                this.weatherInfo.url = require('@/assets/images/weather/'+this.weatherInfo.wea_img+'.png')
-            });
-        },
-        getAllModule(){
-            var half = this.$store.state.userInfo.menuAuthority.moduleList
-            console.log(half)
-            half.forEach(element => {
-                console.log(element.moduleName)
-                if(element.moduleType==4){
-                    console.log(element)
-                    this.menuList.push(element)
-                }
-            });
-        },
-        menuClick(item,index){
-            console.log('item', item)
-            this.menuIndex = index;
 
-            if (item.modulePath.includes('http://') || item.modulePath.includes('https://')) {
+      if (item.moduleName == '智能安全帽') {
-                return window.open(item.modulePath)
+        let NodeRSA = require("node-rsa");
-            }
+        //请求参数
-
+        let params = JSON.stringify({
-            if(item.moduleName == '智能安全帽') {
+          // account: '妇幼保健院',
-                let NodeRSA = require("node-rsa");
+          account: this.$store.state.userInfo.account,
-                //请求参数
+          page_flag: 3,
-                let params = JSON.stringify({
+        });
-                    // account: '妇幼保健院',
+        //公钥
-                    account: this.$store.state.userInfo.account,
+        const pubKey = `
-                    page_flag: 3,
-                });
-                //公钥
-                const pubKey = `
             -----BEGIN PUBLIC KEY-----
             MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcmP0ug4NTHwW2oeHxheZjmYPDxVGFP770eECdLwRtaH0pPWvsXG6MSO/kCzgjEVEo1K1bvRxkkasQRu02fhI+gsZa8wvVeo3s4zJDA48Oj99JAXsx56/WN1RlNh+tsXcH9oQWy3gbX5cDkheuVZj8gsV7Ez59Ucj4e78zNJrUDwIDAQAB
             -----END PUBLIC KEY-----`;
 
-                var publicKey = new NodeRSA(pubKey);
+        var publicKey = new NodeRSA(pubKey);
-                var async_key = publicKey.encrypt(params, 'base64')
+        var async_key = publicKey.encrypt(params, 'base64')
-                window.open("http://58.210.96.206:91/async_danzhou.html?async_key="+async_key)
+        window.open("http://58.210.96.206:91/async_danzhou.html?async_key=" + async_key)
-                // window.location.href = "http://58.210.96.206:91/async_danzhou.html?async_key="+async_key;
+        // window.location.href = "http://58.210.96.206:91/async_danzhou.html?async_key="+async_key;
-            } else {
+      } else {
-                this.$router.push(item.modulePath)
+        this.$router.push(item.modulePath)
-            }
+      }
-            
+
-        }
     }
+  }
 }
 </script>
 <style lang="less" scoped>
- @import url("./style.less");
+@import url('./style.less');
- .headerDataBox{
+.headerDataBox {
-     position: absolute;
+  position: absolute;
-     right: 100px;
+  right: 100px;
-     top:5px;
+  top: 5px;
-     display: flex;
+  display: flex;
-     align-items: center;
+  align-items: center;
-     font-size: 16px;
+  font-size: 16px;
-    //  .time{
+  //  .time{
-    //      font-size: 22px;
+  //      font-size: 22px;
-    //  }
+  //  }
-     &>*{
+  & > * {
-         margin-right: 20px;
+    margin-right: 20px;
-     }
+  }
- }
+}
- .headerBox{
+.headerBox {
-     .title{
+  .title {
-         display: flex;
+    display: flex;
-         align-items: center;
+    align-items: center;
-         justify-content: center;
+    justify-content: center;
-         font-size: 32px;
+    font-size: 32px;
-     }
+  }
- }
+}
 </style>

src/views/projectAdmin/dataBoard/style.less

@@ -1,5 +1,7 @@
 .dataBoardPage{
-    background-color: #040D15;
+    // background-color: rgba(8,93,150, 1);
+    background-image: url(../../../assets/images/dataBoard/bgImg.png);
+
     position: relative;
     color: rgba(255, 255, 255, 0.8);
 }
@@ -88,7 +90,7 @@
     }
 }
 /deep/.blockBox{
-    height: calc(33.33% - 25px);
+    height: calc(33.33% - 100px);
     margin-bottom: 25px;
     width: 100%;
     position: relative;
@@ -269,7 +271,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
         
         .top{
             height: 57%;
-            background-image: url('../../../assets/images/dataBoard/centerTopBG.png');;
+            // background-image: url('../../../assets/images/dataBoard/centerTopBG.png');
             background-size: 100% 100%;
             background-position: center;
             background-repeat: no-repeat;
@@ -279,7 +281,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
         .bottom{
             margin: 10px 20px;
             height: calc(43% - 20px);
-            background-image: url('../../../assets/images/dataBoard/centerBottomBG.png');
+            // background-image: url('../../../assets/images/dataBoard/centerBottomBG.png');
             background-size: 100% 100%;
             background-position: center;
             background-repeat: no-repeat;
@@ -372,10 +374,12 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
     .bottomInner{
         width: calc(100% - 60px);
         margin: 0 30px;
+        margin-top: 130px;
     }
     .timeBox{
         display: flex;
-        justify-content: space-between;
+        justify-content: center;
+        // justify-content: space-between;
         align-items: center;
     }
     .timeInner{
@@ -581,6 +585,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
                 margin-left: 0;
                 margin-right: 0;
                 width: 100%;
+                margin-top: 130px;
             }
             .top{
                 height: 60%;

src/views/projectAdmin/dataBoardTwo/contractManage.vue

@@ -1,12 +1,12 @@
 <template>
 <div>
   <div class="imgbox">
-       <img class="img" src="../../../assets/images/qualityManage/hygl.png" alt="">
+       <img class="img" src="../../../assets/images/qualityManage/hygl3.png" alt="">
 
   </div>
-  <div class="imgbox" style="margin-top: 30px;">
+  <!-- <div class="imgbox" style="margin-top: 30px;">
     <img src="../../../assets/images/qualityManage/hygl2.png" alt="">
-  </div>
+  </div> -->
    
 </div>
 </template>

src/views/projectAdmin/dataBoardTwo/style.less

@@ -88,7 +88,8 @@
     }
 }
 /deep/.blockBox{
-    height: calc(33.33% - 25px);
+    // height: calc(33.33% - 25px);
+    height: calc(33.33% -100px);
     margin-bottom: 25px;
     width: 100%;
     position: relative;
@@ -269,7 +270,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
         
         .top{
             height: 57%;
-            background-image: url('../../../assets/images/dataBoardTwo/top.png');;
+            // background-image: url('../../../assets/images/dataBoardTwo/top.png');
             background-size: 100% 100%;
             background-position: center;
             background-repeat: no-repeat;
@@ -372,10 +373,11 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
     .bottomInner{
         width: calc(100% - 60px);
         margin: 0 30px;
+        margin-top: 130px;
     }
     .timeBox{
         display: flex;
-        justify-content: space-between;
+        justify-content: center;
         align-items: center;
     }
     .timeInner{
@@ -581,6 +583,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
                 margin-left: 0;
                 margin-right: 0;
                 width: 100%;
+               
             }
             .top{
                 height: 60%;