diff --git a/.prettierrc b/.prettierrc index 3e79c95..fed3a15 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,10 +1,11 @@ { - "printWidth": 100, + "printWidth": 150, "tabWidth": 2, - "semi": true, + "useTabs": false, + "semi": false, "singleQuote": true, - "trailingComma": "es5", - "arrowParens": "avoid", - "htmlWhitespaceSensitivity": "ignore", - "vueIndentScriptAndStyle": false + "trailingComma": "all", + "bracketSpacing": true, + "arrowParens": "always", + "endOfLine": "lf" } \ No newline at end of file diff --git a/packages/screen/src/assets/MaMap_img/危大工程icon@2x.png b/packages/screen/src/assets/MaMap_img/危大工程icon@2x.png new file mode 100644 index 0000000..0f843c8 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/危大工程icon@2x.png differ diff --git a/packages/screen/src/assets/MaMap_img/隐患点icon1@2x.png b/packages/screen/src/assets/MaMap_img/隐患点icon1@2x.png deleted file mode 100644 index 10f9f92..0000000 Binary files a/packages/screen/src/assets/MaMap_img/隐患点icon1@2x.png and /dev/null differ diff --git a/packages/screen/src/assets/MaMap_img/隐患点icon@2x.png b/packages/screen/src/assets/MaMap_img/隐患点icon@2x.png deleted file mode 100644 index 2b90fc0..0000000 Binary files a/packages/screen/src/assets/MaMap_img/隐患点icon@2x.png and /dev/null differ diff --git a/packages/screen/src/assets/RiskWarning_img/危大工程icon1@2x.png b/packages/screen/src/assets/RiskWarning_img/危大工程icon1@2x.png new file mode 100644 index 0000000..adc4fb9 Binary files /dev/null and b/packages/screen/src/assets/RiskWarning_img/危大工程icon1@2x.png differ diff --git a/packages/screen/src/assets/RiskWarning_img/危大工程icon@2x.png b/packages/screen/src/assets/RiskWarning_img/危大工程icon@2x.png new file mode 100644 index 0000000..0bf0ed4 Binary files /dev/null and b/packages/screen/src/assets/RiskWarning_img/危大工程icon@2x.png differ diff --git a/packages/screen/src/assets/RiskWarning_img/队伍icon定位@2x (1).png b/packages/screen/src/assets/RiskWarning_img/队伍icon定位@2x (1).png new file mode 100644 index 0000000..9797712 Binary files /dev/null and b/packages/screen/src/assets/RiskWarning_img/队伍icon定位@2x (1).png differ diff --git a/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue index c20f086..a1cbf86 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue @@ -25,30 +25,13 @@ clearable @change="handleFilterChange" > - +
类型 - - + +
@@ -61,12 +44,7 @@ clearable @change="handleFilterChange" > - +
@@ -101,13 +79,13 @@