Merge branch 'master' of http://111.61.77.35:9999/lizhichao/whp-xl

dcit-hcsystem-hcsystem-master/src/views/Enterprises/EnterprisesMg.vue

@@ -64,7 +64,7 @@
           <el-button type="danger" size="small" @click="setLock(scope.row)" v-if="scope.row.accountStatus === '0'">
             <i class="el-icon-lock"></i>注销
           </el-button>
-		  <el-button type="success" size="small" @click="setLock(scope.row)" v-if="scope.row.accountStatus === '2'">
+		  <el-button type="success" size="small" @click="setEnable(scope.row)" v-if="scope.row.accountStatus === '2'">
 		    <i class="el-icon-unlock"></i>启用
 		  </el-button>
         </template>
@@ -181,6 +181,29 @@ export default class EnterprisesMg extends Vue {
         );
       });
   }
+  setEnable(row: any){
+    let that = this;
+    that.$confirm(`确定启用企业 ${row.unitName} 吗?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+    })
+    .then(() => {
+      METHOD.axiosGet(
+        that,
+        `/enterpriseInfo/enableEnterpriseInfoById/${row.enterpriseId}`,
+        function(res: any) {
+          if (res.code == 0) {
+            (that as any).$message({
+              type: "success",
+              message: "启用成功!"
+            });
+            that.getTableData();
+          }
+        }
+      );
+    });
+  }
   /*选择城市*/
   changeFun(v: any) {
     this.searchData.provinceId = v[0];

dcit-hcsystem-hcsystem-master/src/views/Enterprises/tongji.vue

@@ -81,21 +81,21 @@
 					<img src="../../assets/logo2.png" width="25%" style="margin-top: 2rem;">
 					<p>危险源数量</p>
 				</div>
-				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">12345</div>
+				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">{{tjNumberObj.dangerNum}}</div>
 			</div>
 			<div class="el-tab-pane-div second-div" style="">
 				<div style="width: 40%;height: 100%; text-align: center;float: left;font-size: 15px;">
 					<img src="../../assets/logo2.png" width="25%" style="margin-top: 2rem;">
 					<p>注册企业数量</p>
 				</div>
-				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">12345</div>
+				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">{{tjNumberObj.enterpriseRegNum}}</div>
 			</div>
 			<div class="el-tab-pane-div second-div" style="">
 				<div style="width: 40%;height: 100%; text-align: center;float: left;font-size: 15px;">
 					<img src="../../assets/logo2.png" width="25%" style="margin-top: 2rem;">
 					<p>待审批数量</p>
 				</div>
-				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">12345</div>
+				<div style="width: 60%;height: 100%;text-align: center;line-height: 9rem;float: right;font-size: 3rem;font-family: 'UnidreamLED';">{{tjNumberObj.enterpriseCheckIngNum}}</div>
 			</div>
 		</div>
 		<Demo></Demo>
@@ -136,6 +136,7 @@ export default class EnterprisesMg extends Vue {
   @Provide() searchData: any = {};
   @Provide() loading: Boolean = false;
   @Provide() cityval: any = [];
+  @Provide() tjNumberObj: any = {};
   //编辑组件
   @Provide() dialogVisible: Boolean = false;
   @Provide() formData: any = { dataType: "", enterpriseId: "" };
@@ -157,6 +158,19 @@ export default class EnterprisesMg extends Vue {
       }
     );
   }
+	getStatiData() {
+		let that = this;
+		METHOD.axiosPost(
+			that,
+			`/dataStatistics/managerDataStatistics`,
+			{ cityId: "", countyId: "", provinceId: "" },
+			function (res: any) {
+				if (res.code == 0) {
+					that.tjNumberObj = res.data;
+				}
+			}
+		);
+	}
   searchFun() {
     this.PAGE = { page: 1, size: 10 };
     this.getTableData();
@@ -196,6 +210,9 @@ export default class EnterprisesMg extends Vue {
   created() {
     this.getTableData();
   }
+  mounted() {
+	this.getStatiData();
+  }
 }
 </script>
 <style lang="scss" scoped>

dcit-hcsystem-hcsystem-master/src/views/Layout/Content.vue

@@ -88,6 +88,7 @@ export default class Content extends Vue {
   height: 100%;
   overflow: auto;
   box-sizing: border-box;
+  padding: 10px;
 }
 .el-container {
   height: 100%;

dcit-hcsystem-hcsystem-master/src/views/Video/VideoList.vue

 <template>
-  <div class="pomentWrap">
+  <div class="pomentWrap" style="background-color: black">
     <el-row :gutter="5" type="flex" justify="space-around">
       <el-col :xs="12" :sm="12" :md="6" :lg="4" :xl="4">
         <div class="topBar">
-          <el-tree
+          <el-tree id="videoTree"
                   :data="treeData"
                   :props="treeProps"
                   ref="Tree"
@@ -12,16 +12,32 @@
                   :default-expanded-keys="[0]"
                   :default-checked-keys="[]"
                   @node-click="nodeClick"
+                  style="background-color: black; color: #a5a5a8"
           >
-            <!--<template slot-scope="{node, data}">
+            <template slot-scope="{node, data}">
               <span>
                 <i class="'#' + iconArrClass[data.level]" aria-hidden="true">
                 </i>
                 {{node.label}}
               </span>
-            </template>-->
+            </template>
           </el-tree>
         </div>
+       <!-- <div class="controlBtn">
+          <div class="directionBg1">
+            <div class="directionBg2">
+              <a data-action="upleft" class="button upleft"></a>
+              <a data-action="up" class="button up"></a>
+              <a data-action="upright" class="button upright"></a>
+              <a data-action="left" class="button left"></a>
+              <a data-action="pointgoto" class="button reset"></a>
+              <a data-action="right" class="button right"></a>
+              <a data-action="downleft" class="button downleft"></a>
+              <a data-action="down" class="button down"></a>
+              <a data-action="downright" class="button downright"></a>
+            </div>
+          </div>
+        </div>-->
       </el-col>
 
       <el-col :xs="12" :sm="12" :md="18" :lg="20" :xl="20">
@@ -56,6 +72,19 @@
 </template>
 <style lang="scss" scped>
   @import '@/utils/public.scss';
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #a5a5a8;
+    color: #454547;
+  }
+  .el-tree--highlight-current .el-tree-node > .el-tree-node__content:hover {
+    background-color: #a5a5a8;
+    color: white;
+  }
+  main > div {
+    background: #ffffff;
+    height: calc(100vh - 111px) !important;
+    padding: 0px 0px 0px 10px !important;
+  }
   .row{
     display: flex;
     .box{
@@ -73,17 +102,17 @@
   .novideo{
     /*padding: 147px 0px 147px 0px;
     display: block;*/
-    line-height: calc((100vh - 120px)/2);
+    line-height: calc((100vh - 114px)/2);
     color: white;
   }
-  /*.nodeImg1{
-    background: url("//assets//qiye.png") no-repeat center,
+/*  .nodeImg1{
+    background: url('../../assets/qiye.png') no-repeat center,
   }
   .nodeImg2{
-    background: url("//assets//enterprises.png") no-repeat center,
+    background: url("../../assets/enterprises.png") no-repeat center,
   }
   .nodeImg3{
-    background: url("//assets//video.png") no-repeat center,
+    background: url("../../assets/video.png") no-repeat center,
   }*/
 </style>
 
@@ -115,6 +144,7 @@
       label: "name"
     };
     @Provide() treecheckedObj: any = {};
+    @Provide() ideoController: any = {};
 
     getTreeData() {
       let that = this;