Commit ab571596 by 米嘉伟

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents f4ad3832 ac84ad8f
<!--
* @Author: your name
* @Date: 2021-12-24 09:50:39
* @LastEditTime: 2021-12-28 10:30:52
* @LastEditTime: 2021-12-28 13:54:32
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\SystemManage\QueryPermission.vue
......@@ -48,7 +48,7 @@
v-bind:preText="numTotalStUsed.toString() + '/'"
v-on:change="changeStTotalNum"
></numberInput>
<div>其中高优先级:</div>
<div class="awayLeft">其中高优先级:</div>
<numberInput
v-bind:text="numGaoSt"
v-bind:preText="numGaoStUsed.toString() + '/'"
......@@ -65,7 +65,11 @@
v-bind:type="0"
v-bind:isSt="true"
v-bind:preText="
(scope.row.midUsed + scope.row.highUsed).toString() + '/'
(
scope.row.midUsed +
scope.row.lowUsed +
scope.row.highUsed
).toString() + '/'
"
v-bind:text="
(scope.row.midTotal + scope.row.highTotal).toString()
......@@ -99,7 +103,7 @@
v-bind:preText="numTotalDsUsed.toString() + '/'"
v-on:change="changeDsTotalNum"
></numberInput>
<div>其中高优先级:</div>
<div class="awayLeft">其中高优先级:</div>
<numberInput
v-bind:text="numGaoDs"
v-bind:preText="numGaoDsUsed.toString() + '/'"
......@@ -122,7 +126,11 @@
v-bind:type="0"
v-bind:isSt="false"
v-bind:preText="
(scope.row.midUsed + scope.row.highUsed).toString() + '/'
(
scope.row.midUsed +
scope.row.lowUsed +
scope.row.highUsed
).toString() + '/'
"
v-bind:text="
(scope.row.midTotal + scope.row.highTotal).toString()
......@@ -173,7 +181,6 @@ export default {
stDataObj: {},
dsDataObj: {},
dsdw: "拉萨市",
dishiCode: 0,
tableDateDs: [],
tableDateSt: [],
isAutoDistribute: true,
......@@ -198,7 +205,7 @@ export default {
regionFeatures: [],
pointFeatures: [],
shengtingCode: "540000000000",
defaultSelectedCode: "540100000000",
dishiCode: "540100000000",
};
},
methods: {
......@@ -420,7 +427,7 @@ export default {
// 手动选中某个区域
selectFeature(id) {
if (!id) {
id = this.defaultSelectedCode;
id = this.dishiCode;
}
const pFea = this.pointFeatures.filter(
(fea) => fea.get("CODE_LEV") === id
......@@ -434,13 +441,14 @@ export default {
selectedPointLayer.getSource().clear();
selectedRegionLayer.getSource().addFeature(this.selectedFeature);
selectedPointLayer.getSource().addFeature(pFea.clone());
this.loadDishiData(this.defaultSelectedCode);
this.loadDishiData(this.dishiCode);
}
},
getFeatureColor(num = 0) {
if (num > 0.7) {
const curnum = Number(num);
if (curnum > 0.7) {
return this.colorArr[2];
} else if (num > 0.3) {
} else if (curnum > 0.3) {
return this.colorArr[1];
} else {
return this.colorArr[0];
......@@ -492,6 +500,7 @@ export default {
});
},
getMapPageData() {
const self = this;
this.$axios({
method: "get",
url: "/api/queryCount/getPercentage",
......@@ -502,7 +511,7 @@ export default {
}).then((response) => {
if (response.data.code === 0) {
console.log(response.data.detail);
this.pointFeatures.forEach((fea) => {
self.pointFeatures.forEach((fea) => {
const code = fea.get("CODE_LEV");
const totalCount =
response.data.detail.filter((item) => item.dwCode === code)[0]
......@@ -510,7 +519,7 @@ export default {
fea.set("totalCount", totalCount.toString());
});
// 更新feature 属性
this.regionFeatures.forEach((fea) => {
self.regionFeatures.forEach((fea) => {
const code = fea.get("CODE_LEV");
const percentage =
response.data.detail.filter((item) => item.dwCode === code)[0]
......@@ -518,8 +527,9 @@ export default {
fea.set("percentage", percentage);
});
} else {
this.$message.error(response.data.message);
self.$message.error(response.data.message);
}
self.selectFeature();
});
},
totalNumChanged(val) {
......@@ -574,6 +584,7 @@ export default {
const self = this;
this.changeTotalNumber(this.dishiCode, 0, val, function(res) {
self.loadDishiData();
self.getMapPageData();
});
},
// 修改地市高优先级总数
......@@ -602,7 +613,7 @@ export default {
if (fn) {
fn(res.data);
}
} else if (res.data.code === 201) {
} else {
self.$message.info("分配失败,请核查输入数值");
}
});
......@@ -628,7 +639,6 @@ export default {
self.loadShengtingData();
} else {
self.loadDishiData();
self.getMapPageData();
}
} else if (res.data.code === 201) {
self.$message.info("分配失败,请核查输入数值");
......@@ -644,8 +654,8 @@ export default {
},
reloadUsedData() {
this.$axios({
method: "get",
url: "/api/queryCount/flashUsedCount",
method: "get",
url: "/api/queryCount/flashUsedCount",
}).then((res) => {
if (res.data.code === 0) {
self.$message.info("已为您刷新当日最新数据");
......@@ -738,18 +748,38 @@ export default {
}
.tables {
flex: 1;
margin: 24px 24px 0 0;
& .buleBlk {
width: 4px;
height: 16px;
margin-top: 0.2rem;
margin-right: 10px;
}
}
.firstLine .el-input /deep/ {
.el-input__inner {
width: 70px;
height: 32px;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.5);
border-radius: 4px;
font-size: 20px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #055fe7;
line-height: 26px;
}
}
.firstLine {
display: flex;
height: 50px;
align-items: center;
& .el-input {
width: 80px;
}
& .el-checkbox__label {
& .el-checkbox {
margin-left: 110px;
}
& .el-checkbox__label /deep/ {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
......@@ -773,17 +803,30 @@ export default {
font-family: MicrosoftYaHei;
color: #ffffff;
line-height: 22px;
position: absolute;
right: 20px;
}
}
.stTongji {
background: linear-gradient(270deg, #f4f9ff 0%, #e5f0ff 100%);
border-radius: 4px;
height: 50px;
display: flex;
align-items: center;
padding: 13px;
& div {
display: inline-block;
}
}
.dsTongjiBlk {
.dsTongji {
& label {
line-height: 50px;
}
& .dsTongji {
height: 50px;
display: flex;
align-items: center;
padding: 13px;
background: linear-gradient(270deg, #fff7f7 0%, #ffefee 100%);
border-radius: 4px;
& div {
......@@ -791,4 +834,7 @@ export default {
}
}
}
.awayLeft {
margin-left: 39px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment