diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/index.html b/index.html index 259f44a..7dede5c 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,14 @@ rel="stylesheet" href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css" /> + + + + + + + + diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/index.html b/index.html index 259f44a..7dede5c 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,14 @@ rel="stylesheet" href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css" /> + + + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/index.html b/index.html index 259f44a..7dede5c 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,14 @@ rel="stylesheet" href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css" /> + + + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/index.html b/index.html index 259f44a..7dede5c 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,14 @@ rel="stylesheet" href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css" /> + + + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ - - diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/index.html b/index.html index 259f44a..7dede5c 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,14 @@ rel="stylesheet" href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css" /> + + + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ - - diff --git a/src/element/index.js b/src/element/index.js deleted file mode 100644 index 803bf9a..0000000 --- a/src/element/index.js +++ /dev/null @@ -1,163 +0,0 @@ -/** - * UI组件, 统一使用饿了么 - * 注意: - * 1. 打包只会包含释放(解开注释)的组件, 减少打包文件大小 - */ -import Vue from 'vue' -import { - Drawer, - Backtop, - Pagination, - Dialog, - Autocomplete, - Dropdown, - DropdownMenu, - DropdownItem, - Menu, - Submenu, - MenuItem, - MenuItemGroup, - Input, - InputNumber, - Radio, - RadioGroup, - RadioButton, - Checkbox, - CheckboxButton, - CheckboxGroup, - Switch, - Select, - Option, - OptionGroup, - Button, - ButtonGroup, - Table, - TableColumn, - DatePicker, - TimeSelect, - TimePicker, - Popover, - Tooltip, - Breadcrumb, - BreadcrumbItem, - Form, - FormItem, - Tabs, - TabPane, - Tag, - Tree, - Alert, - Slider, - Icon, - Row, - Col, - Upload, - Progress, - Badge, - Card, - Rate, - Steps, - Step, - Carousel, - CarouselItem, - Collapse, - CollapseItem, - Cascader, - ColorPicker, - Transfer, - Container, - Header, - Aside, - Main, - Footer, - Loading, - MessageBox, - Message, - Notification, - Scrollbar -} from 'element-ui' -import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'; -Vue.component(CollapseTransition.name, CollapseTransition) -Vue.use(Drawer) -Vue.use(Backtop) -Vue.use(Scrollbar) -// Vue.use(Notification) - -Vue.use(Pagination) -Vue.use(Dialog) -Vue.use(Autocomplete) -Vue.use(Dropdown) -Vue.use(DropdownMenu) -Vue.use(DropdownItem) -Vue.use(Menu) -Vue.use(Submenu) -Vue.use(MenuItem) -Vue.use(MenuItemGroup) -Vue.use(Input) -Vue.use(InputNumber) -Vue.use(Radio) -Vue.use(RadioGroup) -Vue.use(RadioButton) -Vue.use(Checkbox) -// Vue.use(CheckboxButton) -// Vue.use(CheckboxGroup) -Vue.use(Switch) -Vue.use(Select) -Vue.use(Option) -// Vue.use(OptionGroup) -Vue.use(Button) -Vue.use(ButtonGroup) -Vue.use(Table) -Vue.use(TableColumn) -Vue.use(DatePicker) -// Vue.use(TimeSelect) -Vue.use(TimePicker) -Vue.use(Popover) -Vue.use(Tooltip) -Vue.use(Breadcrumb) -Vue.use(BreadcrumbItem) -Vue.use(Form) -Vue.use(FormItem) -Vue.use(Tabs) -Vue.use(TabPane) -Vue.use(Tag) -Vue.use(Tree) -Vue.use(Alert) -Vue.use(Slider) -Vue.use(Icon) -Vue.use(Row) -Vue.use(Col) -Vue.use(Upload) -Vue.use(Progress) -// Vue.use(Badge) -Vue.use(Card) -// Vue.use(Rate) -// Vue.use(Steps) -// Vue.use(Step) -// Vue.use(Carousel) -// Vue.use(CarouselItem) -Vue.use(Collapse) -Vue.use(CollapseItem) -Vue.use(Cascader) -// Vue.use(ColorPicker) -Vue.use(Transfer) -Vue.use(Container) -Vue.use(Header) -Vue.use(Aside) -Vue.use(Main) -Vue.use(Footer) - -Vue.use(Loading.directive) - - -Vue.prototype.$loading = Loading.service -Vue.prototype.$msgbox = MessageBox -Vue.prototype.$alert = MessageBox.alert -Vue.prototype.$confirm = MessageBox.confirm -Vue.prototype.$prompt = MessageBox.prompt -Vue.prototype.$notify = Notification -Vue.prototype.$message = Message - -Vue.prototype.$ELEMENT = { - size: 'medium' -} \ No newline at end of file diff --git a/.babelrc b/.babelrc index f65f546..54e5098 100644 --- a/.babelrc +++ b/.babelrc @@ -13,13 +13,6 @@ ], "plugins": [ "transform-vue-jsx", - "transform-runtime", - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ] + "transform-runtime" ] } diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index df2179c..9cc24fb 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,6 +15,15 @@ entry: { app: './src/main.js' }, + externals: { + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'echarts': 'echarts', + 'vuex': 'Vuex', + 'axios': 'axios', + 'moment': 'moment', + 'element-ui': 'ELEMENT' + }, output: { path: config.build.assetsRoot, filename: '[name].js', diff --git a/index.html b/index.html index 259f44a..7dede5c 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,14 @@ rel="stylesheet" href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css" /> + + + + + + + + diff --git a/package.json b/package.json index da1f3a4..6ea42a5 100644 --- a/package.json +++ b/package.json @@ -12,22 +12,14 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@smallwei/avue": "^2.7.6", - "axios": "^0.19.2", - "echarts": "^4.7.0", - "element-ui": "^2.13.1", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", "jshint": "^2.11.0", - "moment": "^2.24.0", "ol": "^6.4.3", "qs.js": "^0.1.12", "v-viewer": "^1.5.1", - "vue": "^2.6.11", - "vue-axios": "^2.1.4", - "vue-count-to": "^1.0.13", - "vue-router": "^3.1.6", - "vuex": "^3.6.0" + "vue-count-to": "^1.0.13" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 5fdc2a8..72e015f 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -1373,33 +1373,50 @@ }, // 关闭弹框后做的操作 closedialog(formName) { - this.$refs["ruleForm"].resetFields(); - - this.ruleForm = { - id: "", //站点ID - stName: "", //站点名称 - stCode: "", //站点编号 - tt: "", - area: "", //所属区域 - constructionStatus: "", - faultStatus: "", - taskStatus: "", - platformCode: "", - lat: "", //维度 - lon: "", //经度 - isPush: "", - createTime: "", - status: "", - offlineTime: "", - stationType: "", //站点类型 - // stationTypeName: "", - coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） - address: "", //站点安装位置 - person: "", //安装负责人 - fileList: [] //现场安装图片 - }; - // this.$refs.cascader.$refs.panel.activePath = []; - // this.$refs.cascader.$refs.panel.clearCheckedNodes(); + if(this.$refs[formName]) { + this.$refs[formName].resetFields(); + } + if(formName === "") { + this.ruleForm = { + id: "", //站点ID + stName: "", //站点名称 + stCode: "", //站点编号 + tt: "", + area: "", //所属区域 + constructionStatus: "", + faultStatus: "", + taskStatus: "", + platformCode: "", + lat: "", //维度 + lon: "", //经度 + isPush: "", + createTime: "", + status: "", + offlineTime: "", + stationType: "", //站点类型 + // stationTypeName: "", + coordinateSystem: "WGS84", //坐标系（经纬度所对应的的坐标系） + address: "", //站点安装位置 + person: "", //安装负责人 + fileList: [] //现场安装图片 + }; + }else{ + this.configForm = { + ruleId: "", //规则引擎 + st: "", //站点编号 + isEnable: "", // 是否启用（0否 1是） + referRainStationSt: [], //关联雨量站点(可多选，用,隔开) + referRainPipeSt: [], //关联雨水管网(可多选，用,隔开) + siteRepairPropertyConfigList: [ + { + property: "", //修复因子 + isEnable: "", //是否启用（0否 1是） + minValue: 0, //正常范围最小值 + maxValue: 0 // 正常范围最大值 + } + ] + } + } }, handleChange(data) { // 取选中数组的最后一项的id diff --git a/src/components/ServiceWatch/components/nginx.vue b/src/components/ServiceWatch/components/nginx.vue index a50d76b..8cb4443 100644 --- a/src/components/ServiceWatch/components/nginx.vue +++ b/src/components/ServiceWatch/components/nginx.vue @@ -4,7 +4,6 @@ @@ -50,18 +49,9 @@ - - diff --git a/src/element/index.js b/src/element/index.js deleted file mode 100644 index 803bf9a..0000000 --- a/src/element/index.js +++ /dev/null @@ -1,163 +0,0 @@ -/** - * UI组件, 统一使用饿了么 - * 注意: - * 1. 打包只会包含释放(解开注释)的组件, 减少打包文件大小 - */ -import Vue from 'vue' -import { - Drawer, - Backtop, - Pagination, - Dialog, - Autocomplete, - Dropdown, - DropdownMenu, - DropdownItem, - Menu, - Submenu, - MenuItem, - MenuItemGroup, - Input, - InputNumber, - Radio, - RadioGroup, - RadioButton, - Checkbox, - CheckboxButton, - CheckboxGroup, - Switch, - Select, - Option, - OptionGroup, - Button, - ButtonGroup, - Table, - TableColumn, - DatePicker, - TimeSelect, - TimePicker, - Popover, - Tooltip, - Breadcrumb, - BreadcrumbItem, - Form, - FormItem, - Tabs, - TabPane, - Tag, - Tree, - Alert, - Slider, - Icon, - Row, - Col, - Upload, - Progress, - Badge, - Card, - Rate, - Steps, - Step, - Carousel, - CarouselItem, - Collapse, - CollapseItem, - Cascader, - ColorPicker, - Transfer, - Container, - Header, - Aside, - Main, - Footer, - Loading, - MessageBox, - Message, - Notification, - Scrollbar -} from 'element-ui' -import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'; -Vue.component(CollapseTransition.name, CollapseTransition) -Vue.use(Drawer) -Vue.use(Backtop) -Vue.use(Scrollbar) -// Vue.use(Notification) - -Vue.use(Pagination) -Vue.use(Dialog) -Vue.use(Autocomplete) -Vue.use(Dropdown) -Vue.use(DropdownMenu) -Vue.use(DropdownItem) -Vue.use(Menu) -Vue.use(Submenu) -Vue.use(MenuItem) -Vue.use(MenuItemGroup) -Vue.use(Input) -Vue.use(InputNumber) -Vue.use(Radio) -Vue.use(RadioGroup) -Vue.use(RadioButton) -Vue.use(Checkbox) -// Vue.use(CheckboxButton) -// Vue.use(CheckboxGroup) -Vue.use(Switch) -Vue.use(Select) -Vue.use(Option) -// Vue.use(OptionGroup) -Vue.use(Button) -Vue.use(ButtonGroup) -Vue.use(Table) -Vue.use(TableColumn) -Vue.use(DatePicker) -// Vue.use(TimeSelect) -Vue.use(TimePicker) -Vue.use(Popover) -Vue.use(Tooltip) -Vue.use(Breadcrumb) -Vue.use(BreadcrumbItem) -Vue.use(Form) -Vue.use(FormItem) -Vue.use(Tabs) -Vue.use(TabPane) -Vue.use(Tag) -Vue.use(Tree) -Vue.use(Alert) -Vue.use(Slider) -Vue.use(Icon) -Vue.use(Row) -Vue.use(Col) -Vue.use(Upload) -Vue.use(Progress) -// Vue.use(Badge) -Vue.use(Card) -// Vue.use(Rate) -// Vue.use(Steps) -// Vue.use(Step) -// Vue.use(Carousel) -// Vue.use(CarouselItem) -Vue.use(Collapse) -Vue.use(CollapseItem) -Vue.use(Cascader) -// Vue.use(ColorPicker) -Vue.use(Transfer) -Vue.use(Container) -Vue.use(Header) -Vue.use(Aside) -Vue.use(Main) -Vue.use(Footer) - -Vue.use(Loading.directive) - - -Vue.prototype.$loading = Loading.service -Vue.prototype.$msgbox = MessageBox -Vue.prototype.$alert = MessageBox.alert -Vue.prototype.$confirm = MessageBox.confirm -Vue.prototype.$prompt = MessageBox.prompt -Vue.prototype.$notify = Notification -Vue.prototype.$message = Message - -Vue.prototype.$ELEMENT = { - size: 'medium' -} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 2db34b6..afb7322 100644 --- a/src/main.js +++ b/src/main.js @@ -3,9 +3,7 @@ import Vue from "vue"; import App from "./App"; import router from "./router"; -// import ElementUI from "element-ui"; //引入js -import "@/element"; -import "element-ui/lib/theme-chalk/index.css"; //引入css +import ELEMENT from "element-ui"; //引入js import "@/assets/css/index.css"; import "@/assets/css/skincolor.scss"; @@ -13,26 +11,11 @@ // import '@smallwei/avue/lib/theme-chalk/index.css'; import "@smallwei/avue/lib/index.css"; Vue.use(Avue); +Vue.use(ELEMENT); Vue.config.productionTip = false; -// 引入vue-echarts组件库 -let echarts = require("echarts/lib/echarts"); -// 引入折线图/柱状图等组件 -require("echarts/lib/chart/line"); -require("echarts/lib/chart/pie"); -require("echarts/lib/chart/bar"); -require("echarts/lib/chart/radar"); -// 引入提示框和title组件，图例 -require("echarts/lib/component/title"); -require("echarts/lib/component/legend"); -require("echarts/lib/component/radar"); -require("echarts/lib/component/tooltip"); -require("echarts/lib/component/toolbox"); -require("echarts/lib/component/dataZoom"); -require("echarts/lib/component/grid"); -require("echarts/lib/component/graphic"); +import echarts from "echarts"; Vue.prototype.$echarts = echarts; - import moment from "moment"; Vue.prototype.moment = moment; //引入公共方法