ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 修改依赖

sy-water-data-board-ui
panyuyi 1 year ago
parent
02e4d645b1
commit
73528d30dc
7 changed files with 42 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      package.json
  2. 74
      src/views/dike/runManage/enginerring/components/Drawer.vue
  3. 19
      src/views/dike/runManage/superVisionInspetion/questionManage/index.vue
  4. 11
      src/views/dike/runManage/superVisionInspetion/statisticAnalysis/components/Pie.vue
  5. 10
      src/views/dike/runManage/superVisionInspetion/statisticAnalysis/index.vue
  6. 19
      src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
  7. 13
      src/views/sluice/runManage/supervisionInspetion/statisticAnalysis/components/Pie.vue

4
package.json
View File

@ -49,6 +49,7 @@
"d3": "^5.0.0",
"d3-flextree": "^2.1.2",
"dayjs": "^1.11.10",
"docx-preview": "^0.1.14",
"echarts": "^5.5.0",
"element-china-area-data": "^6.1.0",
"element-ui": "^2.15.6",
@ -107,7 +108,6 @@
"babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "2.4.2",
"connect": "3.6.6",
"docx-preview": "^0.1.14",
"eslint": "6.7.2",
"eslint-plugin-vue": "6.2.2",
"html-webpack-plugin": "3.2.0",
@ -131,4 +131,4 @@
"> 1%",
"last 2 versions"
]
}
}

74
src/views/dike/runManage/enginerring/components/Drawer.vue
View File

@ -15,31 +15,10 @@ export default {
return {
dictMapData: {},
xcTreeData: [],
tableData: [
{ content: "", photos: "", isNormal: "", problems: "" }, // 1对应堤顶
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
{ content: "", photos: "", isNormal: "", problems: "" },
],
};
},
methods: {
// 树转换
transformArr(treeList) {
// 递归获取广度
function getW(item, w = 0) {
@ -65,51 +44,16 @@ export default {
return treeList;
},
handleSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
if (
rowIndex < 4 ||
(rowIndex > 4 && rowIndex < 9) ||
(rowIndex > 8 && rowIndex < 11) ||
(rowIndex > 10 && rowIndex < 13) ||
(rowIndex > 12 && rowIndex < 18)
) {
if (
rowIndex === 0 ||
rowIndex === 5 ||
rowIndex === 9 ||
rowIndex === 11 ||
rowIndex === 13
) {
return {
rowspan: [4, 4, 2, 2, 5][[0, 5, 9, 11, 13].indexOf(rowIndex)],
colspan: 1,
};
} else {
return {
rowspan: 0,
colspan: 0,
};
}
}
}
},
getDetailsData() {
getDikePatrolDetails(this.$route.query.id).then((res) => {
console.log("getDikePatrolDetails >>>>> ", res);
if (res.data?.items) {
this.tableData[0].photos = res.data.items[0]?.imgs || "无";
this.tableData[0].content = res.data.items[0]?.content || "";
this.tableData[0].problems = res.data.items[0]?.problem || "无";
this.tableData[0].isNormal = res.data.items[0]?.status ? "是" : "否";
}
console.log("详情 >>>>> ", res);
});
},
},
created() {
getCheckingDictTree("df_xs_c_classfy").then((res) => {
this.xcTreeData = this.transformArr(res?.data);
console.log("this.xcTreeData >>>>> ", this.xcTreeData);
});
getDictMapData("df_xs_c_classfy").then((res) => {
this.dictMapData = res?.data || {};
@ -248,19 +192,19 @@ export default {
.masking {
position: absolute;
top: 0;
width: 800px;
width: 70%;
height: 100%;
right: 0;
z-index: 10;
background-color: #fff;
transition: left 0.5s ease-in-out;
box-shadow: -8px 0px 38px 0px rgba(0, 0, 0, 0.6);
overflow: auto;
.close-btn {
width: 32px;
height: 32px;
position: absolute;
top: 48px;
top: 32px;
left: -16px;
background-color: #fff;
border: 1px solid #dcdcdc;
@ -277,14 +221,16 @@ export default {
.drawer-title {
width: 100%;
height: 64px;
line-height: 64px;
height: 48px;
line-height: 48px;
padding-left: 16px;
border-bottom: 1px solid #e7e7e7;
}
.center-table {
padding: 16px;
height: calc(100% - 48px);
overflow: auto;
}
}

19
src/views/dike/runManage/superVisionInspetion/questionManage/index.vue
View File

@ -71,6 +71,11 @@ export default {
this.checkDetailData.problemDto.handleSituationRecordsArr =
this.checkDetailData.problemDto.handleSituationRecords.split(",");
}
if (this.checkDetailData.doneTime) {
this.checkDetailData.showDoneTime = dayjs(
this.checkDetailData.doneTime
).format("YYYY年MM月DD日");
}
});
},
// 跳转编辑页面
@ -125,20 +130,6 @@ export default {
},
});
},
// 计算doneTime距离此刻剩余多少天
calcDeadLine(time) {
if (!time) return "-";
let days = dayjs(time).diff(dayjs(), "day");
let seconds = 0;
if (days <= 0) {
seconds = dayjs(time).diff(dayjs(), "second");
}
return days > 0
? days
: seconds > 0
? 1
: dayjs(time).diff(dayjs(), "day") - 1;
},
// 类型字典翻译
problemLevelFormat(level) {
if (!level) return "";

11
src/views/dike/runManage/superVisionInspetion/statisticAnalysis/components/Pie.vue
View File

@ -9,7 +9,9 @@ import * as echarts from "echarts";
export default {
data() {
return {};
return {
myChart: null,
};
},
props: {
title: {
@ -47,8 +49,9 @@ export default {
},
};
});
let chartDom = this.$refs.pieEle;
let myChart = echarts.init(chartDom);
if (!this.myChart) {
this.myChart = echarts.init(this.$refs.pieEle);
}
let option = {
title: {
left: "29%",
@ -128,7 +131,7 @@ export default {
},
],
};
myChart.setOption(option);
this.myChart.setOption(option);
},
},
};

10
src/views/dike/runManage/superVisionInspetion/statisticAnalysis/index.vue
View File

@ -25,7 +25,7 @@ export default {
paramsData: {
riverLocation: "",
dikeType: "",
adcd: "",
adcdStart: "",
taskId: "",
},
questionLevelList: [],
@ -36,7 +36,7 @@ export default {
initData() {
getSuperviseStatisticTotal({
dikeType: this.paramsData.dikeType || null,
adcd: this.paramsData.adcd || null,
adcdStart: this.paramsData.adcdStart || null,
taskId: this.paramsData.taskId || null,
riverLocation: this.paramsData.riverLocation || null,
}).then((res) => {
@ -104,7 +104,7 @@ export default {
this.remoteOptions = [];
this.paramsData = {
wagaType: "",
adcd: "",
adcdStart: "",
remoteValue: "",
};
if (this.typeSelect === "") {
@ -220,7 +220,7 @@ export default {
<el-select
size="mini"
class="statistic-analysis-select-style"
v-model="paramsData.wagaType"
v-model="paramsData.dikeType"
filterable
@change="handleChangeQuery"
placeholder="请选择"
@ -239,7 +239,7 @@ export default {
size="mini"
class="statistic-analysis-select-style"
:options="areasOptions"
v-model="paramsData.adcd"
v-model="paramsData.adcdStart"
:props="areasOptionProps"
placeholder="请选择行政区划"
clearable

19
src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
View File

@ -72,6 +72,11 @@ export default {
this.checkDetailData.problemDto.handleSituationRecordsArr =
this.checkDetailData.problemDto.handleSituationRecords.split(",");
}
if (this.checkDetailData.doneTime) {
this.checkDetailData.showDoneTime = dayjs(
this.checkDetailData.doneTime
).format("YYYY年MM月DD日");
}
});
},
// 跳转编辑页面
@ -126,20 +131,6 @@ export default {
},
});
},
// 计算doneTime距离此刻剩余多少天
calcDeadLine(time) {
if (!time) return "-";
let days = dayjs(time).diff(dayjs(), "day");
let seconds = 0;
if (days <= 0) {
seconds = dayjs(time).diff(dayjs(), "second");
}
return days > 0
? days
: seconds > 0
? 1
: dayjs(time).diff(dayjs(), "day") - 1;
},
// 所在位置字典翻译
wagaLocFormat(wagaLoc) {
let res = "";

13
src/views/sluice/runManage/supervisionInspetion/statisticAnalysis/components/Pie.vue
View File

@ -9,7 +9,9 @@ import * as echarts from "echarts";
export default {
data() {
return {};
return {
myChart: null,
};
},
props: {
title: {
@ -47,8 +49,9 @@ export default {
},
};
});
let chartDom = this.$refs.pieEle;
let myChart = echarts.init(chartDom);
if (!this.myChart) {
this.myChart = echarts.init(this.$refs.pieEle);
}
let option = {
title: {
left: "29%",
@ -128,7 +131,7 @@ export default {
},
],
};
myChart.setOption(option);
this.myChart.setOption(option);
},
},
};
@ -143,7 +146,7 @@ export default {
border-bottom: 1px solid #e5e5e5;
}
.canvas {
min-width: 200px;
width: 500px;
height: 200px;
padding: 10px;
}

Write Preview
Loading…
Cancel
Save