瀏覽代碼

no message

XAWDJ0277HWXPT2\Administrator 5 年之前
父節點
當前提交
11402581b2

文件差異過大導致無法顯示
+ 1 - 0
web/css/chunk-3f41bc09.846ab633.css


文件差異過大導致無法顯示
+ 0 - 1
web/css/chunk-3f41bc09.d60e5254.css


文件差異過大導致無法顯示
+ 1 - 1
web/css/chunk-7ef40bfa.49e11227.css


文件差異過大導致無法顯示
+ 1 - 1
web/index.html


文件差異過大導致無法顯示
+ 2 - 2
web/js/app.1d054846.js


文件差異過大導致無法顯示
+ 1 - 1
web/js/app.1d054846.js.map


文件差異過大導致無法顯示
+ 2 - 0
web/js/chunk-3520c2d6.0171b29b.js


文件差異過大導致無法顯示
+ 1 - 0
web/js/chunk-3520c2d6.0171b29b.js.map


文件差異過大導致無法顯示
+ 0 - 2
web/js/chunk-3520c2d6.7ee1f38c.js


文件差異過大導致無法顯示
+ 0 - 1
web/js/chunk-3520c2d6.7ee1f38c.js.map


文件差異過大導致無法顯示
+ 0 - 2
web/js/chunk-3f41bc09.53b61352.js


文件差異過大導致無法顯示
+ 0 - 1
web/js/chunk-3f41bc09.53b61352.js.map


文件差異過大導致無法顯示
+ 2 - 0
web/js/chunk-3f41bc09.f0656c62.js


文件差異過大導致無法顯示
+ 1 - 0
web/js/chunk-3f41bc09.f0656c62.js.map


文件差異過大導致無法顯示
+ 0 - 1
web/js/chunk-7ef40bfa.1f2be433.js.map


文件差異過大導致無法顯示
+ 2 - 2
web/js/chunk-7ef40bfa.1f2be433.js


文件差異過大導致無法顯示
+ 1 - 0
web/js/chunk-7ef40bfa.253faac8.js.map


文件差異過大導致無法顯示
+ 1 - 1
webConfig/src/store/Barisal.json


+ 15 - 2
webConfig/src/store/node.js

@@ -96,6 +96,7 @@ function writeJson(params){
                 // d.properties.name = d.properties.Dist_name;
                 // d.properties.name = d.properties.Upaz_name;
                 // console.log(d.properties.Dist_name+' '+name,'----8888888888888888-----')
+                let isLog = false;
                 if(d.properties.Divi_name == provinceName){
                     if(d.properties.Dist_name == name){
                         if(d.properties.Upaz_name=='Kutubdia Upazila'||d.properties.Upaz_name=='Maheshkhali Upazila'||d.properties.Upaz_name=='Phulbari Sadar Upazila'||d.properties.Upaz_name=='Bhurungamari Upazila'){
@@ -105,6 +106,9 @@ function writeJson(params){
                             continue
                         }
                         item.properties.name = d.properties.Dist_name+' Division';
+                        if(d.properties.Upaz_name=='Mathbaria Upazila'){
+                            isLog = true;
+                        }
                         if(item.geometry.coordinates.length == 0){
                             number++;
                             item.geometry.coordinates = JSON.parse(JSON.stringify(d.geometry.coordinates));
@@ -155,6 +159,9 @@ function writeJson(params){
                                             yk = y2-y1>0?'+':'-';
                                             ykk = y2;
                                         }
+                                        if(isLog){
+                                            console.log(x2,y2,'-----------------+++++++++++++---------')
+                                        }
                                         break;
                                     }
                                 }
@@ -165,8 +172,14 @@ function writeJson(params){
                             yArr[yIndex] = Number(y2);
                             if(x1||x2||y1||y2){
                                 console.log(xArr,item.geometry.coordinates[0][0].length,yArr,d.geometry.coordinates[0][0].length,'-------')
-                                if(yArr.length == 4){
+                                if(yArr.length >2){
                                     y1 = yArr[2]
+                                    if(yArr[2] == yArr[3]){
+                                        y1 = yArr[3]
+                                        if(yArr[3] == yArr[4]){
+                                            y1 = yArr[4]
+                                        }
+                                    }
                                     y2 = yArr[1]
                                 }
                                 if(y2>y1){
@@ -265,7 +278,7 @@ function writeJson(params){
                 arr3Length = 0;
                 fun(bangladesh.features,'Barisal',name,item)
             }
-            // fun(bangladesh.features,'Barisal','Bhola',item)
+            // fun(bangladesh.features,'Barisal','Pirojpur',item)
         // }
         // fun(bangladesh.features,'Khulna')
         // console.log(cityName)

+ 2 - 1
webConfig/src/views/dashboard.vue

@@ -164,7 +164,7 @@
                                 ref="deviceList"
                                 v-loading="loading.deviceList"
                                 element-loading-background="rgba(0, 0, 0, 0.5)"
-                                height="calc(100% - 3.5rem)"
+                                height="calc(100% - 0rem)"
                                 @cell-mouse-enter="tableEnter"
                                 @cell-mouse-leave="tableLeave"
                                 :data="deviceList">
@@ -1519,6 +1519,7 @@
                         }
                     }
                     .real_time_fault_information_main{
+                        height: calc(100% - 4.6rem);
                         .el-table{
                             margin-top: 1.5rem;
                             width: 100%;

+ 60 - 81
webConfig/src/views/historicalData/historicalData.vue

@@ -4,7 +4,7 @@
         <div>
             <div class="main_top_bg">
             </div>
-                <side-bar-idcol class="side_bar_left" :sideBarList="projectNav" :projectId="projectId" :roadId="roadId" :sideBarListIsOpen="sideBarListIsOpen" :projectSelectFun="projectSelectFun" :roadSelectFun="roadSelectFun" :sideBarIsOn="sideBarIsOn" :sideBarType="sideBarType" :sideBarCompanyList="sideBarCompanyList"></side-bar-idcol>
+                <side-bar-idcol class="side_bar_left" :sideBarList="projectNav"  :companyId="companyId" :projectId="projectId" :roadId="roadId" :sideBarListIsOpen="sideBarListIsOpen" :projectSelectFun="projectSelectFun" :roadSelectFun="roadSelectFun" :sideBarIsOn="sideBarIsOn" :sideBarType="sideBarType" :sideBarCompanyList="sideBarCompanyList"></side-bar-idcol>
             <div style="text-align: center;padding-top: 50px;" v-if="!projectId">
                 <p>{{'There is no project under the current company'}}</p>
             </div>
@@ -432,35 +432,39 @@
                     data =>{
                         // console.log(data,'公司列表')
                         console.log(init)
-                        if(init){
-                            if(type == 0){
-                                if(data.data.length>0){
+                        let storage = window.localStorage;
+                        let companyId = storage.getItem("companyId");
+                        let projectId = storage.getItem("projectId")
+                        if(type == 0){
+                            if(data.data.length>0){
+                                if(projectId){
+                                    this.projectId = projectId;
+                                }else{
                                     this.projectId = data.data[0].id;
-                                    this.reportHome(1,0,data => {
-                                        this.tableList = this.powerTableListEN;
-                                        this.tableData = data.data.list;
-                                    })
-                                    for(let key in data.data){
-                                        this.$set(data.data[key],'isOpen',false)
+                                }
+                                this.reportHome(1,0,data => {
+                                    this.tableList = this.powerTableListEN;
+                                    this.tableData = data.data.list;
+                                })
+                                for(let key in data.data){
+                                    this.$set(data.data[key],'isOpen',false)
+                                    if(data.data[key].id == this.projectId){
+                                        this.$set(data.data[key],'isOpen',true)
                                     }
-                                    this.$set(data.data[0],'isOpen',true)
                                 }
+                            }
 
-                            }else{
-                                if(data.data.length>0){
-                                    for(let key in data.data){
-                                        this.$set(data.data[key],'isOpen',false)
-                                        if(data.data[0].projectList.length>0){
-                                            for(let d of data.data[0].projectList){
-                                                this.$set(d,'isOpen',true)
-                                            }
-                                        }
-                                    }
-                                    this.$set(data.data[0],'isOpen',true)
-                                    this.companyId = data.data[0].cId;
+                        }else{
+                            if(data.data.length>0){
+                                if(companyId){
+                                    this.companyId = companyId;
                                     if(data.data[0].projectList.length>0){
-                                        this.projectId = data.data[0].projectList[0].id;
-                                        this.$set(data.data[0].projectList[0],'isOpen',true)
+                                        if(projectId){
+                                            this.projectId = projectId;
+                                        }else{
+                                            this.projectId = data.data[0].projectList[0].id;
+                                        }
+                                        // this.$set(data.data[0].projectList[0],'isOpen',true)
                                         this.reportHome(1,0,data => {
                                             this.tableList = this.powerTableListEN;
                                             this.tableData = data.data.list;
@@ -479,55 +483,15 @@
                                         this.fault = 0;
                                     }
                                 }else{
-                                    this.companyId = null
-                                    this.projectId = null;
-                                    this.deviceTotalData = {
-                                        light_num:0,
-                                        online_num:0,
-                                        fault_count:0,
-                                        network_num:0
-                                    };
-                                    this.deviceList = [];
-                                    this.total = 0;
-                                    this.count = 0;
-                                    this.fault = 0;
-                                }
-                            }
-                        }else{
-                            if(type == 0){
-                                if(data.data.length>0){
-                                    this.projectId = data.data[0].id;
-                                    this.reportHome(1,0,data => {
-                                        this.tableList = this.powerTableListEN;
-                                        this.tableData = data.data.list;
-                                    })
-                                    for(let key in data.data){
-                                        this.$set(data.data[key],'isOpen',false)
-                                    }
-                                    this.$set(data.data[0],'isOpen',true)
-                                }
-
-                            }else{
-                                if(data.data.length>0){
-                                    for(let key in data.data){
-                                        this.$set(data.data[key],'isOpen',false)
-                                        if(data.data[0].projectList.length>0){
-                                            for(let d of data.data[0].projectList){
-                                                this.$set(d,'isOpen',true)
-                                            }
-                                        }
-                                    }
-                                    this.$set(data.data[0],'isOpen',true)
                                     this.companyId = data.data[0].cId;
                                     if(data.data[0].projectList.length>0){
                                         this.projectId = data.data[0].projectList[0].id;
-                                        this.$set(data.data[0].projectList[0],'isOpen',true)
+                                        // this.$set(data.data[0].projectList[0],'isOpen',true)
                                         this.reportHome(1,0,data => {
                                             this.tableList = this.powerTableListEN;
                                             this.tableData = data.data.list;
                                         })
                                     }else{
-                                        this.projectId = null;
                                         this.projectId = null;
                                         this.deviceTotalData = {
                                             light_num:0,
@@ -540,22 +504,37 @@
                                         this.count = 0;
                                         this.fault = 0;
                                     }
-                                }else{
-                                    this.companyId = null;
-                                    this.projectId = null;
-                                    this.deviceTotalData = {
-                                        light_num:0,
-                                        online_num:0,
-                                        fault_count:0,
-                                        network_num:0
-                                    };
-                                    this.deviceList = [];
-                                    this.total = 0;
-                                    this.count = 0;
-                                    this.fault = 0;
                                 }
+                                for(let key in data.data){
+                                    this.$set(data.data[key],'isOpen',false)
+                                    if(data.data[key].cId == this.companyId){
+                                        this.$set(data.data[key],'isOpen',true)
+                                    }
+                                    if(data.data[0].projectList.length>0){
+                                        for(let d of data.data[0].projectList){
+                                            this.$set(d,'isOpen',true)
+                                            if(d.id == this.projectId){
+                                                this.$set(d,'isOpen',true)
+                                            }
+                                        }
+                                    }
+                                }
+                            }else{
+                                this.companyId = null
+                                this.projectId = null;
+                                this.deviceTotalData = {
+                                    light_num:0,
+                                    online_num:0,
+                                    fault_count:0,
+                                    network_num:0
+                                };
+                                this.deviceList = [];
+                                this.total = 0;
+                                this.count = 0;
+                                this.fault = 0;
                             }
                         }
+                        console.log(this.companyId)
                         this.projectNav = data.data;
                     },
                 this)
@@ -580,8 +559,9 @@
             },
             projectSelectFun(type,data,d){
                 var storage = window.localStorage;
+                console.log(type,data,d)
                 storage.setItem('projectId',data.id);
-                if(this.sideBarCompanyType != 0){
+                if(type != 0){
                     if(d.cId != this.companyId){
                         this.companyId = d.cId;
                         storage.setItem('companyId',d.cId);
@@ -596,7 +576,6 @@
                     this.$set(data,'isOpen',false)
                     this.maplampListDW();
                 }
-
                 this.reportHome(1,0,data => {
                     this.tableData = data.data.list;
                 })

+ 28 - 64
webConfig/src/views/operationLog/operationLog.vue

@@ -4,25 +4,14 @@
         <div class="main_top_bg">
         </div>
         <div class="wrap">
-            <div class="main_top clearfix">
+            <div class="main_top">
                 <div class="search_box">
-                    <el-input v-if="version == 0" placeholder="- 输入关键词进行搜索" v-model="keyword" class="search" @change = "search">
-                        <template slot="prepend" @click="search()">搜索</template>
-                    </el-input>
-                    <el-input v-if="version == 1" placeholder="- Enter keywords to search" v-model="keyword" class="search" @change = "search">
+                    <el-input placeholder="- Enter keywords to search" v-model="keyword" class="search" @change = "search">
                         <template slot="prepend" @click="search()">Search</template>
                     </el-input>
                 </div>
                 <div class="button_box">
-                    <el-select v-model="reportType" placeholder="" @change="reportTypeFun" v-if="version == 0">
-                        <el-option
-                          v-for="item in reportList"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                    </el-select>
-                    <el-select v-model="reportType" placeholder="" @change="reportTypeFun" v-if="version == 1">
+                    <el-select v-model="reportType" placeholder="" @change="reportTypeFun">
                         <el-option
                           v-for="item in reportListEN"
                           :key="item.value"
@@ -30,51 +19,17 @@
                           :value="item.value">
                         </el-option>
                     </el-select>
-                    <el-button round @click="exportExcel()" v-loading="loading.exportExcel">{{version == 0 ?'导出Excel' : 'Export Excel'}}</el-button>
-                    <el-button round @click="printing()" v-loading="loading.printing">{{version == 0 ?'打印列表' : 'Print'}}</el-button>
+                    <el-button round @click="exportExcel()" v-loading="loading.exportExcel">{{'Export Excel'}}</el-button>
+                    <el-button round @click="printing()" v-loading="loading.printing">{{'Print'}}</el-button>
                 </div>
             </div>
             <div class="information_box">
                 <el-table
-                    v-loading="loading.table"
-                    v-if="version == 0"
-                    ref="elTable"
-                    :data="tableData"
-                    border
-                    width="100%"
-                    :height="showOverflowTooltip?'calc(100% - 92px)':''"
-                    :row-class-name="tableRowClassName">
-                    <!-- <el-table-column
-                      type="selection"
-                      width="48">
-                    </el-table-column> -->
-                    <el-table-column
-                      v-if="version == 0"
-                      label="编号"
-                      prop="GL_index"
-                      align="center"
-                      width="82">
-                    </el-table-column>
-                    <el-table-column
-                      v-if="version == 1"
-                      label="Number"
-                      prop="GL_index"
-                      align="center"
-                      width="82">
-                    </el-table-column>
-                    <el-table-column align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" width="160px" v-for="(item) in tableList">
-                    </el-table-column>
-                    <!-- <el-table-column align="left" header-align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" :min-width="(item.label.length+1)*14+20" v-for="(item,index) in tableList" v-if="index == 4">
-                    </el-table-column> -->
-                </el-table>
-                <el-table
-                    v-if="version == 1"
                     :data="tableData"
                     ref="elTable"
                     border
                     width="100%"
-                    :height="showOverflowTooltip?'calc(100% - 92px)':''"
-                    :row-class-name="tableRowClassName">
+                    :height="showOverflowTooltip?'calc(100% - 92px)':''">
                     <!-- <el-table-column
                       type="selection"
                       width="48">
@@ -85,7 +40,7 @@
                       align="center"
                       width="80">
                     </el-table-column>
-                    <el-table-column align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" width="160px" v-for="(item) in tableListEN">
+                    <el-table-column align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" min-width="160px" v-for="(item) in tableListEN">
                     </el-table-column>
                     <!-- <el-table-column align="left" header-align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" :min-width="(item.label.length+1)*9+20" v-for="(item,index) in tableListEN" v-if="index == 4">
                     </el-table-column> -->
@@ -258,12 +213,6 @@
                 this)
             },
             /*表格*/
-            tableRowClassName({rowIndex}) {
-                if (rowIndex%2 == 0) {
-                  return 'row_bg';
-                }
-                return '';
-            },
             /*分页*/
             handleSizeChange(val) {
                 this.pageSize = val;
@@ -303,8 +252,9 @@
             margin-bottom: 29px;
             padding-top: 32px;
             position: relative;
+            display: flex;
+            justify-content: space-between;
             .search_box{
-                float: left;
                 width:344px;
                 height:50px;line-height: 50px;
                 background:rgba(255,255,255,1);
@@ -330,7 +280,6 @@
                 }
             }
             .button_box{
-                float: right;
                 .el-select .el-input__inner{
                     background: linear-gradient(#3682fb, #38a1f6);
                     border-radius: 20px;
@@ -350,11 +299,26 @@
             width:100%;
             border-top: 1px solid #DDE4ED;
             .el-table{
-                tr:hover>td{
-                    background: inherit;
+                th,td{
+                    padding: 0;
+                    >.cell{
+                        padding: 0 0.5rem;
+                    }
+                }
+                th{
+                    height: 3.33rem;line-height: 3.33rem;
+                    background:rgba(246,248,250,1);
+                    font-size:1rem;
+                    font-family:PingFang-SC-Medium,PingFang-SC;
+                    font-weight:500;
+                    color:rgba(102,102,102,1);
                 }
-                .row_bg{
-                    background: #F6F6F9;
+                td{
+                    height: 4.2rem;line-height: 4.2rem;
+                    font-size:1rem;
+                    font-family:PingFangSC-Medium,PingFang SC;
+                    font-weight:500;
+                    color:rgba(51,51,51,1);
                 }
             }
             .paging_box{