twl 10 months ago
parent
commit
a4b9733f7b
2 changed files with 58 additions and 107 deletions
  1. 1 0
      src/services/index.js
  2. 57 107
      src/views/deck/pages/znfx_sub/ZnfxSzjg.vue

+ 1 - 0
src/services/index.js

@@ -11,6 +11,7 @@ import qs from 'qs'
 /* ********** 基础 ********** */
 const service = axios.create({
 	baseURL: process.env.VUE_APP_BASE_API,
+	// baseURL: '/api2',
 	timeout: 60000, // 请求超时时间 毫秒
 	// withCredentials: true,
 	headers: {

+ 57 - 107
src/views/deck/pages/znfx_sub/ZnfxSzjg.vue

@@ -117,7 +117,7 @@
           </div>
         </li>
       </ul>
-      <span class="box-title2">{{ current_village }}资产概况</span>
+      <span class="box-title2">{{ current_zcgk }}资产概况</span>
       <div class="cls-b2">
         <div class="tab-default">
           <div :class="{'highlight': tab_zcgk==='zc'}" @click="tab_zcgk='zc'"><span>资产统计表</span></div>
@@ -156,50 +156,50 @@
         <span class="box-title2">预警统计</span>
       </div>
       <div class="cr-b1">
-        <div class="filter-f">
-          <el-select style="width: 32%" v-model="htAlertZb" placeholder="全部预警指标" class="select-default" popper-class="select-default-popper">
-            <el-option value="" label="乡镇"></el-option>
-            <el-option v-for="item in htAlertZbArr" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-          <el-select style="width: 32%" v-model="htAlertZb" placeholder="全部预警指标" class="select-default" popper-class="select-default-popper">
-            <el-option value="" label="村"></el-option>
-            <el-option v-for="item in htAlertZbArr" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-          <el-select style="width: 32%" v-model="htAlertZb" placeholder="全部预警指标" class="select-default" popper-class="select-default-popper">
-            <el-option value="" label="级别"></el-option>
-            <el-option v-for="item in htAlertZbArr" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </div>
-        <div class="main-category">
-          <ul >
-            <li v-for="item in yjtjTopArr" :key="item.name">
-              <div class="left-img" :class="'yj'+item.type"></div>
-              <div>
-                <div class="name">{{item.name}}</div>
-                <div><span class="text-emp-36">{{item.value}}</span><span class="dw">个</span></div>
-              </div>
-            </li>
-          </ul>
-        </div>
-
-      </div>
-
-      <div class="cr-b2">
-
-        <el-table :data="data_crb1" class="table-default" height="31vh">
+        <el-table :data="data_crb1" class="table-default" height="20vh">
           <el-table-column label="预警指标" prop="zb" min-width="120" show-overflow-tooltip/>
           <el-table-column label="高风险" class-name="red" min-width="50" prop="gfx" show-overflow-tooltip>
 
           </el-table-column>
           <el-table-column label="中风险" class-name="orange" prop="zfx"  min-width="60" show-overflow-tooltip/>
           <el-table-column label="低风险" class-name="yellow" prop="dfx" min-width="60" show-overflow-tooltip/>
+        </el-table>
+      </div>
+      <span class="box-title2">资产财务预警</span>
+      <div class="cr-b2">
+        <div class="filter-f">
+          <el-select v-model="assetsAlertZb" placeholder="全部预警指标" class="select-default" popper-class="select-default-popper">
+            <el-option value="" label="全部预警指标"></el-option>
+            <el-option v-for="item in assetsAlertZbArr" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </div>
+        <el-table :data="data_crb2.filter(i => (i.zb === assetsAlertZb) || !assetsAlertZb)" class="table-default" height="20vh">
+          <el-table-column label="预警指标" prop="zb"  show-overflow-tooltip/>
+          <el-table-column label="单位" prop="dw" width="120px" show-overflow-tooltip>
+
+          </el-table-column>
+          <el-table-column label="风险等级"  prop="dj" show-overflow-tooltip >
+            <template #default="scope">
+              <div :class="scope.row.dj === '橙灯'?'orange':(scope.row.dj === '红灯'?'red':'yellow')">
+                <div >
+                  <span class="dot"></span>
+                  <span>{{scope.row.dj}}</span>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
 
         </el-table>
       </div>
-      <span class="box-title2">预警识别</span>
+      <span class="box-title2">合同管理预警</span>
       <div class="cr-b3">
-
-        <el-table :data="data_crb3.filter(i => (i.zb === htAlertZb) || !htAlertZb)" class="table-default" height="31vh">
+        <div class="filter-f">
+          <el-select v-model="htAlertZb" placeholder="全部预警指标" class="select-default" popper-class="select-default-popper">
+            <el-option value="" label="全部预警指标"></el-option>
+            <el-option v-for="item in htAlertZbArr" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </div>
+        <el-table :data="data_crb3.filter(i => (i.zb === htAlertZb) || !htAlertZb)" class="table-default" height="20vh">
           <el-table-column label="预警指标" prop="zb"  show-overflow-tooltip/>
           <el-table-column label="单位" prop="dw" width="120px" show-overflow-tooltip>
 
@@ -248,10 +248,8 @@
 
 <script>
 import { setZcgk } from '@/echarts/options'
-import {clearTownAndVillageMap, layerQueryGet} from "@/utils/map/AddLayer";
+import {layerQueryGet} from "@/utils/map/AddLayer";
 import {getLayerByName} from "@/utils/data/all-layer-info";
-import {ref} from "vue";
-import {getSzjygkfxRegionZcTown} from "@/services/znfx";
 
 let chartZcgk
 let chartZcgkSub
@@ -262,7 +260,7 @@ const sData_shuxian_village = [
 ]
 
 const sData_cm = { zzc: 162.307, zfz: 89.912, jzc: 72.394, sr: 7.506, zc: 7.891, jsy: -0.385 }
-const sData_xz = ref([
+const sData_xz = [
   {xz: '崇明区级',zzc: 15.629,zfz: 12.95,jzc: 2.678,sr: 0,zc: 0.091,jsy: -0.091},
   {xz: '竖新镇',zzc: 6.435,zfz: 4.32,jzc: 2.114,sr: 0.221,zc: 0.151,jsy: 0.07},
   {xz: '庙镇',zzc: 4.405,zfz:2.306,jzc: 2.099,sr: 0.364,zc: 0.326,jsy:0.038},
@@ -280,7 +278,7 @@ const sData_xz = ref([
   {xz: '中兴镇',zzc: 1.399,zfz: 0.695,jzc: 0.705,sr: 0.213,zc: 0.149,jsy: 0.064},
   {xz: '港沿镇',zzc: 4.479,zfz: 2.344,jzc: 2.135,sr: 0.337,zc:0.185,jsy: 0.152},
   {xz: '港西镇',zzc: 3.036,zfz: 1.496,jzc:1.539,sr: 0.126,zc: 0.127,jsy: -0.001}
-])
+]
 const sData_sanxing = [
   {"village":"三星镇级","zzc":4660.9176,"zfz":3846.1232,"jzc":814.7945,"sr":94.6069,"zc":480.1865,"jsy":-385.5796},
   {"village":"大平村","zzc":1386.1846,"zfz":872.3507,"jzc":513.8339,"sr":120.5025,"zc":28.7237,"jsy":91.7787},
@@ -350,6 +348,7 @@ export default {
         {value:'大额项目是否招投标',label:'大额项目是否招投标'},
         {value:'合同租期异常预警',label:'合同租期异常预警'},
         {value:'低价出租预警',label:'低价出租预警'},
+        {value:'土地流转合同到期预警',label:'土地流转合同到期预警'},
       ],
       monthArr: [],
       data_zctj: {
@@ -402,19 +401,17 @@ export default {
         {gfx:'1个',zfx:'2个',dfx:'3个',zb:'合同收款不及时'},
         {gfx:'1个',zfx:'2个',dfx:'3个',zb:'项目拆分预警'},
         {gfx:'1个',zfx:'2个',dfx:'3个',zb:'大额项目是否招投标'},
-        {gfx:'1个',zfx:'2个',dfx:'3个',zb:'低价出租预警'},
         {gfx:'1个',zfx:'2个',dfx:'3个',zb:'合同租期异常预警'},
-
+        {gfx:'1个',zfx:'2个',dfx:'3个',zb:'低价出租预警'},
+        {gfx:'1个',zfx:'2个',dfx:'3个',zb:'资金异常预警'},
       ],
-      yjtjTopArr:[
-        {name:'待处理预警',value:'3424',type:1},
-        {name:'整改中预警',value:'3424',type:1},
-        {name:'整改完成预警',value:'3424',type:1},
-        {name:'单位数',value:'3424',type:2},
-        {name:'有预警单位数',value:'3424',type:2},
-        {name:'合同数',value:'3424',type:3},
-        {name:'资产数',value:'3424',type:4},
-
+      data_crb2: [
+        {zb:'高空置率预警',dw:'上海市崇明区xxx',dj:'橙灯'},
+        {zb:'资金异常预警',dw:'上海市崇明区xxx',dj:'红灯'},
+        {zb:'高空置率预警',dw:'上海市崇明区xxx',dj:'黄灯'},
+        {zb:'高空置率预警',dw:'上海市崇明区xxx',dj:'红灯'},
+        {zb:'资金异常预警',dw:'上海市崇明区xxx',dj:'红灯'},
+        {zb:'高空置率预警',dw:'上海市崇明区xxx',dj:'红灯'},
       ],
       data_crb3: [
         {zb:'合同收款不及时',dw:'上海市崇明区xxx',dj:'橙灯'},
@@ -472,9 +469,8 @@ export default {
     current_zcgk: {
       handler(val) {
         if (val){
-          layerQueryGet(getLayerByName('镇界线').url, "name='" + val + "'",true,true,true,100000,[255, 242, 72, 1],4)
+          layerQueryGet(getLayerByName('镇界线').url, "name='" + val + "'")
         }else {
-          clearTownAndVillageMap()
           // layerQueryGet(getLayerByName('镇界线').url, "name='" + '' + "'")
         }
         if(val) {
@@ -488,13 +484,12 @@ export default {
     current_village: {
       handler(val) {
         if (val){
-          layerQueryGet(getLayerByName('村界线').url, "name='" + val + "'",true,true,true,7000,[255, 242, 72, 1],4)
+          layerQueryGet(getLayerByName('村界线').url, "name='" + val + "'",true,true,true,7000)
         }else {
           if (this.current_zcgk){
-            layerQueryGet(getLayerByName('镇界线').url, "name='" + this.current_zcgk + "'",true,true,true,100000,[255, 242, 72, 1],4)
+            layerQueryGet(getLayerByName('镇界线').url, "name='" + this.current_zcgk + "'")
           }else {
-            clearTownAndVillageMap()
-            // layerQueryGet(getLayerByName('村界线').url, "name='" + val + "'",true,true,true,7000,[255, 242, 72, 1],4)
+            layerQueryGet(getLayerByName('村界线').url, "name='" + val + "'",true,true,true,7000)
           }
         }
         if(val) {
@@ -525,12 +520,12 @@ export default {
     },
     getZctj(town) {
       if(town==='all') {
-        console.log('进入了all')
+        console.log('颠倒了0 ',town)
         this.data_zctj.all.forEach(row => {
           row.value = sData_cm[row.key]
         })
       } else {
-        let target = sData_xz.value.find(i=>i.xz===town)
+        let target = sData_xz.find(i=>i.xz===town)
         this.data_zctj.town.forEach(row => {
           row.value = target[row.key]
         })
@@ -557,11 +552,7 @@ export default {
     },
     getZcgk(town) {
       if(town==='all') {
-        getSzjygkfxRegionZcTown().then(res => {
-          console.log('真的all',res)
-        })
-
-        this.data_zcgk.all = sData_xz.value
+        this.data_zcgk.all = sData_xz
       } else {
         if(town==='三星镇') {
           this.data_zcgk.town = sData_sanxing
@@ -658,51 +649,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.main-category{
-  ul{
-    .name{
-
-      margin-bottom: 1px;
-    }
-    display: flex;
-    flex-wrap: wrap;
-    align-content: center;
-    >li{
-      font-size: 28px;
-      color: #fff;
-      display: flex;
-      align-items: center;
-      margin-bottom:  22px;
-      .yj1,.yj2,.yj3,.yj4{
-        width: 75px;
-        height: 75px;
-
-        &.yj1{
-          background-image: url("@/assets/imgs/deck/page_znfx/预警拷贝.png");
-        }
-        &.yj2{
-          background-image: url("@/assets/imgs/deck/page_znfx/单位拷贝.png");
-        }
-        &.yj3{
-          background-image: url("@/assets/imgs/deck/page_znfx/合同拷贝.png");
-        }
-        &.yj4{
-          background-image: url("@/assets/imgs/deck/page_znfx/资产拷贝.png");
-        }
-        background-size: 100% 100%;
-      }
-
-      width: 33.3%;
-
-    }
-  }
-}
 .filter-f{
-
+  width: max-content;
   margin-bottom: 20px;
-  display: flex;
-  justify-content: space-between;
-
+  margin-left: auto;
 }
 .dot{
   margin-right: 10px;