diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index b294ef8..a105e74 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,39 @@ + + + + + + + + -

- +

+ + + + + -

- +

+ + diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index b294ef8..a105e74 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,39 @@ + + + + + + + + -

- +

+ + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/src/main.js b/src/main.js index a1a5ee5..a853411 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ // } // 兼容IE11 -import 'babel-polyfill' +// import 'babel-polyfill' // 暂时取消 // 引入animate.css库,此处关闭eslint校验 // eslint-disable-next-line @@ -47,7 +47,6 @@ // 引入全局标题 import { getProject } from '@/utils/baseConfig' document.title = getProject().title - // 引入高德地图 /* import VueAMap from 'vue-amap' diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index b294ef8..a105e74 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,39 @@ + + + + + + + + -

- +

+ + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/src/main.js b/src/main.js index a1a5ee5..a853411 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ // } // 兼容IE11 -import 'babel-polyfill' +// import 'babel-polyfill' // 暂时取消 // 引入animate.css库,此处关闭eslint校验 // eslint-disable-next-line @@ -47,7 +47,6 @@ // 引入全局标题 import { getProject } from '@/utils/baseConfig' document.title = getProject().title - // 引入高德地图 /* import VueAMap from 'vue-amap' diff --git a/src/styles/index.scss b/src/styles/index.scss index 3f18397..b3b0aa6 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -77,6 +77,7 @@ .app-container { padding: 20px; + background: #fff; } .app-header{ background-color:$themeColor; diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index b294ef8..a105e74 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,39 @@ + + + + + + + + -

- +

+ + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/src/main.js b/src/main.js index a1a5ee5..a853411 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ // } // 兼容IE11 -import 'babel-polyfill' +// import 'babel-polyfill' // 暂时取消 // 引入animate.css库,此处关闭eslint校验 // eslint-disable-next-line @@ -47,7 +47,6 @@ // 引入全局标题 import { getProject } from '@/utils/baseConfig' document.title = getProject().title - // 引入高德地图 /* import VueAMap from 'vue-amap' diff --git a/src/styles/index.scss b/src/styles/index.scss index 3f18397..b3b0aa6 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -77,6 +77,7 @@ .app-container { padding: 20px; + background: #fff; } .app-header{ background-color:$themeColor; diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index ddea9a0..45a185c 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -82,9 +82,10 @@ - +

@@ -106,6 +107,7 @@ processPicture } from "@/api/callCase"; import FMap from "../../components/fMap/components/fMap"; +import FDMap from "../../components/fdMap"; // import process from "./caseCommon/process.json"; // import process2 from "./caseCommon/process2.json"; // import mockData from "./caseCommon/data.json"; @@ -113,6 +115,7 @@ name: "CaseDetail", components: { FMap, + FDMap, CaseFormRead, CaseProcess, CaseRecord, @@ -165,7 +168,7 @@ this.caseDetail = response.data; let caseStateNameList = ["协同申请","处理/回访完成"] if ( - this.caseDetail.eorcName == "精细化管理事件" && + this.caseDetail.eorcName == "精细化管理事件" && caseStateNameList.includes(this.caseDetail.caseStateName) ) { socialDetail({ caseId: this.id }).then((res) => { diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index b294ef8..a105e74 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,39 @@ + + + + + + + + -

- +

+ + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/src/main.js b/src/main.js index a1a5ee5..a853411 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ // } // 兼容IE11 -import 'babel-polyfill' +// import 'babel-polyfill' // 暂时取消 // 引入animate.css库,此处关闭eslint校验 // eslint-disable-next-line @@ -47,7 +47,6 @@ // 引入全局标题 import { getProject } from '@/utils/baseConfig' document.title = getProject().title - // 引入高德地图 /* import VueAMap from 'vue-amap' diff --git a/src/styles/index.scss b/src/styles/index.scss index 3f18397..b3b0aa6 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -77,6 +77,7 @@ .app-container { padding: 20px; + background: #fff; } .app-header{ background-color:$themeColor; diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index ddea9a0..45a185c 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -82,9 +82,10 @@ - +

@@ -106,6 +107,7 @@ processPicture } from "@/api/callCase"; import FMap from "../../components/fMap/components/fMap"; +import FDMap from "../../components/fdMap"; // import process from "./caseCommon/process.json"; // import process2 from "./caseCommon/process2.json"; // import mockData from "./caseCommon/data.json"; @@ -113,6 +115,7 @@ name: "CaseDetail", components: { FMap, + FDMap, CaseFormRead, CaseProcess, CaseRecord, @@ -165,7 +168,7 @@ this.caseDetail = response.data; let caseStateNameList = ["协同申请","处理/回访完成"] if ( - this.caseDetail.eorcName == "精细化管理事件" && + this.caseDetail.eorcName == "精细化管理事件" && caseStateNameList.includes(this.caseDetail.caseStateName) ) { socialDetail({ caseId: this.id }).then((res) => { diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index dec2bb9..b2f30b9 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -26,7 +26,8 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { - app: [ "babel-polyfill", "./src/main.js"] + // app: [ "babel-polyfill", "./src/main.js"] + app: ["./src/main.js"] }, output: { path: config.build.assetsRoot, @@ -51,7 +52,7 @@ }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index b294ef8..a105e74 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,39 @@ + + + + + + + + -

- +

+ + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/src/main.js b/src/main.js index a1a5ee5..a853411 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ // } // 兼容IE11 -import 'babel-polyfill' +// import 'babel-polyfill' // 暂时取消 // 引入animate.css库,此处关闭eslint校验 // eslint-disable-next-line @@ -47,7 +47,6 @@ // 引入全局标题 import { getProject } from '@/utils/baseConfig' document.title = getProject().title - // 引入高德地图 /* import VueAMap from 'vue-amap' diff --git a/src/styles/index.scss b/src/styles/index.scss index 3f18397..b3b0aa6 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -77,6 +77,7 @@ .app-container { padding: 20px; + background: #fff; } .app-header{ background-color:$themeColor; diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index ddea9a0..45a185c 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -82,9 +82,10 @@ - +

@@ -106,6 +107,7 @@ processPicture } from "@/api/callCase"; import FMap from "../../components/fMap/components/fMap"; +import FDMap from "../../components/fdMap"; // import process from "./caseCommon/process.json"; // import process2 from "./caseCommon/process2.json"; // import mockData from "./caseCommon/data.json"; @@ -113,6 +115,7 @@ name: "CaseDetail", components: { FMap, + FDMap, CaseFormRead, CaseProcess, CaseRecord, @@ -165,7 +168,7 @@ this.caseDetail = response.data; let caseStateNameList = ["协同申请","处理/回访完成"] if ( - this.caseDetail.eorcName == "精细化管理事件" && + this.caseDetail.eorcName == "精细化管理事件" && caseStateNameList.includes(this.caseDetail.caseStateName) ) { socialDetail({ caseId: this.id }).then((res) => { diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 193b604..fcee4da 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -38,6 +38,7 @@ height: 50px; line-height: 50px; box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04); + background: #fff; .hamburger-container { line-height: 58px; height: 50px; diff --git a/static/images/well/pos.png b/static/images/well/pos.png new file mode 100644 index 0000000..95d1d03 --- /dev/null +++ b/static/images/well/pos.png Binary files differ