提交代码

src/api/api.js

@@ -1,7 +1,7 @@
 import fetch from "./request"
 
-// 我的企业信息
-export const entinfo1 = data => fetch.post('/entbase/ent/entinfo', data);
+// 入口权限接口
+export const entinfo = data => fetch.post('/entbase/ent/entinfo', data);
 // 招标信息列表
 export const subscribeList = data => fetch.post('/entdataexport/subscribeList', data);
 // 获取招标信息中高级筛选中信息
@@ -24,68 +24,77 @@ export const pushset = data => fetch.post('/entniche/subscribe/pushset/get', dat
 export const scribeKey = data => fetch.post('/entniche/subscribe/key/get', data);
 // 修改关键词设置
 export const updateKeys = data => fetch.post('/entniche/subscribe/key/update', data);
+// 全员无差别开关
+export const nodiff = data => fetch.post('/entniche/distribute/nodiff', data);
+// 分发设置列表
+export const nodiffList = data => fetch.post('/entniche/distribute/list', data);
+// 统一订阅数据导出接口
+export const subscribeExport = data => fetch.get('/entdataexport/subscribeExport', data);
+// 修改推送设置
+export const updatePush = data => fetch.post('/entniche/subscribe/pushset/update', data);
+// 修改项目匹配
+export const projectUpdate = data => fetch.post('/entniche/subscribe/projectmatch/update', data);
 
-export const entinfo = data => fetch.get('/ent/entinfo', data);
 
 //企业列表
-export const componyList = data => fetch.get("/person/pcManager",data);
+export const componyList = data => fetch.get("/entbase/person/pcManager",data);
 
 //添加部门
-export const addDepartInter = data => fetch.get("/department/add",data);
+export const addDepartInter = data => fetch.get("/entbase/department/add",data);
 
 //删除部门
-export const delDepartInter = data => fetch.get("/department/delete",data);
+export const delDepartInter = data => fetch.get("/entbase/department/delete",data);
 
 //获取部门信息
-export const departDetail = data => fetch.get("/department/detail",data);
+export const departDetail = data => fetch.get("/entbase/department/detail",data);
 
 //更新部门信息
-export const departUpdata = data => fetch.get("/department/update",data);
+export const departUpdata = data => fetch.get("/entbase/department/update",data);
 
 //查询部门下的子部门
-export const findDepart = data => fetch.get("/department/childrens",data);
+export const findDepart = data => fetch.get("/entbase/department/childrens",data);
 
 //部门管理员列表
-export const userList = data => fetch.get("/department/pcPersons",data);
+export const userList = data => fetch.get("/entbase/department/pcPersons",data);
 
 //人员管理列表
-export const personInter = data => fetch.get("/power/pcPersons",data);
+export const personInter = data => fetch.get("/entbase/power/pcPersons",data);
 
 //部门查询
-export const departsAll = data => fetch.get("/power/pcSearchDepartment",data);
+export const departsAll = data => fetch.get("/entbase/power/pcSearchDepartment",data);
 
 //新增人员
-export const personAddInter = data => fetch.get("/person/add",data);
+export const personAddInter = data => fetch.get("/entbase/person/add",data);
 
 //人员信息修改
-export const personUpdateInter = data => fetch.get("/person/update",data);
+export const personUpdateInter = data => fetch.get("/entbase/person/update",data);
 
 //人员详细信息
-export const personDetailInter = data => fetch.get("/person/detail",data);
+export const personDetailInter = data => fetch.get("/entbase/person/detail",data);
 
 //人员删除
-export const personDelInter = data => fetch.get("/person/delete",data);
+export const personDelInter = data => fetch.get("/entbase/person/delete",data);
 
 //商机管理人员
-export const sjPersonListInter = data => fetch.get("/entExportAuth/entPersonList",data);
+export const sjPersonListInter = data => fetch.get("/entniche/entExportAuth/entPersonList",data);
 
 //商机管理人员列表
-export const user_sjPersonListInter = data => fetch.get("/entExportAuth/entPersons",data);
+export const user_sjPersonListInter = data => fetch.get("/entniche/entExportAuth/entPersons",data);
 
 //商机管理列表删除                                         
-export const del_sjPersonListInter = data => fetch.get("/entExportAuth/entDeletePerson",data);
+export const del_sjPersonListInter = data => fetch.get("/entniche/entExportAuth/entDeletePerson",data);
 
 //数据导出人员列表
-export const recordPersonListInter = data => fetch.get("/entExportAuth/getList",data);
+export const recordPersonListInter = data => fetch.get("/entniche/entExportAuth/getList",data);
 
 //数据导出人员列表
-export const user_recordpersonListInter = data => fetch.get("/entExportAuth/persons",data);
+export const user_recordpersonListInter = data => fetch.get("/entniche/entExportAuth/persons",data);
 
 //数据导出设置限额
-export const setLimit_recordpersonListInter = data => fetch.get("/entExportAuth/setLimit",data);
+export const setLimit_recordpersonListInter = data => fetch.get("/entniche/entExportAuth/setLimit",data);
 
 //数据导出人员使用列表删除
-export const del_recordpersonListInter = data => fetch.get("/entExportAuth/deletePerson",data);
+export const del_recordpersonListInter = data => fetch.get("/entniche/entExportAuth/deletePerson",data);
 
 
 

src/api/request.js

@@ -1,13 +1,5 @@
 import axios from 'axios'
 
-//axios 默认参数配置
-if(process.env.NODE_ENV == "development"){
-    //axios 默认参数配置
-    axios.defaults.baseURL = '/api'
-}else{
-    axios.defaults.baseURL = '/entbase'
-}
-
 //设置默认请求头
 axios.defaults.headers = {
     'Content-Type': 'application/json',

src/assets/css/element.css

@@ -169,7 +169,7 @@
     color: #686868;
 }
 
-.edit_box .el-dialog {
+.key_box .el-dialog {
     width: 460px!important;
     height: 582px;
     border-radius: 5px;
@@ -335,9 +335,6 @@
 }
 
 .sub_msg .distri_msg .demo-warps .cell {
-    overflow: hidden;
-    text-overflow:ellipsis;
-    white-space: nowrap;
     padding: 0;
 }
 
@@ -440,4 +437,13 @@
     justify-content: center;
 }
 
+.edit_box .titles .el-checkbox-button__inner {
+    color: #1d1d1d;
+    font-weight: bold;
+}
+
+.edit_box .el-menu .el-submenu {
+    width: 100%;
+}
+
 

src/assets/js/china_area.js

@@ -0,0 +1,2428 @@
+const chinaMapJSON = [{
+    ProID: 1,
+    name: '北京市',
+    ProSort: 1,
+    ProRemark: '直辖市',
+    city: [{
+      CityID: 1,
+      name: '北京市',
+      ProID: 1,
+      CitySort: 1,
+      area: ['东城区', '西城区', '崇文区', '宣武区', '朝阳区', '丰台区', '石景山区', '海淀区', '门头沟区', '房山区', '通州区', '顺义区', '昌平区', '大兴区', '怀柔区', '平谷区', '密云县', '延庆县']
+    }]
+  }, {
+    ProID: 2,
+    name: '天津市',
+    ProSort: 2,
+    ProRemark: '直辖市',
+    city: [{
+      CityID: 2,
+      name: '天津市',
+      ProID: 2,
+      CitySort: 2,
+      area: ['和平区', '河东区', '河西区', '南开区', '河北区', '红桥区', '塘沽区', '汉沽区', '大港区', '东丽区', '西青区', '津南区', '北辰区', '武清区', '宝坻区', '宁河县', '静海县', '蓟县']
+    }]
+  }, {
+    ProID: 3,
+    name: '河北省',
+    ProSort: 5,
+    ProRemark: '省份',
+    city: [{
+      CityID: 5,
+      name: '邯郸市',
+      ProID: 3,
+      CitySort: 5,
+      area: ['邯山区', '丛台区', '复兴区', '峰峰矿区', '邯郸县', '临漳县', '成安县', '大名县', '涉县', '磁县', '肥乡县', '永年县', '邱县', '鸡泽县', '广平县', '馆陶县', '魏县', '曲周县', '武安市']
+    }, {
+      CityID: 6,
+      name: '石家庄市',
+      ProID: 3,
+      CitySort: 6,
+      area: ['长安区', '桥东区', '桥西区', '新华区', '井陉矿区', '裕华区', '井陉县', '正定县', '栾城县', '行唐县', '灵寿县', '高邑县', '深泽县', '赞皇县', '无极县', '平山县', '元氏县', '赵县', '辛集市', '藁城市', '晋州市', '新乐市', '鹿泉市']
+    }, {
+      CityID: 666,
+      name: '秦皇岛市',
+      ProID: 3,
+      CitySort: 666,
+      area: ['海港区', '山海关区', '北戴河区', '抚宁区', '青龙满族自治县', '昌黎县', '卢龙县']
+    }, {
+      CityID: 7,
+      name: '保定市',
+      ProID: 3,
+      CitySort: 7,
+      area: ['新市区', '北市区', '南市区', '满城县', '清苑县', '涞水县', '阜平县', '徐水县', '定兴县', '唐县', '高阳县', '容城县', '涞源县', '望都县', '安新县', '易县', '曲阳县', '蠡县', '顺平县', '博野县', '雄县', '涿州市', '定州市', '安国市', '高碑店市']
+    }, {
+      CityID: 8,
+      name: '张家口市',
+      ProID: 3,
+      CitySort: 8,
+      area: ['桥东区', '桥西区', '宣化区', '下花园区', '宣化县', '张北县', '康保县', '沽源县', '尚义县', '蔚县', '阳原县', '怀安县', '万全县', '怀来县', '涿鹿县', '赤城县', '崇礼县']
+    }, {
+      CityID: 9,
+      name: '承德市',
+      ProID: 3,
+      CitySort: 9,
+      area: ['双桥区', '双滦区', '鹰手营子矿区', '承德县', '兴隆县', '平泉县', '滦平县', '隆化县', '丰宁满族自治县', '宽城满族自治县', '围场满族蒙古族自治县']
+    }, {
+      CityID: 10,
+      name: '唐山市',
+      ProID: 3,
+      CitySort: 10,
+      area: ['路南区', '路北区', '古冶区', '开平区', '丰南区', '丰润区', '滦县', '滦南县', '乐亭县', '迁西县', '玉田县', '唐海县', '遵化市', '迁安市']
+    }, {
+      CityID: 11,
+      name: '廊坊市',
+      ProID: 3,
+      CitySort: 11,
+      area: ['安次区', '广阳区', '固安县', '永清县', '香河县', '大城县', '文安县', '大厂回族自治县', '霸州市', '三河市']
+    }, {
+      CityID: 12,
+      name: '沧州市',
+      ProID: 3,
+      CitySort: 12,
+      area: ['新华区', '运河区', '沧县', '青县', '东光县', '海兴县', '盐山县', '肃宁县', '南皮县', '吴桥县', '献县', '孟村回族自治县', '泊头市', '任丘市', '黄骅市', '河间市']
+    }, {
+      CityID: 13,
+      name: '衡水市',
+      ProID: 3,
+      CitySort: 13,
+      area: ['桃城区', '枣强县', '武邑县', '武强县', '饶阳县', '安平县', '故城县', '景县', '阜城县', '冀州市', '深州市']
+    }, {
+      CityID: 14,
+      name: '邢台市',
+      ProID: 3,
+      CitySort: 14,
+      area: ['桥东区', '桥西区', '邢台县', '临城县', '内丘县', '柏乡县', '隆尧县', '任县', '南和县', '宁晋县', '巨鹿县', '新河县', '广宗县', '平乡县', '威县', '清河县', '临西县', '南宫市', '沙河市']
+    }]
+  }, {
+    ProID: 4,
+    name: '山西省',
+    ProSort: 6,
+    ProRemark: '省份',
+    city: [{
+      CityID: 16,
+      name: '朔州市',
+      ProID: 4,
+      CitySort: 16,
+      area: ['朔城区', '平鲁区', '山阴县', '应县', '右玉县', '怀仁县']
+    }, {
+      CityID: 17,
+      name: '忻州市',
+      ProID: 4,
+      CitySort: 17,
+      area: ['忻府区', '定襄县', '五台县', '代县', '繁峙县', '宁武县', '静乐县', '神池县', '五寨县', '岢岚县', '河曲县', '保德县', '偏关县', '原平市']
+    }, {
+      CityID: 18,
+      name: '太原市',
+      ProID: 4,
+      CitySort: 18,
+      area: ['小店区', '迎泽区', '杏花岭区', '尖草坪区', '万柏林区', '晋源区', '清徐县', '阳曲县', '娄烦县', '古交市']
+    }, {
+      CityID: 19,
+      name: '大同市',
+      ProID: 4,
+      CitySort: 19,
+      area: ['矿区', '南郊区', '新荣区', '阳高县', '天镇县', '广灵县', '灵丘县', '浑源县', '左云县', '大同县']
+    }, {
+      CityID: 20,
+      name: '阳泉市',
+      ProID: 4,
+      CitySort: 20,
+      area: ['矿区', '平定县', '盂县']
+    }, {
+      CityID: 21,
+      name: '晋中市',
+      ProID: 4,
+      CitySort: 21,
+      area: ['榆次区', '榆社县', '左权县', '和顺县', '昔阳县', '寿阳县', '太谷县', '祁县', '平遥县', '灵石县', '介休市']
+    }, {
+      CityID: 22,
+      name: '长治市',
+      ProID: 4,
+      CitySort: 22,
+      area: ['城区', '长治县', '襄垣县', '屯留县', '平顺县', '黎城县', '壶关县', '长子县', '武乡县', '沁县', '沁源县', '潞城市']
+    }, {
+      CityID: 23,
+      name: '晋城市',
+      ProID: 4,
+      CitySort: 23,
+      area: ['沁水县', '阳城县', '陵川县', '泽州县', '高平市']
+    }, {
+      CityID: 24,
+      name: '临汾市',
+      ProID: 4,
+      CitySort: 24,
+      area: ['尧都区', '曲沃县', '翼城县', '襄汾县', '洪洞县', '古县', '安泽县', '浮山县', '吉县', '乡宁县', '大宁县', '隰县', '永和县', '蒲县', '汾西县', '侯马市', '霍州市']
+    }, {
+      CityID: 25,
+      name: '吕梁市',
+      ProID: 4,
+      CitySort: 25,
+      area: ['离石区', '文水县', '交城县', '兴县', '临县', '柳林县', '石楼县', '岚县', '方山县', '中阳县', '交口县', '孝义市', '汾阳市']
+    }, {
+      CityID: 26,
+      name: '运城市',
+      ProID: 4,
+      CitySort: 26,
+      area: ['盐湖区', '临猗县', '万荣县', '闻喜县', '稷山县', '新绛县', '绛县', '垣曲县', '夏县', '平陆县', '芮城县', '永济市', '河津市']
+    }]
+  }, {
+    ProID: 5,
+    name: '内蒙古自治区',
+    ProSort: 32,
+    ProRemark: '自治区',
+    city: [{
+      CityID: 351,
+      name: '呼伦贝尔市',
+      ProID: 5,
+      CitySort: 351,
+      area: ['海拉尔区', '阿荣旗', '莫力达瓦达斡尔族自治旗', '鄂伦春自治旗', '鄂温克族自治旗', '陈巴尔虎旗', '新巴尔虎左旗', '新巴尔虎右旗', '满洲里市', '牙克石市', '扎兰屯市', '额尔古纳市', '根河市']
+    }, {
+      CityID: 352,
+      name: '呼和浩特市',
+      ProID: 5,
+      CitySort: 352,
+      area: ['新城区', '回民区', '玉泉区', '赛罕区', '土默特左旗', '托克托县', '和林格尔县', '清水河县', '武川县']
+    }, {
+      CityID: 353,
+      name: '包头市',
+      ProID: 5,
+      CitySort: 353,
+      area: ['东河区', '昆都仑区', '青山区', '石拐区', '白云鄂博矿区', '九原区', '土默特右旗', '固阳县', '达尔罕茂明安联合旗']
+    }, {
+      CityID: 354,
+      name: '乌海市',
+      ProID: 5,
+      CitySort: 354,
+      area: ['海勃湾区', '海南区', '乌达区']
+    }, {
+      CityID: 355,
+      name: '乌兰察布市',
+      ProID: 5,
+      CitySort: 355,
+      area: ['集宁区', '卓资县', '化德县', '商都县', '兴和县', '凉城县', '察哈尔右翼前旗', '察哈尔右翼中旗', '察哈尔右翼后旗', '四子王旗', '丰镇市']
+    }, {
+      CityID: 356,
+      name: '通辽市',
+      ProID: 5,
+      CitySort: 356,
+      area: ['科尔沁区', '科尔沁左翼中旗', '科尔沁左翼后旗', '开鲁县', '库伦旗', '奈曼旗', '扎鲁特旗', '霍林郭勒市']
+    }, {
+      CityID: 357,
+      name: '赤峰市',
+      ProID: 5,
+      CitySort: 357,
+      area: ['红山区', '元宝山区', '松山区', '阿鲁科尔沁旗', '巴林左旗', '巴林右旗', '林西县', '克什克腾旗', '翁牛特旗', '喀喇沁旗', '宁城县', '敖汉旗']
+    }, {
+      CityID: 358,
+      name: '鄂尔多斯市',
+      ProID: 5,
+      CitySort: 358,
+      area: ['东胜区', '达拉特旗', '准格尔旗', '鄂托克前旗', '鄂托克旗', '杭锦旗', '乌审旗', '伊金霍洛旗']
+    }, {
+      CityID: 359,
+      name: '巴彦淖尔市',
+      ProID: 5,
+      CitySort: 359,
+      area: ['临河区', '五原县', '磴口县', '乌拉特前旗', '乌拉特中旗', '乌拉特后旗', '杭锦后旗']
+    }, {
+      CityID: 360,
+      name: '锡林郭勒盟',
+      ProID: 5,
+      CitySort: 360,
+      area: ['二连浩特市', '锡林浩特市', '阿巴嘎旗', '苏尼特左旗', '苏尼特右旗', '东乌珠穆沁旗', '西乌珠穆沁旗', '太仆寺旗', '镶黄旗', '正镶白旗', '正蓝旗', '多伦县']
+    }, {
+      CityID: 361,
+      name: '兴安盟',
+      ProID: 5,
+      CitySort: 361,
+      area: ['乌兰浩特市', '阿尔山市', '科尔沁右翼前旗', '科尔沁右翼中旗', '扎赉特旗', '突泉县']
+    }, {
+      CityID: 362,
+      name: '阿拉善盟',
+      ProID: 5,
+      CitySort: 362,
+      area: ['阿拉善左旗', '阿拉善右旗', '额济纳旗']
+    }]
+  }, {
+    ProID: 6,
+    name: '辽宁省',
+    ProSort: 8,
+    ProRemark: '省份',
+    city: [{
+      CityID: 27,
+      name: '沈阳市',
+      ProID: 6,
+      CitySort: 27,
+      area: ['和平区', '沈河区', '大东区', '皇姑区', '铁西区', '苏家屯区', '东陵区', '沈北新区', '于洪区', '辽中县', '康平县', '法库县', '新民市']
+    }, {
+      CityID: 28,
+      name: '铁岭市',
+      ProID: 6,
+      CitySort: 28,
+      area: ['银州区', '清河区', '铁岭县', '西丰县', '昌图县', '调兵山市', '开原市']
+    }, {
+      CityID: 29,
+      name: '大连市',
+      ProID: 6,
+      CitySort: 29,
+      area: ['长海县', '旅顺口区', '中山区', '西岗区', '沙河口区', '甘井子区', '金州区', '普兰店市', '瓦房店市', '庄河市']
+    }, {
+      CityID: 30,
+      name: '鞍山市',
+      ProID: 6,
+      CitySort: 30,
+      area: ['铁东区', '铁西区', '立山区', '千山区', '台安县', '岫岩满族自治县', '海城市']
+    }, {
+      CityID: 31,
+      name: '抚顺市',
+      ProID: 6,
+      CitySort: 31,
+      area: ['新抚区', '东洲区', '望花区', '顺城区', '抚顺县', '新宾满族自治县', '清原满族自治县']
+    }, {
+      CityID: 32,
+      name: '本溪市',
+      ProID: 6,
+      CitySort: 32,
+      area: ['平山区', '溪湖区', '明山区', '南芬区', '本溪满族自治县', '桓仁满族自治县']
+    }, {
+      CityID: 33,
+      name: '丹东市',
+      ProID: 6,
+      CitySort: 33,
+      area: ['元宝区', '振兴区', '振安区', '宽甸满族自治县', '东港市', '凤城市']
+    }, {
+      CityID: 34,
+      name: '锦州市',
+      ProID: 6,
+      CitySort: 34,
+      area: ['古塔区', '凌河区', '太和区', '黑山县', '义县', '凌海市', '北镇市']
+    }, {
+      CityID: 35,
+      name: '营口市',
+      ProID: 6,
+      CitySort: 35,
+      area: ['站前区', '西市区', '鮁鱼圈区', '老边区', '盖州市', '大石桥市']
+    }, {
+      CityID: 36,
+      name: '阜新市',
+      ProID: 6,
+      CitySort: 36,
+      area: ['海州区', '新邱区', '太平区', '清河门区', '细河区', '阜新蒙古族自治县', '彰武县']
+    }, {
+      CityID: 37,
+      name: '辽阳市',
+      ProID: 6,
+      CitySort: 37,
+      area: ['白塔区', '文圣区', '宏伟区', '弓长岭区', '太子河区', '辽阳县', '灯塔市']
+    }, {
+      CityID: 38,
+      name: '朝阳市',
+      ProID: 6,
+      CitySort: 38,
+      area: ['双塔区', '龙城区', '朝阳县', '建平县', '喀喇沁左翼蒙古族自治县', '北票市', '凌源市']
+    }, {
+      CityID: 39,
+      name: '盘锦市',
+      ProID: 6,
+      CitySort: 39,
+      area: ['双台子区', '兴隆台区', '大洼县', '盘山县']
+    }, {
+      CityID: 40,
+      name: '葫芦岛市',
+      ProID: 6,
+      CitySort: 40,
+      area: ['连山区', '龙港区', '南票区', '绥中县', '建昌县', '兴城市']
+    }]
+  }, {
+    ProID: 7,
+    name: '吉林省',
+    ProSort: 9,
+    ProRemark: '省份',
+    city: [{
+      CityID: 41,
+      name: '长春市',
+      ProID: 7,
+      CitySort: 41,
+      area: ['南关区', '宽城区', '朝阳区', '二道区', '绿园区', '双阳区', '农安县', '九台市', '榆树市', '德惠市']
+    }, {
+      CityID: 42,
+      name: '吉林市',
+      ProID: 7,
+      CitySort: 42,
+      area: ['昌邑区', '龙潭区', '船营区', '丰满区', '永吉县', '蛟河市', '桦甸市', '舒兰市', '磐石市']
+    }, {
+      CityID: 43,
+      name: '延边朝鲜族自治州',
+      ProID: 7,
+      CitySort: 43,
+      area: ['延吉市', '图们市', '敦化市', '珲春市', '龙井市', '和龙市', '汪清县', '安图县']
+    }, {
+      CityID: 44,
+      name: '四平市',
+      ProID: 7,
+      CitySort: 44,
+      area: ['铁西区', '铁东区', '梨树县', '伊通满族自治县', '公主岭市', '双辽市']
+    }, {
+      CityID: 45,
+      name: '通化市',
+      ProID: 7,
+      CitySort: 45,
+      area: ['东昌区', '二道江区', '通化县', '辉南县', '柳河县', '梅河口市', '集安市']
+    }, {
+      CityID: 46,
+      name: '白城市',
+      ProID: 7,
+      CitySort: 46,
+      area: ['洮北区', '镇赉县', '通榆县', '洮南市', '大安市']
+    }, {
+      CityID: 47,
+      name: '辽源市',
+      ProID: 7,
+      CitySort: 47,
+      area: ['龙山区', '西安区', '东丰县', '东辽县']
+    }, {
+      CityID: 48,
+      name: '松原市',
+      ProID: 7,
+      CitySort: 48,
+      area: ['宁江区', '前郭尔罗斯蒙古族自治县', '长岭县', '乾安县', '扶余县']
+    }, {
+      CityID: 49,
+      name: '白山市',
+      ProID: 7,
+      CitySort: 49,
+      area: ['八道江区', '江源区', '抚松县', '靖宇县', '长白朝鲜族自治县', '临江市']
+    }]
+  }, {
+    ProID: 8,
+    name: '黑龙江省',
+    ProSort: 10,
+    ProRemark: '省份',
+    city: [{
+      CityID: 50,
+      name: '哈尔滨市',
+      ProID: 8,
+      CitySort: 50,
+      area: ['道里区', '南岗区', '道外区', '平房区', '松北区', '香坊区', '呼兰区', '阿城区', '依兰县', '方正县', '宾县', '巴彦县', '木兰县', '通河县', '延寿县', '双城市', '尚志市', '五常市']
+    }, {
+      CityID: 51,
+      name: '齐齐哈尔市',
+      ProID: 8,
+      CitySort: 51,
+      area: ['龙沙区', '建华区', '铁锋区', '昂昂溪区', '富拉尔基区', '碾子山区', '梅里斯达翰尔族区', '龙江县', '依安县', '泰来县', '甘南县', '富裕县', '克山县', '克东县', '拜泉县', '讷河市']
+    }, {
+      CityID: 52,
+      name: '鸡西市',
+      ProID: 8,
+      CitySort: 52,
+      area: ['鸡冠区', '恒山区', '滴道区', '梨树区', '城子河区', '麻山区', '鸡东县', '虎林市', '密山市']
+    }, {
+      CityID: 53,
+      name: '牡丹江市',
+      ProID: 8,
+      CitySort: 53,
+      area: ['东安区', '阳明区', '爱民区', '西安区', '东宁县', '林口县', '绥芬河市', '海林市', '宁安市', '穆棱市']
+    }, {
+      CityID: 54,
+      name: '七台河市',
+      ProID: 8,
+      CitySort: 54,
+      area: ['新兴区', '桃山区', '茄子河区', '勃利县']
+    }, {
+      CityID: 55,
+      name: '佳木斯市',
+      ProID: 8,
+      CitySort: 55,
+      area: ['向阳区', '前进区', '东风区', '桦南县', '桦川县', '汤原县', '抚远县', '同江市', '富锦市']
+    }, {
+      CityID: 56,
+      name: '鹤岗市',
+      ProID: 8,
+      CitySort: 56,
+      area: ['向阳区', '工农区', '南山区', '兴安区', '东山区', '兴山区', '萝北县', '绥滨县']
+    }, {
+      CityID: 57,
+      name: '双鸭山市',
+      ProID: 8,
+      CitySort: 57,
+      area: ['尖山区', '岭东区', '四方台区', '宝山区', '集贤县', '友谊县', '宝清县', '饶河县']
+    }, {
+      CityID: 58,
+      name: '绥化市',
+      ProID: 8,
+      CitySort: 58,
+      area: ['北林区', '望奎县', '兰西县', '青冈县', '庆安县', '明水县', '绥棱县', '安达市', '肇东市', '海伦市']
+    }, {
+      CityID: 59,
+      name: '黑河市',
+      ProID: 8,
+      CitySort: 59,
+      area: ['爱辉区', '嫩江县', '逊克县', '孙吴县', '北安市', '五大连池市']
+    }, {
+      CityID: 60,
+      name: '大兴安岭地区',
+      ProID: 8,
+      CitySort: 60,
+      area: ['呼玛县', '塔河县', '漠河县']
+    }, {
+      CityID: 61,
+      name: '伊春市',
+      ProID: 8,
+      CitySort: 61,
+      area: ['伊春区', '南岔区', '友好区', '西林区', '翠峦区', '新青区', '美溪区', '金山屯区', '五营区', '乌马河区', '汤旺河区', '带岭区', '乌伊岭区', '红星区', '上甘岭区', '嘉荫县', '铁力市']
+    }, {
+      CityID: 62,
+      name: '大庆市',
+      ProID: 8,
+      CitySort: 62,
+      area: ['萨尔图区', '龙凤区', '让胡路区', '红岗区', '大同区', '肇州县', '肇源县', '林甸县', '杜尔伯特蒙古族自治县']
+    }]
+  }, {
+    ProID: 9,
+    name: '上海市',
+    ProSort: 3,
+    ProRemark: '直辖市',
+    city: [{
+      CityID: 3,
+      name: '上海市',
+      ProID: 9,
+      CitySort: 3,
+      area: ['黄浦区', '卢湾区', '徐汇区', '长宁区', '静安区', '普陀区', '闸北区', '虹口区', '杨浦区', '闵行区', '宝山区', '嘉定区', '浦东新区', '金山区', '松江区', '青浦区', '南汇区', '奉贤区', '崇明县']
+    }]
+  }, {
+    ProID: 10,
+    name: '江苏省',
+    ProSort: 11,
+    ProRemark: '省份',
+    city: [{
+      CityID: 63,
+      name: '南京市',
+      ProID: 10,
+      CitySort: 63,
+      area: ['江宁区', '浦口区', '玄武区', '白下区', '秦淮区', '建邺区', '鼓楼区', '下关区', '栖霞区', '雨花台区', '六合区', '溧水县', '高淳县']
+    }, {
+      CityID: 64,
+      name: '无锡市',
+      ProID: 10,
+      CitySort: 64,
+      area: ['崇安区', '南长区', '北塘区', '锡山区', '惠山区', '滨湖区', '江阴市', '宜兴市']
+    }, {
+      CityID: 65,
+      name: '镇江市',
+      ProID: 10,
+      CitySort: 65,
+      area: ['京口区', '润州区', '丹徒区', '丹阳市', '扬中市', '句容市']
+    }, {
+      CityID: 66,
+      name: '苏州市',
+      ProID: 10,
+      CitySort: 66,
+      area: ['沧浪区', '常熟市', '平江区', '金阊区', '虎丘区', '昆山市', '太仓市', '吴江市', '吴中区', '相城区', '张家港市']
+    }, {
+      CityID: 67,
+      name: '南通市',
+      ProID: 10,
+      CitySort: 67,
+      area: ['崇川区', '港闸区', '海安县', '如东县', '启东市', '如皋市', '通州市', '海门市']
+    }, {
+      CityID: 68,
+      name: '扬州市',
+      ProID: 10,
+      CitySort: 68,
+      area: ['高邮市', '广陵区', '邗江区', '维扬区', '宝应县', '江都市', '仪征市']
+    }, {
+      CityID: 69,
+      name: '盐城市',
+      ProID: 10,
+      CitySort: 69,
+      area: ['亭湖区', '盐都区', '响水县', '滨海县', '阜宁县', '射阳县', '建湖县', '东台市', '大丰市']
+    }, {
+      CityID: 70,
+      name: '徐州市',
+      ProID: 10,
+      CitySort: 70,
+      area: ['鼓楼区', '云龙区', '九里区', '贾汪区', '泉山区', '丰县', '沛县', '铜山县', '睢宁县', '新沂市', '邳州市']
+    }, {
+      CityID: 71,
+      name: '淮安市',
+      ProID: 10,
+      CitySort: 71,
+      area: ['清河区', '楚州区', '淮阴区', '清浦区', '涟水县', '洪泽县', '盱眙县', '金湖县']
+    }, {
+      CityID: 72,
+      name: '连云港市',
+      ProID: 10,
+      CitySort: 72,
+      area: ['连云区', '新浦区', '海州区', '赣榆县', '东海县', '灌云县', '灌南县']
+    }, {
+      CityID: 73,
+      name: '常州市',
+      ProID: 10,
+      CitySort: 73,
+      area: ['天宁区', '钟楼区', '戚墅堰区', '新北区', '武进区', '溧阳市', '金坛市']
+    }, {
+      CityID: 74,
+      name: '泰州市',
+      ProID: 10,
+      CitySort: 74,
+      area: ['海陵区', '高港区', '兴化市', '靖江市', '泰兴市', '姜堰市']
+    }, {
+      CityID: 75,
+      name: '宿迁市',
+      ProID: 10,
+      CitySort: 75,
+      area: ['宿城区', '宿豫区', '沭阳县', '泗阳县', '泗洪县']
+    }]
+  }, {
+    ProID: 11,
+    name: '浙江省',
+    ProSort: 12,
+    ProRemark: '省份',
+    city: [{
+      CityID: 76,
+      name: '舟山市',
+      ProID: 11,
+      CitySort: 76,
+      area: ['定海区', '普陀区', '岱山县', '嵊泗县']
+    }, {
+      CityID: 77,
+      name: '衢州市',
+      ProID: 11,
+      CitySort: 77,
+      area: ['柯城区', '衢江区', '常山县', '开化县', '龙游县', '江山市']
+    }, {
+      CityID: 78,
+      name: '杭州市',
+      ProID: 11,
+      CitySort: 78,
+      area: ['上城区', '下城区', '江干区', '拱墅区', '西湖区', '滨江区', '余杭区', '桐庐县', '淳安县', '建德市', '富阳市', '临安市', '萧山区']
+    }, {
+      CityID: 79,
+      name: '湖州市',
+      ProID: 11,
+      CitySort: 79,
+      area: ['吴兴区', '南浔区', '德清县', '长兴县', '安吉县']
+    }, {
+      CityID: 80,
+      name: '嘉兴市',
+      ProID: 11,
+      CitySort: 80,
+      area: [' 南湖区', ' 秀洲区', ' 嘉善县', ' 海盐县', ' 海宁市', ' 平湖市', ' 桐乡市 ']
+    }, {
+      CityID: 81,
+      name: '宁波市',
+      ProID: 11,
+      CitySort: 81,
+      area: ['海曙区', '江东区', '江北区', '北仑区', '镇海区', '鄞州区', '象山县', '宁海县', '余姚市', '慈溪市', '奉化市']
+    }, {
+      CityID: 82,
+      name: '绍兴市',
+      ProID: 11,
+      CitySort: 82,
+      area: ['越城区', '绍兴县', '新昌县', '诸暨市', '上虞市', '嵊州市']
+    }, {
+      CityID: 83,
+      name: '温州市',
+      ProID: 11,
+      CitySort: 83,
+      area: ['鹿城区', '龙湾区', '瓯海区', '洞头县', '永嘉县', '平阳县', '苍南县', '文成县', '泰顺县', '瑞安市', '乐清市']
+    }, {
+      CityID: 84,
+      name: '丽水市',
+      ProID: 11,
+      CitySort: 84,
+      area: ['莲都区', '青田县', '缙云县', '遂昌县', '松阳县', '云和县', '庆元县', '景宁畲族自治县', '龙泉市']
+    }, {
+      CityID: 85,
+      name: '金华市',
+      ProID: 11,
+      CitySort: 85,
+      area: ['婺城区', '金东区', '武义县', '浦江县', '磐安县', '兰溪市', '义乌市', '东阳市', '永康市']
+    }, {
+      CityID: 86,
+      name: '台州市',
+      ProID: 11,
+      CitySort: 86,
+      area: ['椒江区', '黄岩区', '路桥区', '玉环县', '三门县', '天台县', '仙居县', '温岭市', '临海市']
+    }]
+  }, {
+    ProID: 12,
+    name: '安徽省',
+    ProSort: 13,
+    ProRemark: '省份',
+    city: [{
+      CityID: 87,
+      name: '合肥市',
+      ProID: 12,
+      CitySort: 87,
+      area: ['瑶海区', '庐阳区', '蜀山区', '包河区', '长丰县', '肥东县', '肥西县']
+    }, {
+      CityID: 88,
+      name: '芜湖市',
+      ProID: 12,
+      CitySort: 88,
+      area: ['镜湖区', '弋江区', '鸠江区', '三山区', '芜湖县', '繁昌县', '南陵县']
+    }, {
+      CityID: 89,
+      name: '蚌埠市',
+      ProID: 12,
+      CitySort: 89,
+      area: ['龙子湖区', '蚌山区', '禹会区', '淮上区', '怀远县', '五河县', '固镇县']
+    }, {
+      CityID: 90,
+      name: '淮南市',
+      ProID: 12,
+      CitySort: 90,
+      area: ['大通区', '田家庵区', '谢家集区', '八公山区', '潘集区', '凤台县']
+    }, {
+      CityID: 91,
+      name: '马鞍山市',
+      ProID: 12,
+      CitySort: 91,
+      area: ['金家庄区', '花山区', '雨山区', '当涂县']
+    }, {
+      CityID: 92,
+      name: '淮北市',
+      ProID: 12,
+      CitySort: 92,
+      area: ['杜集区', '相山区', '烈山区', '濉溪县 ']
+    }, {
+      CityID: 93,
+      name: '铜陵市',
+      ProID: 12,
+      CitySort: 93,
+      area: ['铜官山区', '狮子山区', '铜陵县']
+    }, {
+      CityID: 94,
+      name: '安庆市',
+      ProID: 12,
+      CitySort: 94,
+      area: ['迎江区', '大观区', '宜秀区', '怀宁县', '枞阳县', '潜山县', '太湖县', '宿松县', '望江县', '岳西县', '桐城市']
+    }, {
+      CityID: 95,
+      name: '黄山市',
+      ProID: 12,
+      CitySort: 95,
+      area: ['屯溪区', '黄山区', '徽州区', '歙县', '休宁县', '黟县', '祁门县']
+    }, {
+      CityID: 96,
+      name: '滁州市',
+      ProID: 12,
+      CitySort: 96,
+      area: ['琅琊区', '南谯区', '来安县', '全椒县', '定远县', '凤阳县', '天长市', '明光市']
+    }, {
+      CityID: 97,
+      name: '阜阳市',
+      ProID: 12,
+      CitySort: 97,
+      area: ['颍州区', '颍东区', '颍泉区', '临泉县', '太和县', '阜南县', '颍上县', '界首市']
+    }, {
+      CityID: 98,
+      name: '宿州市',
+      ProID: 12,
+      CitySort: 98,
+      area: ['埇桥区', '砀山县', '萧县', '灵璧县', '泗县 ']
+    }, {
+      CityID: 99,
+      name: '巢湖市',
+      ProID: 12,
+      CitySort: 99,
+      area: ['居巢区', '庐江县', '无为县', '含山县', '和县 ']
+    }, {
+      CityID: 100,
+      name: '六安市',
+      ProID: 12,
+      CitySort: 100,
+      area: ['金安区', '裕安区', '寿县', '霍邱县', '舒城县', '金寨县', '霍山县']
+    }, {
+      CityID: 101,
+      name: '亳州市',
+      ProID: 12,
+      CitySort: 101,
+      area: ['谯城区', '涡阳县', '蒙城县', '利辛县']
+    }, {
+      CityID: 102,
+      name: '池州市',
+      ProID: 12,
+      CitySort: 102,
+      area: ['贵池区', '东至县', '石台县', '青阳县']
+    }, {
+      CityID: 103,
+      name: '宣城市',
+      ProID: 12,
+      CitySort: 103,
+      area: ['宣州区', '郎溪县', '广德县', '泾县', '绩溪县', '旌德县', '宁国市']
+    }]
+  }, {
+    ProID: 13,
+    name: '福建省',
+    ProSort: 14,
+    ProRemark: '省份',
+    city: [{
+      CityID: 104,
+      name: '福州市',
+      ProID: 13,
+      CitySort: 104,
+      area: ['鼓楼区', '台江区', '仓山区', '马尾区', '晋安区', '闽侯县', '连江县', '罗源县', '闽清县', '永泰县', '平潭县', '福清市', '长乐市']
+    }, {
+      CityID: 105,
+      name: '厦门市',
+      ProID: 13,
+      CitySort: 105,
+      area: ['思明区', '海沧区', '湖里区', '集美区', '同安区', '翔安区']
+    }, {
+      CityID: 106,
+      name: '宁德市',
+      ProID: 13,
+      CitySort: 106,
+      area: ['蕉城区', '霞浦县', '古田县', '屏南县', '寿宁县', '周宁县', '柘荣县', '福安市', '福鼎市']
+    }, {
+      CityID: 107,
+      name: '莆田市',
+      ProID: 13,
+      CitySort: 107,
+      area: ['城厢区', '涵江区', '荔城区', '秀屿区', '仙游县']
+    }, {
+      CityID: 108,
+      name: '泉州市',
+      ProID: 13,
+      CitySort: 108,
+      area: ['鲤城区', '丰泽区', '洛江区', '泉港区', '惠安县', '安溪县', '永春县', '德化县', '石狮市', '晋江市', '南安市']
+    }, {
+      CityID: 109,
+      name: '漳州市',
+      ProID: 13,
+      CitySort: 109,
+      area: ['芗城区', '龙文区', '云霄县', '漳浦县', '诏安县', '长泰县', '东山县', '南靖县', '平和县', '华安县', '龙海市']
+    }, {
+      CityID: 110,
+      name: '龙岩市',
+      ProID: 13,
+      CitySort: 110,
+      area: ['新罗区', '长汀县', '永定县', '上杭县', '武平县', '连城县', '漳平市']
+    }, {
+      CityID: 111,
+      name: '三明市',
+      ProID: 13,
+      CitySort: 111,
+      area: ['梅列区', '三元区', '明溪县', '清流县', '宁化县', '大田县', '尤溪县', '沙县', '将乐县', '泰宁县', '建宁县', '永安市']
+    }, {
+      CityID: 112,
+      name: '南平市',
+      ProID: 13,
+      CitySort: 112,
+      area: ['延平区', '顺昌县', '浦城县', '光泽县', '松溪县', '政和县', '邵武市', '武夷山市', '建瓯市', '建阳市']
+    }]
+  }, {
+    ProID: 14,
+    name: '江西省',
+    ProSort: 15,
+    ProRemark: '省份',
+    city: [{
+      CityID: 113,
+      name: '鹰潭市',
+      ProID: 14,
+      CitySort: 113,
+      area: ['月湖区', '余江县', '贵溪市']
+    }, {
+      CityID: 114,
+      name: '新余市',
+      ProID: 14,
+      CitySort: 114,
+      area: ['渝水区', '分宜县']
+    }, {
+      CityID: 115,
+      name: '南昌市',
+      ProID: 14,
+      CitySort: 115,
+      area: ['东湖区', '西湖区', '青云谱区', '湾里区', '青山湖区', '南昌县', '新建县', '安义县', '进贤县']
+    }, {
+      CityID: 116,
+      name: '九江市',
+      ProID: 14,
+      CitySort: 116,
+      area: ['庐山区', '浔阳区', '九江县', '武宁县', '修水县', '永修县', '德安县', '星子县', '都昌县', '湖口县', '彭泽县', '瑞昌市']
+    }, {
+      CityID: 117,
+      name: '上饶市',
+      ProID: 14,
+      CitySort: 117,
+      area: ['信州区', '上饶县', '广丰县', '玉山县', '铅山县', '横峰县', '弋阳县', '余干县', '鄱阳县', '万年县', '婺源县', '德兴市']
+    }, {
+      CityID: 118,
+      name: '抚州市',
+      ProID: 14,
+      CitySort: 118,
+      area: ['临川区', '南城县', '黎川县', '南丰县', '崇仁县', '乐安县', '宜黄县', '金溪县', '资溪县', '东乡县', '广昌县']
+    }, {
+      CityID: 119,
+      name: '宜春市',
+      ProID: 14,
+      CitySort: 119,
+      area: ['袁州区', '奉新县', '万载县', '上高县', '宜丰县', '靖安县', '铜鼓县', '丰城市', '樟树市', '高安市']
+    }, {
+      CityID: 120,
+      name: '吉安市',
+      ProID: 14,
+      CitySort: 120,
+      area: ['吉州区', '青原区', '吉安县', '吉水县', '峡江县', '新干县', '永丰县', '泰和县', '遂川县', '万安县', '安福县', '永新县', '井冈山市']
+    }, {
+      CityID: 121,
+      name: '赣州市',
+      ProID: 14,
+      CitySort: 121,
+      area: ['章贡区', '赣县', '信丰县', '大余县', '上犹县', '崇义县', '安远县', '龙南县', '定南县', '全南县', '宁都县', '于都县', '兴国县', '会昌县', '寻乌县', '石城县', '瑞金市', '南康市']
+    }, {
+      CityID: 122,
+      name: '景德镇市',
+      ProID: 14,
+      CitySort: 122,
+      area: ['昌江区', '珠山区', '浮梁县', '乐平市']
+    }, {
+      CityID: 123,
+      name: '萍乡市',
+      ProID: 14,
+      CitySort: 123,
+      area: ['安源区', '湘东区', '莲花县', '上栗县', '芦溪县']
+    }]
+  }, {
+    ProID: 15,
+    name: '山东省',
+    ProSort: 16,
+    ProRemark: '省份',
+    city: [{
+      CityID: 124,
+      name: '菏泽市',
+      ProID: 15,
+      CitySort: 124,
+      area: ['牡丹区', '曹县', '单县', '成武县', '巨野县', '郓城县', '鄄城县', '定陶县', '东明县']
+    }, {
+      CityID: 125,
+      name: '济南市',
+      ProID: 15,
+      CitySort: 125,
+      area: ['历下区', '市中区', '槐荫区', '天桥区', '历城区', '长清区', '平阴县', '济阳县', '商河县', '章丘市']
+    }, {
+      CityID: 126,
+      name: '青岛市',
+      ProID: 15,
+      CitySort: 126,
+      area: ['市南区', '市北区', '四方区', '黄岛区', '崂山区', '李沧区', '城阳区', '胶州市', '即墨市', '平度市', '胶南市', '莱西市']
+    }, {
+      CityID: 127,
+      name: '淄博市',
+      ProID: 15,
+      CitySort: 127,
+      area: ['淄川区', '张店区', '博山区', '临淄区', '周村区', '桓台县', '高青县', '沂源县']
+    }, {
+      CityID: 128,
+      name: '德州市',
+      ProID: 15,
+      CitySort: 128,
+      area: ['德城区', '陵县', '宁津县', '庆云县', '临邑县', '齐河县', '平原县', '夏津县', '武城县', '乐陵市', '禹城市']
+    }, {
+      CityID: 129,
+      name: '烟台市',
+      ProID: 15,
+      CitySort: 129,
+      area: ['芝罘区', '福山区', '牟平区', '莱山区', '长岛县', '龙口市', '莱阳市', '莱州市', '蓬莱市', '招远市', '栖霞市', '海阳市']
+    }, {
+      CityID: 130,
+      name: '潍坊市',
+      ProID: 15,
+      CitySort: 130,
+      area: ['潍城区', '寒亭区', '坊子区', '奎文区', '临朐县', '昌乐县', '青州市', '诸城市', '寿光市', '安丘市', '高密市', '昌邑市']
+    }, {
+      CityID: 131,
+      name: '济宁市',
+      ProID: 15,
+      CitySort: 131,
+      area: ['市中区', '任城区', '微山县', '鱼台县', '金乡县', '嘉祥县', '汶上县', '泗水县', '梁山县', '曲阜市', '兖州市', '邹城市']
+    }, {
+      CityID: 132,
+      name: '泰安市',
+      ProID: 15,
+      CitySort: 132,
+      area: ['泰山区', '岱岳区', '宁阳县', '东平县', '新泰市', '肥城市']
+    }, {
+      CityID: 133,
+      name: '临沂市',
+      ProID: 15,
+      CitySort: 133,
+      area: ['兰山区', '罗庄区', '河东区', '沂南县', '郯城县', '沂水县', '苍山县', '费县', '平邑县', '莒南县', '蒙阴县', '临沭县']
+    }, {
+      CityID: 134,
+      name: '滨州市',
+      ProID: 15,
+      CitySort: 134,
+      area: ['滨城区', '惠民县', '阳信县', '无棣县', '沾化县', '博兴县', '邹平县']
+    }, {
+      CityID: 135,
+      name: '东营市',
+      ProID: 15,
+      CitySort: 135,
+      area: ['东营区', '河口区', '垦利县', '利津县', '广饶县']
+    }, {
+      CityID: 136,
+      name: '威海市',
+      ProID: 15,
+      CitySort: 136,
+      area: ['环翠区', '文登市', '荣成市', '乳山市']
+    }, {
+      CityID: 137,
+      name: '枣庄市',
+      ProID: 15,
+      CitySort: 137,
+      area: ['市中区', '薛城区', '峄城区', '台儿庄区', '山亭区', '滕州市']
+    }, {
+      CityID: 138,
+      name: '日照市',
+      ProID: 15,
+      CitySort: 138,
+      area: ['东港区', '岚山区', '五莲县', '莒县']
+    }, {
+      CityID: 139,
+      name: '莱芜市',
+      ProID: 15,
+      CitySort: 139,
+      area: ['莱城区', '钢城区']
+    }, {
+      CityID: 140,
+      name: '聊城市',
+      ProID: 15,
+      CitySort: 140,
+      area: ['东昌府区', '阳谷县', '莘县', '茌平县', '东阿县', '冠县', '高唐县', '临清市']
+    }]
+  }, {
+    ProID: 16,
+    name: '河南省',
+    ProSort: 17,
+    ProRemark: '省份',
+    city: [{
+      CityID: 141,
+      name: '商丘市',
+      ProID: 16,
+      CitySort: 141,
+      area: ['梁园区', '睢阳区', '民权县', '睢县', '宁陵县', '柘城县', '虞城县', '夏邑县', '永城市']
+    }, {
+      CityID: 142,
+      name: '郑州市',
+      ProID: 16,
+      CitySort: 142,
+      area: ['中原区', '二七区', '管城回族区', '金水区', '上街区', '惠济区', '中牟县', '巩义市', '荥阳市', '新密市', '新郑市', '登封市']
+    }, {
+      CityID: 143,
+      name: '安阳市',
+      ProID: 16,
+      CitySort: 143,
+      area: ['文峰区', '北关区', '殷都区', '龙安区', '安阳县', '汤阴县', '滑县', '内黄县', '林州市']
+    }, {
+      CityID: 144,
+      name: '新乡市',
+      ProID: 16,
+      CitySort: 144,
+      area: ['红旗区', '卫滨区', '凤泉区', '牧野区', '新乡县', '获嘉县', '原阳县', '延津县', '封丘县', '长垣县', '卫辉市', '辉县市']
+    }, {
+      CityID: 145,
+      name: '许昌市',
+      ProID: 16,
+      CitySort: 145,
+      area: ['魏都区', '许昌县', '鄢陵县', '襄城县', '禹州市', '长葛市']
+    }, {
+      CityID: 146,
+      name: '平顶山市',
+      ProID: 16,
+      CitySort: 146,
+      area: ['新华区', '卫东区', '石龙区', '湛河区', '宝丰县', '叶县', '鲁山县', '郏县', '舞钢市', '汝州市']
+    }, {
+      CityID: 147,
+      name: '信阳市',
+      ProID: 16,
+      CitySort: 147,
+      area: ['浉河区', '平桥区', '罗山县', '光山县', '新县', '商城县', '固始县', '潢川县', '淮滨县', '息县']
+    }, {
+      CityID: 148,
+      name: '南阳市',
+      ProID: 16,
+      CitySort: 148,
+      area: ['宛城区', '卧龙区', '南召县', '方城县', '西峡县', '镇平县', '内乡县', '淅川县', '社旗县', '唐河县', '新野县', '桐柏县', '邓州市']
+    }, {
+      CityID: 149,
+      name: '开封市',
+      ProID: 16,
+      CitySort: 149,
+      area: ['龙亭区', '顺河回族区', '鼓楼区', '禹王台区', '金明区', '杞县', '通许县', '尉氏县', '开封县', '兰考县']
+    }, {
+      CityID: 150,
+      name: '洛阳市',
+      ProID: 16,
+      CitySort: 150,
+      area: ['老城区', '西工区', '瀍河回族区', '涧西区', '吉利区', '洛龙区', '孟津县', '新安县', '栾川县', '嵩县', '汝阳县', '宜阳县', '洛宁县', '伊川县', '偃师市']
+    }, {
+      CityID: 151,
+      name: '济源市',
+      ProID: 16,
+      CitySort: 151,
+      area: ['其他']
+    }, {
+      CityID: 152,
+      name: '焦作市',
+      ProID: 16,
+      CitySort: 152,
+      area: ['解放区', '中站区', '马村区', '山阳区', '修武县', '博爱县', '武陟县', '温县', '沁阳市', '孟州市']
+    }, {
+      CityID: 153,
+      name: '鹤壁市',
+      ProID: 16,
+      CitySort: 153,
+      area: ['鹤山区', '山城区', '淇滨区', '浚县', '淇县']
+    }, {
+      CityID: 154,
+      name: '濮阳市',
+      ProID: 16,
+      CitySort: 154,
+      area: ['华龙区', '清丰县', '南乐县', '范县', '台前县', '濮阳县']
+    }, {
+      CityID: 155,
+      name: '周口市',
+      ProID: 16,
+      CitySort: 155,
+      area: ['川汇区', '扶沟县', '西华县', '商水县', '沈丘县', '郸城县', '淮阳县', '太康县', '鹿邑县', '项城市']
+    }, {
+      CityID: 156,
+      name: '漯河市',
+      ProID: 16,
+      CitySort: 156,
+      area: ['源汇区', '郾城区', '召陵区', '舞阳县', '临颍县']
+    }, {
+      CityID: 157,
+      name: '驻马店市',
+      ProID: 16,
+      CitySort: 157,
+      area: ['驿城区', '西平县', '上蔡县', '平舆县', '正阳县', '确山县', '泌阳县', '汝南县', '遂平县', '新蔡县']
+    }, {
+      CityID: 158,
+      name: '三门峡市',
+      ProID: 16,
+      CitySort: 158,
+      area: ['湖滨区', '渑池县', '陕县', '卢氏县', '义马市', '灵宝市']
+    }]
+  }, {
+    ProID: 17,
+    name: '湖北省',
+    ProSort: 18,
+    ProRemark: '省份',
+    city: [{
+      CityID: 159,
+      name: '武汉市',
+      ProID: 17,
+      CitySort: 159,
+      area: ['江岸区', '江汉区', '硚口区', '汉阳区', '武昌区', '青山区', '洪山区', '东西湖区', '汉南区', '蔡甸区', '江夏区', '黄陂区', '新洲区']
+    }, {
+      CityID: 160,
+      name: '襄阳市',
+      ProID: 17,
+      CitySort: 160,
+      area: ['襄城区', '樊城区', '襄阳区', '南漳县', '谷城县', '保康县', '老河口市', '枣阳市', '宜城市']
+    }, {
+      CityID: 161,
+      name: '鄂州市',
+      ProID: 17,
+      CitySort: 161,
+      area: ['梁子湖区', '华容区', '鄂城区']
+    }, {
+      CityID: 162,
+      name: '孝感市',
+      ProID: 17,
+      CitySort: 162,
+      area: ['孝南区', '孝昌县', '大悟县', '云梦县', '应城市', '安陆市', '汉川市']
+    }, {
+      CityID: 163,
+      name: '黄冈市',
+      ProID: 17,
+      CitySort: 163,
+      area: ['黄州区', '团风县', '红安县', '罗田县', '英山县', '浠水县', '蕲春县', '黄梅县', '麻城市', '武穴市']
+    }, {
+      CityID: 164,
+      name: '黄石市',
+      ProID: 17,
+      CitySort: 164,
+      area: ['黄石港区', '西塞山区', '下陆区', '铁山区', '阳新县', '大冶市']
+    }, {
+      CityID: 165,
+      name: '咸宁市',
+      ProID: 17,
+      CitySort: 165,
+      area: ['咸安区', '嘉鱼县', '通城县', '崇阳县', '通山县', '赤壁市']
+    }, {
+      CityID: 166,
+      name: '荆州市',
+      ProID: 17,
+      CitySort: 166,
+      area: ['沙市区', '荆州区', '公安县', '监利县', '江陵县', '石首市', '洪湖市', '松滋市']
+    }, {
+      CityID: 167,
+      name: '宜昌市',
+      ProID: 17,
+      CitySort: 167,
+      area: ['西陵区', '伍家岗区', '点军区', '猇亭区', '夷陵区', '远安县', '兴山县', '秭归县', '长阳土家族自治县', '五峰土家族自治县', '宜都市', '当阳市', '枝江市']
+    }, {
+      CityID: 168,
+      name: '恩施土家族苗族自治州',
+      ProID: 17,
+      CitySort: 168,
+      area: ['恩施市', '利川市', '建始县', '巴东县', '宣恩县', '咸丰县', '来凤县', '鹤峰县']
+    }, {
+      CityID: 169,
+      name: '神农架林区',
+      ProID: 17,
+      CitySort: 169,
+      area: ['其他']
+    }, {
+      CityID: 170,
+      name: '十堰市',
+      ProID: 17,
+      CitySort: 170,
+      area: ['茅箭区', '张湾区', '郧县', '郧西县', '竹山县', '竹溪县', '房县', '丹江口市']
+    }, {
+      CityID: 171,
+      name: '随州市',
+      ProID: 17,
+      CitySort: 171,
+      area: ['曾都区', '广水市']
+    }, {
+      CityID: 172,
+      name: '荆门市',
+      ProID: 17,
+      CitySort: 172,
+      area: ['东宝区', '掇刀区', '京山县', '沙洋县', '钟祥市']
+    }, {
+      CityID: 173,
+      name: '仙桃市',
+      ProID: 17,
+      CitySort: 173,
+      area: ['其他']
+    }, {
+      CityID: 174,
+      name: '天门市',
+      ProID: 17,
+      CitySort: 174,
+      area: ['其他']
+    }, {
+      CityID: 175,
+      name: '潜江市',
+      ProID: 17,
+      CitySort: 175,
+      area: ['其他']
+    }]
+  }, {
+    ProID: 18,
+    name: '湖南省',
+    ProSort: 19,
+    ProRemark: '省份',
+    city: [{
+      CityID: 176,
+      name: '岳阳市',
+      ProID: 18,
+      CitySort: 176,
+      area: ['岳阳楼区', '云溪区', '君山区', '岳阳县', '华容县', '湘阴县', '平江县', '汨罗市', '临湘市']
+    }, {
+      CityID: 177,
+      name: '长沙市',
+      ProID: 18,
+      CitySort: 177,
+      area: ['芙蓉区', '天心区', '岳麓区', '开福区', '雨花区', '长沙县', '望城县', '宁乡县', '浏阳市']
+    }, {
+      CityID: 178,
+      name: '湘潭市',
+      ProID: 18,
+      CitySort: 178,
+      area: ['雨湖区', '岳塘区', '湘潭县', '湘乡市', '韶山市']
+    }, {
+      CityID: 179,
+      name: '株洲市',
+      ProID: 18,
+      CitySort: 179,
+      area: ['荷塘区', '芦淞区', '石峰区', '天元区', '株洲县', '攸县', '茶陵县', '炎陵县', '醴陵市']
+    }, {
+      CityID: 180,
+      name: '衡阳市',
+      ProID: 18,
+      CitySort: 180,
+      area: ['珠晖区', '雁峰区', '石鼓区', '蒸湘区', '南岳区', '衡阳县', '衡南县', '衡山县', '衡东县', '祁东县', '耒阳市', '常宁市']
+    }, {
+      CityID: 181,
+      name: '郴州市',
+      ProID: 18,
+      CitySort: 181,
+      area: ['北湖区', '苏仙区', '桂阳县', '宜章县', '永兴县', '嘉禾县', '临武县', '汝城县', '桂东县', '安仁县', '资兴市']
+    }, {
+      CityID: 182,
+      name: '常德市',
+      ProID: 18,
+      CitySort: 182,
+      area: ['武陵区', '鼎城区', '安乡县', '汉寿县', '澧县', '临澧县', '桃源县', '石门县', '津市市']
+    }, {
+      CityID: 183,
+      name: '益阳市',
+      ProID: 18,
+      CitySort: 183,
+      area: ['资阳区', '赫山区', '南县', '桃江县', '安化县', '沅江市']
+    }, {
+      CityID: 184,
+      name: '娄底市',
+      ProID: 18,
+      CitySort: 184,
+      area: ['娄星区', '双峰县', '新化县', '冷水江市', '涟源市']
+    }, {
+      CityID: 185,
+      name: '邵阳市',
+      ProID: 18,
+      CitySort: 185,
+      area: ['双清区', '大祥区', '北塔区', '邵东县', '新邵县', '邵阳县', '隆回县', '洞口县', '绥宁县', '新宁县', '城步苗族自治县', '武冈市']
+    }, {
+      CityID: 186,
+      name: '湘西土家族苗族自治州',
+      ProID: 18,
+      CitySort: 186,
+      area: ['吉首市', '泸溪县', '凤凰县', '花垣县', '保靖县', '古丈县', '永顺县', '龙山县']
+    }, {
+      CityID: 187,
+      name: '张家界市',
+      ProID: 18,
+      CitySort: 187,
+      area: ['永定区', '武陵源区', '慈利县', '桑植县']
+    }, {
+      CityID: 188,
+      name: '怀化市',
+      ProID: 18,
+      CitySort: 188,
+      area: ['鹤城区', '中方县', '沅陵县', '辰溪县', '溆浦县', '会同县', '麻阳苗族自治县', '新晃侗族自治县', '芷江侗族自治县', '靖州苗族侗族自治县', '通道侗族自治县', '洪江市']
+    }, {
+      CityID: 189,
+      name: '永州市',
+      ProID: 18,
+      CitySort: 189,
+      area: ['零陵区', '冷水滩区', '祁阳县', '东安县', '双牌县', '道县', '江永县', '宁远县', '蓝山县', '新田县', '江华瑶族自治县']
+    }]
+  }, {
+    ProID: 19,
+    name: '广东省',
+    ProSort: 20,
+    ProRemark: '省份',
+    city: [{
+      CityID: 190,
+      name: '广州市',
+      ProID: 19,
+      CitySort: 190,
+      area: ['从化市', '荔湾区', '越秀区', '海珠区', '天河区', '白云区', '花都区', '黄埔区', '萝岗区', '南沙区', '番禺区', '增城市']
+    }, {
+      CityID: 191,
+      name: '汕尾市',
+      ProID: 19,
+      CitySort: 191,
+      area: ['海丰县', '陆河县', '陆丰市']
+    }, {
+      CityID: 192,
+      name: '阳江市',
+      ProID: 19,
+      CitySort: 192,
+      area: ['江城区', '阳西县', '阳东县', '阳春市']
+    }, {
+      CityID: 193,
+      name: '揭阳市',
+      ProID: 19,
+      CitySort: 193,
+      area: ['榕城区', '揭东县', '揭西县', '惠来县', '普宁市']
+    }, {
+      CityID: 194,
+      name: '茂名市',
+      ProID: 19,
+      CitySort: 194,
+      area: ['茂南区', '茂港区', '电白县', '高州市', '化州市', '信宜市']
+    }, {
+      CityID: 195,
+      name: '惠州市',
+      ProID: 19,
+      CitySort: 195,
+      area: ['惠城区', '惠阳区', '博罗县', '惠东县', '龙门县']
+    }, {
+      CityID: 196,
+      name: '江门市',
+      ProID: 19,
+      CitySort: 196,
+      area: ['蓬江区', '江海区', '新会区', '台山市', '开平市', '鹤山市', '恩平市']
+    }, {
+      CityID: 197,
+      name: '韶关市',
+      ProID: 19,
+      CitySort: 197,
+      area: ['武江区', '浈江区', '曲江区', '始兴县', '仁化县', '翁源县', '乳源瑶族自治县', '新丰县', '乐昌市', '南雄市']
+    }, {
+      CityID: 198,
+      name: '梅州市',
+      ProID: 19,
+      CitySort: 198,
+      area: ['梅江区', '梅县', '大埔县', '丰顺县', '五华县', '平远县', '蕉岭县', '兴宁市']
+    }, {
+      CityID: 199,
+      name: '汕头市',
+      ProID: 19,
+      CitySort: 199,
+      area: ['龙湖区', '金平区', '濠江区', '潮阳区', '潮南区', '澄海区', '南澳县']
+    }, {
+      CityID: 200,
+      name: '深圳市',
+      ProID: 19,
+      CitySort: 200,
+      area: ['罗湖区', '福田区', '南山区', '宝安区', '龙岗区', '盐田区']
+    }, {
+      CityID: 201,
+      name: '珠海市',
+      ProID: 19,
+      CitySort: 201,
+      area: ['香洲区', '斗门区', '金湾区']
+    }, {
+      CityID: 202,
+      name: '佛山市',
+      ProID: 19,
+      CitySort: 202,
+      area: ['禅城区', '南海区', '顺德区', '三水区', '高明区']
+    }, {
+      CityID: 203,
+      name: '肇庆市',
+      ProID: 19,
+      CitySort: 203,
+      area: ['端州区', '鼎湖区', '广宁县', '怀集县', '封开县', '德庆县', '高要市', '四会市']
+    }, {
+      CityID: 204,
+      name: '湛江市',
+      ProID: 19,
+      CitySort: 204,
+      area: ['赤坎区', '霞山区', '坡头区', '麻章区', '遂溪县', '徐闻县', '廉江市', '雷州市', '吴川市']
+    }, {
+      CityID: 205,
+      name: '中山市',
+      ProID: 19,
+      CitySort: 205,
+      area: ['其他']
+    }, {
+      CityID: 206,
+      name: '河源市',
+      ProID: 19,
+      CitySort: 206,
+      area: ['源城区', '紫金县', '龙川县', '连平县', '和平县', '东源县']
+    }, {
+      CityID: 207,
+      name: '清远市',
+      ProID: 19,
+      CitySort: 207,
+      area: ['清城区', '佛冈县', '阳山县', '连山壮族瑶族自治县', '连南瑶族自治县', '清新县', '英德市', '连州市']
+    }, {
+      CityID: 208,
+      name: '云浮市',
+      ProID: 19,
+      CitySort: 208,
+      area: ['云城区', '新兴县', '郁南县', '云安县', '罗定市']
+    }, {
+      CityID: 209,
+      name: '潮州市',
+      ProID: 19,
+      CitySort: 209,
+      area: ['湘桥区', '潮安县', '饶平县']
+    }, {
+      CityID: 210,
+      name: '东莞市',
+      ProID: 19,
+      CitySort: 210,
+      area: ['其他']
+    }]
+  }, {
+    ProID: 20,
+    name: '海南省',
+    ProSort: 24,
+    ProRemark: '省份',
+    city: [{
+      CityID: 255,
+      name: '海口市',
+      ProID: 20,
+      CitySort: 255,
+      area: ['秀英区', '龙华区', '琼山区', '美兰区']
+    }, {
+      CityID: 256,
+      name: '三亚市',
+      ProID: 20,
+      CitySort: 256,
+      area: ['其他']
+    }, {
+      CityID: 257,
+      name: '五指山市',
+      ProID: 20,
+      CitySort: 257,
+      area: ['其他']
+    }, {
+      CityID: 258,
+      name: '琼海市',
+      ProID: 20,
+      CitySort: 258,
+      area: ['其他']
+    }, {
+      CityID: 259,
+      name: '儋州市',
+      ProID: 20,
+      CitySort: 259,
+      area: ['其他']
+    }, {
+      CityID: 260,
+      name: '文昌市',
+      ProID: 20,
+      CitySort: 260,
+      area: ['其他']
+    }, {
+      CityID: 261,
+      name: '万宁市',
+      ProID: 20,
+      CitySort: 261,
+      area: ['其他']
+    }, {
+      CityID: 262,
+      name: '东方市',
+      ProID: 20,
+      CitySort: 262,
+      area: ['其他']
+    }, {
+      CityID: 263,
+      name: '澄迈县',
+      ProID: 20,
+      CitySort: 263,
+      area: ['其他']
+    }, {
+      CityID: 264,
+      name: '定安县',
+      ProID: 20,
+      CitySort: 264,
+      area: ['其他']
+    }, {
+      CityID: 265,
+      name: '屯昌县',
+      ProID: 20,
+      CitySort: 265,
+      area: ['其他']
+    }, {
+      CityID: 266,
+      name: '临高县',
+      ProID: 20,
+      CitySort: 266,
+      area: ['其他']
+    }, {
+      CityID: 267,
+      name: '白沙黎族自治县',
+      ProID: 20,
+      CitySort: 267,
+      area: ['其他']
+    }, {
+      CityID: 268,
+      name: '昌江黎族自治县',
+      ProID: 20,
+      CitySort: 268,
+      area: ['其他']
+    }, {
+      CityID: 269,
+      name: '乐东黎族自治县',
+      ProID: 20,
+      CitySort: 269,
+      area: ['其他']
+    }, {
+      CityID: 270,
+      name: '陵水黎族自治县',
+      ProID: 20,
+      CitySort: 270,
+      area: ['其他']
+    }, {
+      CityID: 271,
+      name: '保亭黎族苗族自治县',
+      ProID: 20,
+      CitySort: 271,
+      area: ['其他']
+    }, {
+      CityID: 272,
+      name: '琼中黎族苗族自治县',
+      ProID: 20,
+      CitySort: 272,
+      area: ['其他']
+    }, {
+      CityID: 272,
+      name: '三沙市',
+      ProID: 20,
+      CitySort: 272,
+      area: ['其他']
+    }]
+  }, {
+    ProID: 21,
+    name: '广西壮族自治区',
+    ProSort: 28,
+    ProRemark: '自治区',
+    city: [{
+      CityID: 307,
+      name: '防城港市',
+      ProID: 21,
+      CitySort: 307,
+      area: ['港口区', '防城区', '上思县', '东兴市']
+    }, {
+      CityID: 308,
+      name: '南宁市',
+      ProID: 21,
+      CitySort: 308,
+      area: ['兴宁区', '青秀区', '江南区', '西乡塘区', '良庆区', '邕宁区', '武鸣县', '隆安县', '马山县', '上林县', '宾阳县', '横县']
+    }, {
+      CityID: 309,
+      name: '崇左市',
+      ProID: 21,
+      CitySort: 309,
+      area: ['江洲区', '扶绥县', '宁明县', '龙州县', '大新县', '天等县', '凭祥市']
+    }, {
+      CityID: 310,
+      name: '来宾市',
+      ProID: 21,
+      CitySort: 310,
+      area: ['兴宾区', '忻城县', '象州县', '武宣县', '金秀瑶族自治县', '合山市']
+    }, {
+      CityID: 311,
+      name: '柳州市',
+      ProID: 21,
+      CitySort: 311,
+      area: ['城中区', '鱼峰区', '柳南区', '柳北区', '柳江县', '柳城县', '鹿寨县', '融安县', '融水苗族自治县', '三江侗族自治县']
+    }, {
+      CityID: 312,
+      name: '桂林市',
+      ProID: 21,
+      CitySort: 312,
+      area: ['秀峰区', '叠彩区', '象山区', '七星区', '雁山区', '阳朔县', '临桂县', '灵川县', '全州县', '兴安县', '永福县', '灌阳县', '龙胜各族自治县', '资源县', '平乐县', '荔浦县', '恭城瑶族自治县']
+    }, {
+      CityID: 313,
+      name: '梧州市',
+      ProID: 21,
+      CitySort: 313,
+      area: ['万秀区', '碟山区', '长洲区', '苍梧县', '藤县', '蒙山县', '岑溪市']
+    }, {
+      CityID: 314,
+      name: '贺州市',
+      ProID: 21,
+      CitySort: 314,
+      area: ['八步区', '昭平县', '钟山县', '富川瑶族自治县']
+    }, {
+      CityID: 315,
+      name: '贵港市',
+      ProID: 21,
+      CitySort: 315,
+      area: ['港北区', '港南区', '覃塘区', '平南县', '桂平市']
+    }, {
+      CityID: 316,
+      name: '玉林市',
+      ProID: 21,
+      CitySort: 316,
+      area: ['玉州区', '容县', '陆川县', '博白县', '兴业县', '北流市']
+    }, {
+      CityID: 317,
+      name: '百色市',
+      ProID: 21,
+      CitySort: 317,
+      area: ['右江区', '田阳县', '田东县', '平果县', '德保县', '靖西县', '那坡县', '凌云县', '乐业县', '田林县', '西林县', '隆林各族自治县']
+    }, {
+      CityID: 318,
+      name: '钦州市',
+      ProID: 21,
+      CitySort: 318,
+      area: ['钦南区', '钦北区', '灵山县', '浦北县']
+    }, {
+      CityID: 319,
+      name: '河池市',
+      ProID: 21,
+      CitySort: 319,
+      area: ['金城江区', '南丹县', '天峨县', '凤山县', '东兰县', '罗城仫佬族自治县', '环江毛南族自治县', '巴马瑶族自治县', '都安瑶族自治县', '大化瑶族自治县', '宜州市']
+    }, {
+      CityID: 320,
+      name: '北海市',
+      ProID: 21,
+      CitySort: 320,
+      area: ['海城区', '银海区', '铁山港区', '合浦县']
+    }]
+  }, {
+    ProID: 22,
+    name: '甘肃省',
+    ProSort: 21,
+    ProRemark: '省份',
+    city: [{
+      CityID: 211,
+      name: '兰州市',
+      ProID: 22,
+      CitySort: 211,
+      area: ['城关区', '七里河区', '西固区', '安宁区', '红古区', '永登县', '皋兰县', '榆中县']
+    }, {
+      CityID: 212,
+      name: '金昌市',
+      ProID: 22,
+      CitySort: 212,
+      area: ['金川区', '永昌县']
+    }, {
+      CityID: 213,
+      name: '白银市',
+      ProID: 22,
+      CitySort: 213,
+      area: ['白银区', '平川区', '靖远县', '会宁县', '景泰县']
+    }, {
+      CityID: 214,
+      name: '天水市',
+      ProID: 22,
+      CitySort: 214,
+      area: ['秦州区', '麦积区', '清水县', '秦安县', '甘谷县', '武山县', '张家川回族自治县']
+    }, {
+      CityID: 215,
+      name: '嘉峪关市',
+      ProID: 22,
+      CitySort: 215,
+      area: ['其他']
+    }, {
+      CityID: 216,
+      name: '武威市',
+      ProID: 22,
+      CitySort: 216,
+      area: ['凉州区', '民勤县', '古浪县', '天祝藏族自治县']
+    }, {
+      CityID: 217,
+      name: '张掖市',
+      ProID: 22,
+      CitySort: 217,
+      area: ['甘州区', '肃南裕固族自治县', '民乐县', '临泽县', '高台县', '山丹县']
+    }, {
+      CityID: 218,
+      name: '平凉市',
+      ProID: 22,
+      CitySort: 218,
+      area: ['崆峒区', '泾川县', '灵台县', '崇信县', '华亭县', '庄浪县', '静宁县']
+    }, {
+      CityID: 219,
+      name: '酒泉市',
+      ProID: 22,
+      CitySort: 219,
+      area: ['肃州区', '金塔县', '瓜州县', '肃北蒙古族自治县', '阿克塞哈萨克族自治县', '玉门市', '敦煌市']
+    }, {
+      CityID: 220,
+      name: '庆阳市',
+      ProID: 22,
+      CitySort: 220,
+      area: ['西峰区', '庆城县', '环县', '华池县', '合水县', '正宁县', '宁县', '镇原县']
+    }, {
+      CityID: 221,
+      name: '定西市',
+      ProID: 22,
+      CitySort: 221,
+      area: ['安定区', '通渭县', '陇西县', '渭源县', '临洮县', '漳县', '岷县']
+    }, {
+      CityID: 222,
+      name: '陇南市',
+      ProID: 22,
+      CitySort: 222,
+      area: ['武都区', '成县', '文县', '宕昌县', '康县', '西和县', '礼县', '徽县', '两当县']
+    }, {
+      CityID: 223,
+      name: '临夏回族自治州',
+      ProID: 22,
+      CitySort: 223,
+      area: ['临夏市', '临夏县', '康乐县', '永靖县', '广河县', '和政县', '东乡族自治县', '积石山保安族东乡族撒拉族自治县']
+    }, {
+      CityID: 224,
+      name: '甘南藏族自治州',
+      ProID: 22,
+      CitySort: 224,
+      area: ['合作市', '临潭县', '卓尼县', '舟曲县', '迭部县', '玛曲县', '碌曲县', '夏河县']
+    }]
+  }, {
+    ProID: 23,
+    name: '陕西省',
+    ProSort: 27,
+    ProRemark: '省份',
+    city: [{
+      CityID: 297,
+      name: '西安市',
+      ProID: 23,
+      CitySort: 297,
+      area: ['新城区', '碑林区', '莲湖区', '灞桥区', '未央区', '雁塔区', '阎良区', '临潼区', '长安区', '蓝田县', '周至县', '户县', '高陵县']
+    }, {
+      CityID: 298,
+      name: '咸阳市',
+      ProID: 23,
+      CitySort: 298,
+      area: ['秦都区', '杨陵区', '渭城区', '三原县', '泾阳县', '乾县', '礼泉县', '永寿县', '彬县', '长武县', '旬邑县', '淳化县', '武功县', '兴平市']
+    }, {
+      CityID: 299,
+      name: '延安市',
+      ProID: 23,
+      CitySort: 299,
+      area: ['宝塔区', '延长县', '延川县', '子长县', '安塞县', '志丹县', '吴起县', '甘泉县', '富县', '洛川县', '宜川县', '黄龙县', '黄陵县']
+    }, {
+      CityID: 300,
+      name: '榆林市',
+      ProID: 23,
+      CitySort: 300,
+      area: ['榆阳区', '神木县', '府谷县', '横山县', '靖边县', '定边县', '绥德县', '米脂县', '佳县', '吴堡县', '清涧县', '子洲县']
+    }, {
+      CityID: 301,
+      name: '渭南市',
+      ProID: 23,
+      CitySort: 301,
+      area: ['临渭区', '华县', '潼关县', '大荔县', '合阳县', '澄城县', '蒲城县', '白水县', '富平县', '韩城市', '华阴市']
+    }, {
+      CityID: 302,
+      name: '商洛市',
+      ProID: 23,
+      CitySort: 302,
+      area: ['商州区', '洛南县', '丹凤县', '商南县', '山阳县', '镇安县', '柞水县']
+    }, {
+      CityID: 303,
+      name: '安康市',
+      ProID: 23,
+      CitySort: 303,
+      area: ['汉滨区', '汉阴县', '石泉县', '宁陕县', '紫阳县', '岚皋县', '平利县', '镇坪县', '旬阳县', '白河县']
+    }, {
+      CityID: 304,
+      name: '汉中市',
+      ProID: 23,
+      CitySort: 304,
+      area: ['汉台区', '南郑县', '城固县', '洋县', '西乡县', '勉县', '宁强县', '略阳县', '镇巴县', '留坝县', '佛坪县']
+    }, {
+      CityID: 305,
+      name: '宝鸡市',
+      ProID: 23,
+      CitySort: 305,
+      area: ['渭滨区', '金台区', '陈仓区', '凤翔县', '岐山县', '扶风县', '眉县', '陇县', '千阳县', '麟游县', '凤县', '太白县']
+    }, {
+      CityID: 306,
+      name: '铜川市',
+      ProID: 23,
+      CitySort: 306,
+      area: ['王益区', '印台区', '耀州区', '宜君县']
+    }]
+  }, {
+    ProID: 24,
+    name: '新疆维吾尔自治区',
+    ProSort: 31,
+    ProRemark: '自治区',
+    city: [{
+      CityID: 333,
+      name: '塔城地区',
+      ProID: 24,
+      CitySort: 333,
+      area: ['塔城市', '乌苏市', '额敏县', '沙湾县', '托里县', '裕民县', '和布克赛尔蒙古自治县']
+    }, {
+      CityID: 334,
+      name: '哈密地区',
+      ProID: 24,
+      CitySort: 334,
+      area: ['哈密市', '巴里坤哈萨克自治县', '伊吾县']
+    }, {
+      CityID: 335,
+      name: '和田地区',
+      ProID: 24,
+      CitySort: 335,
+      area: ['和田市', '和田县', '墨玉县', '皮山县', '洛浦县', '策勒县', '于田县', '民丰县']
+    }, {
+      CityID: 336,
+      name: '阿勒泰地区',
+      ProID: 24,
+      CitySort: 336,
+      area: ['阿勒泰市', '布尔津县', '富蕴县', '福海县', '哈巴河县', '青河县', '吉木乃县']
+    }, {
+      CityID: 337,
+      name: '克孜勒苏柯尔克孜自治州',
+      ProID: 24,
+      CitySort: 337,
+      area: ['阿图什市', '阿克陶县', '阿合奇县', '乌恰县']
+    }, {
+      CityID: 338,
+      name: '博尔塔拉蒙古自治州',
+      ProID: 24,
+      CitySort: 338,
+      area: ['博乐市', '精河县', '温泉县']
+    }, {
+      CityID: 339,
+      name: '克拉玛依市',
+      ProID: 24,
+      CitySort: 339,
+      area: ['独山子区', '克拉玛依区', '白碱滩区', '乌尔禾区']
+    }, {
+      CityID: 340,
+      name: '乌鲁木齐市',
+      ProID: 24,
+      CitySort: 340,
+      area: ['天山区', '沙依巴克区', '新市区', '水磨沟区', '头屯河区', '达坂城区', '米东区', '乌鲁木齐县']
+    }, {
+      CityID: 341,
+      name: '石河子市',
+      ProID: 24,
+      CitySort: 341,
+      area: ['其他']
+    }, {
+      CityID: 342,
+      name: '昌吉回族自治州',
+      ProID: 24,
+      CitySort: 342,
+      area: ['昌吉市', '阜康市', '呼图壁县', '玛纳斯县', '奇台县', '吉木萨尔县', '木垒哈萨克自治县']
+    }, {
+      CityID: 343,
+      name: '五家渠市',
+      ProID: 24,
+      CitySort: 343,
+      area: ['其他']
+    }, {
+      CityID: 344,
+      name: '吐鲁番市',
+      ProID: 24,
+      CitySort: 344,
+      area: ['吐鲁番市', '鄯善县', '托克逊县']
+    }, {
+      CityID: 345,
+      name: '巴音郭楞蒙古自治州',
+      ProID: 24,
+      CitySort: 345,
+      area: ['库尔勒市', '轮台县', '尉犁县', '若羌县', '且末县', '焉耆回族自治县', '和静县', '和硕县', '博湖县']
+    }, {
+      CityID: 346,
+      name: '阿克苏地区',
+      ProID: 24,
+      CitySort: 346,
+      area: ['阿克苏市', '温宿县', '库车县', '沙雅县', '新和县', '拜城县', '乌什县', '阿瓦提县', '柯坪县']
+    }, {
+      CityID: 347,
+      name: '阿拉尔市',
+      ProID: 24,
+      CitySort: 347,
+      area: ['其他']
+    }, {
+      CityID: 348,
+      name: '喀什地区',
+      ProID: 24,
+      CitySort: 348,
+      area: ['喀什市', '疏附县', '疏勒县', '英吉沙县', '泽普县', '莎车县', '叶城县', '麦盖提县', '岳普湖县', '伽师县', '巴楚县', '塔什库尔干塔吉克自治县']
+    }, {
+      CityID: 349,
+      name: '图木舒克市',
+      ProID: 24,
+      CitySort: 349,
+      area: ['其他']
+    }, {
+      CityID: 350,
+      name: '伊犁哈萨克自治州',
+      ProID: 24,
+      CitySort: 350,
+      area: ['伊宁市', '奎屯市', '伊宁县', '察布查尔锡伯自治县', '霍城县', '巩留县', '新源县', '昭苏县', '特克斯县', '尼勒克县']
+    }]
+  }, {
+    ProID: 25,
+    name: '青海省',
+    ProSort: 26,
+    ProRemark: '省份',
+    city: [{
+      CityID: 289,
+      name: '海北藏族自治州',
+      ProID: 25,
+      CitySort: 289,
+      area: ['门源回族自治县', '祁连县', '海晏县', '刚察县']
+    }, {
+      CityID: 290,
+      name: '西宁市',
+      ProID: 25,
+      CitySort: 290,
+      area: ['城东区', '城中区', '城西区', '城北区', '大通回族土族自治县', '湟中县', '湟源县']
+    }, {
+      CityID: 291,
+      name: '海东市',
+      ProID: 25,
+      CitySort: 291,
+      area: ['平安县', '民和回族土族自治县', '乐都县', '互助土族自治县', '化隆回族自治县', '循化撒拉族自治县']
+    }, {
+      CityID: 292,
+      name: '黄南藏族自治州',
+      ProID: 25,
+      CitySort: 292,
+      area: ['同仁县', '尖扎县', '泽库县', '河南蒙古族自治县']
+    }, {
+      CityID: 293,
+      name: '海南藏族自治州',
+      ProID: 25,
+      CitySort: 293,
+      area: ['共和县', '同德县', '贵德县', '兴海县', '贵南县']
+    }, {
+      CityID: 294,
+      name: '果洛藏族自治州',
+      ProID: 25,
+      CitySort: 294,
+      area: ['玛沁县', '班玛县', '甘德县', '达日县', '久治县', '玛多县']
+    }, {
+      CityID: 295,
+      name: '玉树藏族自治州',
+      ProID: 25,
+      CitySort: 295,
+      area: ['玉树县', '杂多县', '称多县', '治多县', '囊谦县', '曲麻莱县']
+    }, {
+      CityID: 296,
+      name: '海西蒙古族藏族自治州',
+      ProID: 25,
+      CitySort: 296,
+      area: ['格尔木市', '德令哈市', '乌兰县', '都兰县', '天峻县']
+    }]
+  }, {
+    ProID: 26,
+    name: '宁夏回族自治区',
+    ProSort: 30,
+    ProRemark: '自治区',
+    city: [{
+      CityID: 328,
+      name: '银川市',
+      ProID: 26,
+      CitySort: 328,
+      area: ['兴庆区', '西夏区', '金凤区', '永宁县', '贺兰县', '灵武市']
+    }, {
+      CityID: 329,
+      name: '石嘴山市',
+      ProID: 26,
+      CitySort: 329,
+      area: ['大武口区', '惠农区', '平罗县']
+    }, {
+      CityID: 330,
+      name: '吴忠市',
+      ProID: 26,
+      CitySort: 330,
+      area: ['利通区', '盐池县', '同心县', '青铜峡市']
+    }, {
+      CityID: 331,
+      name: '固原市',
+      ProID: 26,
+      CitySort: 331,
+      area: ['原州区', '西吉县', '隆德县', '泾源县', '彭阳县']
+    }, {
+      CityID: 332,
+      name: '中卫市',
+      ProID: 26,
+      CitySort: 332,
+      area: ['沙坡头区', '中宁县', '海原县']
+    }]
+  }, {
+    ProID: 27,
+    name: '重庆市',
+    ProSort: 4,
+    ProRemark: '直辖市',
+    city: [{
+      CityID: 4,
+      name: '重庆市',
+      ProID: 27,
+      CitySort: 4,
+      area: ['万州区', '涪陵区', '渝中区', '大渡口区', '江北区', '沙坪坝区', '九龙坡区', '南岸区', '北碚区', '万盛区', '双桥区', '渝北区', '巴南区', '黔江区', '长寿区', '江津区', '合川区', '永川区', '南川区', '綦江县', '潼南县', '铜梁县', '大足县', '荣昌县', '璧山县', '梁平县', '城口县', '丰都县', '垫江县', '武隆县', '忠县', '开县', '云阳县', '奉节县', '巫山县', '巫溪县', '石柱土家族自治县', '秀山土家族苗族自治县', '酉阳土家族苗族自治县', '彭水苗族土家族自治县']
+    }]
+  }, {
+    ProID: 28,
+    name: '四川省',
+    ProSort: 22,
+    ProRemark: '省份',
+    city: [{
+      CityID: 225,
+      name: '成都市',
+      ProID: 28,
+      CitySort: 225,
+      area: ['锦江区', '青羊区', '金牛区', '武侯区', '成华区', '龙泉驿区', '青白江区', '新都区', '温江区', '金堂县', '双流县', '郫县', '大邑县', '蒲江县', '新津县', '都江堰市', '彭州市', '邛崃市', '崇州市']
+    }, {
+      CityID: 226,
+      name: '攀枝花市',
+      ProID: 28,
+      CitySort: 226,
+      area: ['东区', '西区', '仁和区', '米易县', '盐边县']
+    }, {
+      CityID: 227,
+      name: '自贡市',
+      ProID: 28,
+      CitySort: 227,
+      area: ['自流井区', '贡井区', '大安区', '沿滩区', '荣县', '富顺县']
+    }, {
+      CityID: 228,
+      name: '绵阳市',
+      ProID: 28,
+      CitySort: 228,
+      area: ['涪城区', '游仙区', '三台县', '盐亭县', '安县', '梓潼县', '北川羌族自治县', '平武县', '江油市']
+    }, {
+      CityID: 229,
+      name: '南充市',
+      ProID: 28,
+      CitySort: 229,
+      area: ['顺庆区', '高坪区', '嘉陵区', '南部县', '营山县', '蓬安县', '仪陇县', '西充县', '阆中市']
+    }, {
+      CityID: 230,
+      name: '达州市',
+      ProID: 28,
+      CitySort: 230,
+      area: ['通川区', '达县', '宣汉县', '开江县', '大竹县', '渠县', '万源市']
+    }, {
+      CityID: 231,
+      name: '遂宁市',
+      ProID: 28,
+      CitySort: 231,
+      area: ['船山区', '安居区', '蓬溪县', '射洪县', '大英县']
+    }, {
+      CityID: 232,
+      name: '广安市',
+      ProID: 28,
+      CitySort: 232,
+      area: ['广安区', '岳池县', '武胜县', '邻水县', '华蓥市']
+    }, {
+      CityID: 233,
+      name: '巴中市',
+      ProID: 28,
+      CitySort: 233,
+      area: ['巴州区', '通江县', '南江县', '平昌县']
+    }, {
+      CityID: 234,
+      name: '泸州市',
+      ProID: 28,
+      CitySort: 234,
+      area: ['江阳区', '纳溪区', '龙马潭区', '泸县', '合江县', '叙永县', '古蔺县']
+    }, {
+      CityID: 235,
+      name: '宜宾市',
+      ProID: 28,
+      CitySort: 235,
+      area: ['翠屏区', '宜宾县', '南溪县', '江安县', '长宁县', '高县', '珙县', '筠连县', '兴文县', '屏山县']
+    }, {
+      CityID: 236,
+      name: '资阳市',
+      ProID: 28,
+      CitySort: 236,
+      area: ['雁江区', '安岳县', '乐至县', '简阳市']
+    }, {
+      CityID: 237,
+      name: '内江市',
+      ProID: 28,
+      CitySort: 237,
+      area: ['市中区', '东兴区', '威远县', '资中县', '隆昌县']
+    }, {
+      CityID: 238,
+      name: '乐山市',
+      ProID: 28,
+      CitySort: 238,
+      area: ['市中区', '沙湾区', '五通桥区', '金口河区', '犍为县', '井研县', '夹江县', '沐川县', '峨边彝族自治县', '马边彝族自治县', '峨眉山市']
+    }, {
+      CityID: 239,
+      name: '眉山市',
+      ProID: 28,
+      CitySort: 239,
+      area: ['东坡区', '仁寿县', '彭山县', '洪雅县', '丹棱县', '青神县']
+    }, {
+      CityID: 240,
+      name: '凉山彝族自治州',
+      ProID: 28,
+      CitySort: 240,
+      area: ['西昌市', '木里藏族自治县', '盐源县', '德昌县', '会理县', '会东县', '宁南县', '普格县', '布拖县', '金阳县', '昭觉县', '喜德县', '冕宁县', '越西县', '甘洛县', '美姑县', '雷波县']
+    }, {
+      CityID: 241,
+      name: '雅安市',
+      ProID: 28,
+      CitySort: 241,
+      area: ['雨城区', '名山县', '荥经县', '汉源县', '石棉县', '天全县', '芦山县', '宝兴县']
+    }, {
+      CityID: 242,
+      name: '甘孜藏族自治州',
+      ProID: 28,
+      CitySort: 242,
+      area: ['康定县', '泸定县', '丹巴县', '九龙县', '雅江县', '道孚县', '炉霍县', '甘孜县', '新龙县', '德格县', '白玉县', '石渠县', '色达县', '理塘县', '巴塘县', '乡城县', '稻城县', '得荣县']
+    }, {
+      CityID: 243,
+      name: '阿坝藏族羌族自治州',
+      ProID: 28,
+      CitySort: 243,
+      area: ['汶川县', '理县', '茂县', '松潘县', '九寨沟县', '金川县', '小金县', '黑水县', '马尔康县', '壤塘县', '阿坝县', '若尔盖县', '红原县']
+    }, {
+      CityID: 244,
+      name: '德阳市',
+      ProID: 28,
+      CitySort: 244,
+      area: ['旌阳区', '中江县', '罗江县', '广汉市', '什邡市', '绵竹市']
+    }, {
+      CityID: 245,
+      name: '广元市',
+      ProID: 28,
+      CitySort: 245,
+      area: ['市中区', '元坝区', '朝天区', '旺苍县', '青川县', '剑阁县', '苍溪县']
+    }]
+  }, {
+    ProID: 29,
+    name: '贵州省',
+    ProSort: 23,
+    ProRemark: '省份',
+    city: [{
+      CityID: 246,
+      name: '贵阳市',
+      ProID: 29,
+      CitySort: 246,
+      area: ['南明区', '云岩区', '花溪区', '乌当区', '白云区', '小河区', '开阳县', '息烽县', '修文县', '清镇市']
+    }, {
+      CityID: 247,
+      name: '遵义市',
+      ProID: 29,
+      CitySort: 247,
+      area: ['红花岗区', '汇川区', '遵义县', '桐梓县', '绥阳县', '正安县', '道真仡佬族苗族自治县', '务川仡佬族苗族自治县', '凤冈县', '湄潭县', '余庆县', '习水县', '赤水市', '仁怀市']
+    }, {
+      CityID: 248,
+      name: '安顺市',
+      ProID: 29,
+      CitySort: 248,
+      area: ['西秀区', '平坝县', '普定县', '镇宁布依族苗族自治县', '关岭布依族苗族自治县', '紫云苗族布依族自治县']
+    }, {
+      CityID: 249,
+      name: '黔南布依族苗族自治州',
+      ProID: 29,
+      CitySort: 249,
+      area: ['都匀市', '福泉市', '荔波县', '贵定县', '瓮安县', '独山县', '平塘县', '罗甸县', '长顺县', '龙里县', '惠水县', '三都水族自治县']
+    }, {
+      CityID: 250,
+      name: '黔东南苗族侗族自治州',
+      ProID: 29,
+      CitySort: 250,
+      area: ['凯里市', '黄平县', '施秉县', '三穗县', '镇远县', '岑巩县', '天柱县', '锦屏县', '剑河县', '台江县', '黎平县', '榕江县', '从江县', '雷山县', '麻江县', '丹寨县']
+    }, {
+      CityID: 251,
+      name: '铜仁市',
+      ProID: 29,
+      CitySort: 251,
+      area: ['铜仁市', '江口县', '玉屏侗族自治县', '石阡县', '思南县', '印江土家族苗族自治县', '德江县', '沿河土家族自治县', '松桃苗族自治县', '万山特区']
+    }, {
+      CityID: 252,
+      name: '毕节市',
+      ProID: 29,
+      CitySort: 252,
+      area: ['毕节市', '大方县', '黔西县', '金沙县', '织金县', '纳雍县', '威宁彝族回族苗族自治县', '赫章县']
+    }, {
+      CityID: 253,
+      name: '六盘水市',
+      ProID: 29,
+      CitySort: 253,
+      area: ['钟山区', '六枝特区', '水城县', '盘县']
+    }, {
+      CityID: 254,
+      name: '黔西南布依族苗族自治州',
+      ProID: 29,
+      CitySort: 254,
+      area: ['兴义市', '兴仁县', '普安县', '晴隆县', '贞丰县', '望谟县', '册亨县', '安龙县']
+    }]
+  }, {
+    ProID: 30,
+    name: '云南省',
+    ProSort: 25,
+    ProRemark: '省份',
+    city: [{
+      CityID: 273,
+      name: '西双版纳傣族自治州',
+      ProID: 30,
+      CitySort: 273,
+      area: ['景洪市', '勐海县', '勐腊县']
+    }, {
+      CityID: 274,
+      name: '德宏傣族景颇族自治州',
+      ProID: 30,
+      CitySort: 274,
+      area: ['瑞丽市', '潞西市', '梁河县', '盈江县', '陇川县']
+    }, {
+      CityID: 275,
+      name: '昭通市',
+      ProID: 30,
+      CitySort: 275,
+      area: ['昭阳区', '鲁甸县', '巧家县', '盐津县', '大关县', '永善县', '绥江县', '镇雄县', '彝良县', '威信县', '水富县']
+    }, {
+      CityID: 276,
+      name: '昆明市',
+      ProID: 30,
+      CitySort: 276,
+      area: ['五华区', '盘龙区', '官渡区', '西山区', '东川区', '呈贡县', '晋宁县', '富民县', '宜良县', '石林彝族自治县', '嵩明县', '禄劝彝族苗族自治县', '寻甸回族彝族自治县', '安宁市']
+    }, {
+      CityID: 277,
+      name: '大理白族自治州',
+      ProID: 30,
+      CitySort: 277,
+      area: ['大理市', '漾濞彝族自治县', '祥云县', '宾川县', '弥渡县', '南涧彝族自治县', '巍山彝族回族自治县', '永平县', '云龙县', '洱源县', '剑川县', '鹤庆县']
+    }, {
+      CityID: 278,
+      name: '红河哈尼族彝族自治州',
+      ProID: 30,
+      CitySort: 278,
+      area: ['个旧市', '开远市', '蒙自县', '屏边苗族自治县', '建水县', '石屏县', '弥勒县', '泸西县', '元阳县', '红河县', '金平苗族瑶族傣族自治县', '绿春县', '河口瑶族自治县']
+    }, {
+      CityID: 279,
+      name: '曲靖市',
+      ProID: 30,
+      CitySort: 279,
+      area: ['麒麟区', '马龙县', '陆良县', '师宗县', '罗平县', '富源县', '会泽县', '沾益县', '宣威市']
+    }, {
+      CityID: 280,
+      name: '保山市',
+      ProID: 30,
+      CitySort: 280,
+      area: ['隆阳区', '施甸县', '腾冲县', '龙陵县', '昌宁县']
+    }, {
+      CityID: 281,
+      name: '文山壮族苗族自治州',
+      ProID: 30,
+      CitySort: 281,
+      area: ['文山县', '砚山县', '西畴县', '麻栗坡县', '马关县', '丘北县', '广南县', '富宁县']
+    }, {
+      CityID: 282,
+      name: '玉溪市',
+      ProID: 30,
+      CitySort: 282,
+      area: ['红塔区', '江川县', '澄江县', '通海县', '华宁县', '易门县', '峨山彝族自治县', '新平彝族傣族自治县', '元江哈尼族彝族傣族自治县']
+    }, {
+      CityID: 283,
+      name: '楚雄彝族自治州',
+      ProID: 30,
+      CitySort: 283,
+      area: ['楚雄市', '双柏县', '牟定县', '南华县', '姚安县', '大姚县', '永仁县', '元谋县', '武定县', '禄丰县']
+    }, {
+      CityID: 284,
+      name: '普洱市',
+      ProID: 30,
+      CitySort: 284,
+      area: ['思茅区', '宁洱哈尼族彝族自治县', '墨江哈尼族自治县', '景东彝族自治县', '景谷傣族彝族自治县', '镇沅彝族哈尼族拉祜族自治县', '江城哈尼族彝族自治县', '孟连傣族拉祜族佤族自治县', '澜沧拉祜族自治县', '西盟佤族自治县']
+    }, {
+      CityID: 285,
+      name: '临沧市',
+      ProID: 30,
+      CitySort: 285,
+      area: ['临翔区', '凤庆县', '云县', '永德县', '镇康县', '双江拉祜族佤族布朗族傣族自治县', '耿马傣族佤族自治县', '沧源佤族自治县']
+    }, {
+      CityID: 286,
+      name: '怒江傈傈族自治州',
+      ProID: 30,
+      CitySort: 286,
+      area: ['泸水县', '福贡县', '贡山独龙族怒族自治县', '兰坪白族普米族自治县']
+    }, {
+      CityID: 287,
+      name: '迪庆藏族自治州',
+      ProID: 30,
+      CitySort: 287,
+      area: ['香格里拉县', '德钦县', '维西傈僳族自治县']
+    }, {
+      CityID: 288,
+      name: '丽江市',
+      ProID: 30,
+      CitySort: 288,
+      area: ['古城区', '玉龙纳西族自治县', '永胜县', '华坪县', '宁蒗彝族自治县']
+    }]
+  }, {
+    ProID: 31,
+    name: '西藏自治区',
+    ProSort: 29,
+    ProRemark: '自治区',
+    city: [{
+      CityID: 321,
+      name: '拉萨市',
+      ProID: 31,
+      CitySort: 321,
+      area: ['城关区', '林周县', '当雄县', '尼木县', '曲水县', '堆龙德庆县', '达孜县', '墨竹工卡县']
+    }, {
+      CityID: 322,
+      name: '日喀则市',
+      ProID: 31,
+      CitySort: 322,
+      area: ['日喀则市', '南木林县', '江孜县', '定日县', '萨迦县', '拉孜县', '昂仁县', '谢通门县', '白朗县', '仁布县', '康马县', '定结县', '仲巴县', '亚东县', '吉隆县', '聂拉木县', '萨嘎县', '岗巴县']
+    }, {
+      CityID: 323,
+      name: '山南市',
+      ProID: 31,
+      CitySort: 323,
+      area: ['乃东县', '扎囊县', '贡嘎县', '桑日县', '琼结县', '曲松县', '措美县', '洛扎县', '加查县', '隆子县', '错那县', '浪卡子县']
+    }, {
+      CityID: 324,
+      name: '林芝市',
+      ProID: 31,
+      CitySort: 324,
+      area: ['林芝县', '工布江达县', '米林县', '墨脱县', '波密县', '察隅县', '朗县']
+    }, {
+      CityID: 325,
+      name: '昌都市',
+      ProID: 31,
+      CitySort: 325,
+      area: ['昌都县', '江达县', '贡觉县', '类乌齐县', '丁青县', '察雅县', '八宿县', '左贡县', '芒康县', '洛隆县', '边坝县']
+    }, {
+      CityID: 326,
+      name: '那曲地区',
+      ProID: 31,
+      CitySort: 326,
+      area: ['那曲县', '嘉黎县', '比如县', '聂荣县', '安多县', '申扎县', '索县', '班戈县', '巴青县', '尼玛县']
+    }, {
+      CityID: 327,
+      name: '阿里地区',
+      ProID: 31,
+      CitySort: 327,
+      area: ['普兰县', '札达县', '噶尔县', '日土县', '革吉县', '改则县', '措勤县']
+    }]
+  }, {
+    ProID: 32,
+    name: '台湾省',
+    ProSort: 7,
+    ProRemark: '省份',
+    city: [{
+      CityID: 327,
+      name: '台湾',
+      ProID: 31,
+      CitySort: 327,
+      area: ['台北市', '高雄市', '台北县', '桃园县', '新竹县', '苗栗县', '台中县', '彰化县', '南投县', '云林县', '嘉义县', '台南县', '高雄县', '屏东县', '宜兰县', '花莲县', '台东县', '澎湖县', '基隆市', '新竹市', '台中市', '嘉义市', '台南市', '其他']
+    }]
+  }, {
+    ProID: 33,
+    name: '澳门特别行政区',
+    ProSort: 33,
+    ProRemark: '特别行政区',
+    city: [{
+      CityID: 370,
+      name: '澳门',
+      ProID: 33,
+      CitySort: 370,
+      area: ['花地玛堂区', '圣安多尼堂区', '大堂区', '望德堂区', '风顺堂区', '嘉模堂区', '圣方济各堂区', '路凼', '其他']
+    }]
+  }, {
+    ProID: 34,
+    name: '香港特别行政区',
+    ProSort: 34,
+    ProRemark: '特别行政区',
+    city: [{
+      CityID: 371,
+      name: '香港',
+      ProID: 34,
+      CitySort: 371,
+      area: ['中西区', '湾仔区', '东区', '南区', '深水埗区', '油尖旺区', '九龙城区', '黄大仙区', '观塘区', '北区', '大埔区', '沙田区', '西贡区', '元朗区', '屯门区', '荃湾区', '葵青区', '离岛区', '其他']
+    }]
+  }, {
+    ProID: 35,
+    name: '钓鱼岛',
+    ProSort: 35,
+    ProRemark: '特别行政区',
+    city: [{
+      CityID: 372,
+      name: '钓鱼岛',
+      ProID: 35,
+      CitySort: 372,
+      area: ['钓鱼岛']
+    }]
+  }, {
+    ProID: 36,
+    name: ' 海外',
+    ProSort: 35,
+    ProRemark: '特别行政区',
+    city: [{
+      CityID: 372,
+      name: '海外',
+      ProID: 35,
+      CitySort: 372,
+      area: ['美国', '加拿大', '澳大利亚', '新西兰', '英国', '法国', '德国', '捷克', '荷兰', '瑞士', '希腊', '挪威', '瑞典', '丹麦', '芬兰', '爱尔兰', '奥地利', '意大利', '乌克兰', '俄罗斯', '西班牙', '韩国', '新加坡', '马来西亚', '印度', '泰国', '日本', '巴西', '阿根廷', '南非', '埃及', '其他']
+    }]
+  }]
+  
+  export default chinaMapJSON
+  

src/assets/js/industry_data.js

@@ -0,0 +1,187 @@
+export const industryData =  ['财政', '传媒', '城管', '采矿业', '出版广电', '档案', '党委办', '电信行业', '法院', 
+    '发改','工信', '公安', '国资委', '公共资源交易',
+    '海关','教育', '军队', '交通', '纪委', '金融业', '建筑业', '检察院', '机关事务',
+    '科技','民政', '民宗','农业', '能源化工', '农林牧渔','批发零售','气象','人行', '人社', '人大',
+    '税务', '水利', '市政', '审计', '商务', '司法', '社会团体', '市场监管', '生态环境',
+    '统计', '统战', '体育','文旅', '卫健委','学校', '宣传', '信息技术',
+    '医疗', '银保监', '运输物流', '应急管理',
+    '组织', '政协', '住建', '证监', '政府办', '制造业', '政务中心', '住宿餐饮', '自然资源'
+]
+
+
+export const industryData1 = {
+    C: ['财政', '传媒', '城管', '采矿业', '出版广电'],
+    D: ['档案', '党委办', '电信行业'],
+    F: ['法院', '发改'],
+    G: ['工信', '公安', '国资委', '公共资源交易'],
+    H: ['海关'],
+    J: ['教育', '军队', '交通', '纪委', '金融业', '建筑业', '检察院', '机关事务'],
+    K: ['科技'],
+    M: ['民政', '民宗'],
+    N: ['农业', '能源化工', '农林牧渔'],
+    P: ['批发零售'],
+    Q: ['气象'],
+    R: ['人行', '人社', '人大'],
+    S: ['税务', '水利', '市政', '审计', '商务', '司法', '社会团体', '市场监管', '生态环境'],
+    T: ['统计', '统战', '体育'],
+    W: ['文旅', '卫健委'],
+    X: ['学校', '宣传', '信息技术'],
+    Y: ['医疗', '银保监', '运输物流', '应急管理'],
+    Z: ['组织', '政协', '住建', '证监', '政府办', '制造业', '政务中心', '住宿餐饮', '自然资源']
+}
+
+export const industryData2 = [
+    {id: 'a3', letter: 'C',
+        list: [
+            {id: 'd1', name: '财政'},
+            {id: 'd2', name: '传媒'},
+            {id: 'd3', name: '城管'},
+            {id: 'd4', name: '采矿业'},
+            {id: 'd5', name: '出版广电'}
+        ]  
+    },
+    {id: 'a4', letter: 'D', 
+        list: [
+            {id: 'e1', name: '档案'},
+            {id: 'e2', name: '党委办'},
+            {id: 'e3', name: '电信行业'}
+        ]
+    },
+    {id: 'a5', letter: 'F', 
+        list: [
+            {id: 'f1', name: '法院'},
+            {id: 'f2', name: '发改'}
+        ]
+    },
+    {id: 'a6', letter: 'G', 
+        list: [
+            {id: 'g1', name: '工信'},
+            {id: 'g2', name: '公安'},
+            {id: 'g3', name: '国资委'},
+            {id: 'g4', name: '公共资源交易'}
+        ]
+    },
+    {id: 'a7', letter: 'H', 
+        list: [
+            {id: 'h1', name: '海关'}
+        ]
+    },
+    {id: 'a8', letter: 'J', 
+        list: [
+            {id: 'j1', name: '教育'},
+            {id: 'j2', name: '军队'},
+            {id: 'j3', name: '交通'},
+            {id: 'j4', name: '纪委'},
+            {id: 'j5', name: '金融业'},
+            {id: 'j6', name: '建筑业'},
+            {id: 'j7', name: '检察院'},
+            {id: 'j8', name: '机关事务'}
+        ]
+    },
+    {id: 'a9', letter: 'K', 
+        list: [
+            {id: 'k1', name: '科技'}
+        ]
+    },
+    {id: 'a10', letter: 'M', 
+        list: [
+            {id: 'm1', name: '民政'},
+            {id: 'm2', name: '民宗'}
+        ]
+    },
+    {id: 'a11', letter: 'N', 
+        list: [
+            {id: 'n1', name: '农业'},
+            {id: 'n2', name: '能源化工'},
+            {id: 'n3', name: '农林牧渔'}
+        ]
+    },
+    {id: 'a12', letter: 'P', 
+        list: [
+            {id: 'p1', name: '批发零售'}
+        ]
+    },
+    {id: 'a13', letter: 'Q', 
+        list: [
+            {id: 'q1', name: '气象'}
+        ]
+    },
+    {id: 'a14', letter: 'R', 
+        list: [
+            {id: 'r1', name: '人行'},
+            {id: 'r2', name: '人社'},
+            {id: 'r3', name: '人大'}
+        ]
+    },
+    {id: 'a15', letter: 'S', 
+        list: [
+            {id: 's1', name: '税务'},
+            {id: 's2', name: '水利'},
+            {id: 's3', name: '市政'},
+            {id: 's4', name: '审计'},
+            {id: 's5', name: '商务'},
+            {id: 's6', name: '司法'},
+            {id: 's7', name: '社会团体'},
+            {id: 's8', name: '市场监管'},
+            {id: 's9', name: '生态环境'},
+        ]
+    },
+    {id: 'a16', letter: 'T', 
+        list: [
+            {id: 't1', name: '统计'},
+            {id: 't2', name: '统战'},
+            {id: 't3', name: '体育'}
+        ]
+    },
+    {id: 'a17', letter: 'W', 
+        list: [
+            {id: 'w1', name: '文旅'},
+            {id: 'w2', name: '卫健委'}
+        ]
+    },
+    {id: 'a18', letter: 'X', 
+        list: [
+            {id: 'x1', name: '学校'},
+            {id: 'x2', name: '宣传'},
+            {id: 'x3', name: '信息技术'}
+        ]
+    },
+    {id: 'a19', letter: 'Y', 
+        list: [
+            {id: 'y1', name: '医疗'},
+            {id: 'y2', name: '银保监'},
+            {id: 'y3', name: '运输物流'},
+            {id: 'y4', name: '应急管理'}
+        ]
+    },
+    {id: 'a20', letter: 'Z', 
+        list: [
+            {id: 'z1', name: '组织'},
+            {id: 'z2', name: '政协'},
+            {id: 'z3', name: '住建'},
+            {id: 'z4', name: '证监'},
+            {id: 'z5', name: '政府办'},
+            {id: 'z6', name: '制造业'},
+            {id: 'z7', name: '政务中心'},
+            {id: 'z8', name: '住宿餐饮'},
+            {id: 'z9', name: '自然资源'},
+        ]
+    },
+]
+
+export const industryData3 = [
+    {title: '拟建项目'},
+    {title: '招标预告'},
+    {title: '招标公告',list: [
+        {name: '招标'},
+        {name: '邀标'},
+        {name: '询价'},
+        {name: '竞谈'},
+        {name: '单一'},
+        {name: '竞价'},
+        {name: '变更'},
+        {name: '其他'}
+    ]},
+    {title: '招标结果'},
+]
+

src/assets/js/time.js

@@ -0,0 +1,52 @@
+//将时间戳转换
+export function ChangeDate (time){
+    // var d = new Date(time.replace(/\-/g, "/"));
+    var d = new Date(time);
+    var Y = d.getFullYear() + '-';
+    var M = (d.getMonth()+1 < 10 ? '0'+(d.getMonth()+1) : d.getMonth()+1) + '-';
+    var D = (d.getDate() < 10 ? '0'+d.getDate() : d.getDate());
+    // var h = (d.getHours() < 10 ? '0'+d.getHours() : d.getHours()) + ':';
+    // var m = (d.getMinutes() < 10 ? '0'+d.getMinutes() : d.getMinutes()) + ':';
+    // var s = (d.getSeconds() < 10 ? '0'+d.getSeconds() : d.getSeconds());
+    return (Y+M+D).replace(/^\s+|\s+$/g,"");
+}
+// 处理时间戳转为几小时前、几天前、几月前、几年前
+export function ChangeDate1 (val){
+    const   s = 1000,
+            m = 60 * s,
+            h = 60 * m,
+            d = 24 * h,
+            mo = 30 * d,
+            y = 365 * d
+
+    const fdate = [
+        {
+            time: y,
+            text: '年'
+        }, {
+            time: mo,
+            text: '月'
+        }, {
+            time: d,
+            text: '天'
+        }, {
+            time: h,
+            text: '小时'
+        }, {
+            time: m,
+            text: "分钟"
+        }, {
+            time: s,
+            text: '秒'
+        }
+    ]
+
+    // 计算出时间差
+    const time = Date.now() - new Date(val) * 1000;
+    for (let i = 0; i < fdate.length; i++) {
+      const t = time / fdate[i].time
+      if (t >= 1) {
+        return Math.floor(t) + fdate[i].text + '前'
+      }
+    }
+}

src/views/bus/busMage.vue

@@ -2,7 +2,7 @@
     <div class="bus_mage">
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="招标信息" name="first">
-                <v-bid :subscriData="subscriData"></v-bid>
+                <v-bid></v-bid>
             </el-tab-pane>
             <el-tab-pane label="数据导出记录" name="second">
                 <v-export></v-export>
@@ -23,23 +23,10 @@ export default {
     data() {
         return {
             activeName: 'first',
-            tip: 0,
-            subscriData: []
+            tip: 0
         }
     },
-    created() {
-        this.sendData();
-    },
     methods: {
-        sendData() {
-            subscribeList({pageNum: 1}).then(res => {
-                this.subscriData = res.data;
-                // res.data.list.forEach(v => {
-                    // console.log(v.publishtime)
-
-                // });
-            })
-        },
         handleClick(tab, event) {
             this.activeName = tab.name
         }

src/views/bus/components/antistop.vue

@@ -9,17 +9,26 @@
                     <el-input v-model="bookForm.words" placeholder="请输入关键词"></el-input>
                     <div class="jia_ci">
                         <div class="l_key">
-                            <el-input v-model="bookForm.additions" placeholder="请输入附加词" class="bot_style"></el-input>
-                            <span>+添加附加词</span>
+                            <el-input 
+                                v-for="ads in bookForm.additions"
+                                v-model="ads.values" 
+                                placeholder="请输入附加词" 
+                                class="bot_style"
+                            ></el-input>
+                            <span @click="wAdd">+添加附加词</span>
                         </div>
                         <div class="l_key r_key">
-                            <el-input v-model="bookForm.eliminates" placeholder="请输入排除词" class="bot_style"></el-input>
-                            <span>+添加排除词</span>
+                            <el-input 
+                                v-for="exts in bookForm.eliminates"
+                                v-model="exts.values" 
+                                placeholder="请输入排除词" 
+                                class="bot_style"
+                            ></el-input>
+                            <span @click="wExclude">+添加排除词</span>
                         </div>
-                        
                     </div>
                     <div class="save_btn">
-                        <el-button type="primary" class="save_key">保存关键词</el-button>
+                        <el-button type="primary" class="save_key" @click="saveKeys">保存关键词</el-button>
                         <p>例：某公司主营业务为软件系统开发</p>
                         <p>关键词：目标信息中的关键性词语，如“软件系统”</p>
                         <p>附加词：与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
@@ -27,7 +36,7 @@
                     </div>
                 </el-form-item>
             </el-form>
-            <div class="key_data" v-for="(item,index) in keyDatas.data" :key="index">
+            <div class="key_data" v-for="(item,index) in keyDatas.data" :key="index" v-if="keyDatas.data[0]">
                 <h2>{{item.s_item}}
                     <img src="@/assets/images/bianji.png" @click="editKey(item.s_item)">
                     <img src="@/assets/images/del.png" @click="delKey(item.s_item)">
@@ -35,8 +44,8 @@
                 <div class="word_card">
                     <div class="lis_card" v-for="(ite,index) in item.a_key" :key="index">
                         <p>关键词：{{String(ite.key)?String(ite.key):'--'}}</p>
-                        <p>附加词：{{String(ite.appendkey)?String(ite.appendkey):'--'}}</p>
-                        <p>排除词：{{String(ite.notkey) ? String(ite.notkey) : '--'}}</p>
+                        <p>附加词：{{String(ite.appendkey)?String(ite.appendkey.join(",").replace(/,/g, "、")):'--'}}</p>
+                        <p>排除词：{{String(ite.notkey) ? String(ite.notkey.join(",").replace(/,/g, "、")) : '--'}}</p>
                         <img src="@/assets/images/del.png" @click="keyDel">
                         <div class="top_edit" @click="toop(item.s_item,String(ite.key),String(ite.appendkey),String(ite.notkey))">编辑<i class="tri-down"></i></div>
                     </div>
@@ -50,7 +59,7 @@
             :show-close="false"
             custom-class="edits-class"
             center>
-            <div class="middle_cont">
+            <div class="middle_cont" :class="{m_active:tips}">
                 <div class="words">
                     <el-form>
                         <el-form-item label="关键词分类：">
@@ -62,9 +71,9 @@
                             <div class="jia_ci">
                                 <div class="l_key">
                                     <el-input 
-                                    v-for="(l_word,index) in editsForm.lWord" 
-                                    v-model="editsForm.lWord[index]" 
-                                    placeholder="请输入附加词"
+                                        v-for="(l_word,index) in editsForm.lWord" 
+                                        v-model="editsForm.lWord[index]" 
+                                        placeholder="请输入附加词"
                                     ></el-input>
                                     <span @click="addKeys">+添加附加词</span>
                                 </div>
@@ -106,8 +115,12 @@ export default {
             bookForm: {
                 keyType: '',
                 words: '',
-                additions: '',
-                eliminates: ''
+                additions: [{
+                    values: ''
+                }],
+                eliminates: [{
+                    values: ''
+                }]
             },
             editVisible: false,
             editsForm: {
@@ -135,44 +148,35 @@ export default {
             this.editsForm.botWord = ite2;
             this.editsForm.lWord = ite3.split(',');
             this.editsForm.rWord = ite4.split(',');
-            console.log(this.keyDatas)
         },
         delKey(name) {
             this.$refs.keysed.visibles = true;
             this.$refs.keysed.care = 1;
             this.$refs.keysed.keyShow = true;
-            this.keyNames = name
+            this.keyNames = name;
         },
         keyDel() {
             alert('111')
         },
+        wAdd() {
+            this.bookForm.additions.push({
+                values: '',
+                key: Date.now()
+            })
+        },
+        wExclude() {
+            this.bookForm.eliminates.push({
+                values: '',
+                key: Date.now()
+            })
+        },
         addKeys() {
             this.editsForm.lWord.push("");
         },
         exclude() {
             this.editsForm.rWord.push("");
         },
-        saveEdit() {
-            this.editVisible = false;
-            let obj = {
-                delete_item: "",
-                update_item:{
-                        before: "",
-                        after: ""
-                },
-                a_items:[
-                    {
-                        s_item: this.editsForm.keyClassify,
-                        a_key:[
-                            {
-                                key: this.editsForm.botWord,
-                                appendkey: this.editsForm.lWord,
-                                notkey: this.editsForm.rWord
-                            }
-                        ]
-                    }
-                ]
-            }
+        updated(obj) {
             updateKeys(obj).then(res => {
                 if (res.data.status == 1) {
                     this.$message({
@@ -180,10 +184,57 @@ export default {
                         type: 'success'
                     });
                     scribeKey().then(res => {
+                        this.bookForm = '';
                         this.$parent.keyDatas = res.data;
                     })
                 }
             })
+        },
+        saveKeys() {
+            const adds = [], excludes = [];
+            this.bookForm.additions.forEach(v => {
+                adds.push(v.values);
+            });
+            this.bookForm.eliminates.forEach(v => {
+                excludes.push(v.values);
+            })
+            this.keyDatas.data.forEach(v => {
+
+            })
+            let arr =  {
+                a_items:[
+                    {
+                        s_item: this.bookForm.keyType,
+                        a_key:[
+                            {
+                                key: new Array(this.bookForm.words),
+                                appendkey: adds,
+                                notkey: excludes
+                            }
+                        ]
+                    }
+                ]
+            }
+            console.log(arr)
+            this.updated(arr)
+        },
+        saveEdit() {
+            this.editVisible = false;
+            this.keyDatas.data.push({ 
+                s_item: this.editsForm.keyClassify,
+                a_key:[
+                    {
+                        key: this.editsForm.botWord,
+                        appendkey: this.editsForm.lWord,
+                        notkey: this.editsForm.rWord
+                    }
+                ]
+            })
+            console.log(this.keyDatas.data)
+            let obj = {
+                a_items:[this.keyDatas.data]
+            }
+            this.updated(obj)
         }
     }
 }
@@ -323,7 +374,7 @@ export default {
     .edits-class {
         .middle_cont {
             width: 740px;
-            min-height: 190px;
+            height: 190px;
             border: 1px solid #ECECEC;
             border-radius: 5px;
             padding: 30px 0;
@@ -354,6 +405,10 @@ export default {
                 }
             }
         }
+        .m_active {
+            height: 300px;
+            overflow-y: scroll;
+        }
         .dialog-footer {
             button {
                 padding: 10px 50px;
@@ -361,5 +416,16 @@ export default {
             }
         }
     }
+    /* 滚动条样式 */
+    ::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 8px;
+    }
+    ::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 3px;
+        background: #ECECEC;
+        opacity: 0.15;
+    }
 }
 </style>

src/views/bus/components/bidMsg.vue

@@ -9,36 +9,44 @@
             </div>
         </h3>
         <div class="filter_lis">
-            <div class="high" @click="screened">高级筛选<i :class="{'el-icon-arrow-up': !flag, 'el-icon-arrow-down': flag}"></i></div>
             <el-button plain class="btn1" @click="exported">导出结果</el-button>
+            <i>请进行筛选查看，若未筛选进行导出，是导出全部结果信息。</i>
             <el-button plain class="btn1 btn2" @click="book">订阅设置</el-button>
         </div>
         <div class="filter_msg">
-            <!-- <div class="money">
-                <label>金额：</label>
-                <div class="right_msg">
-                    <span class="spa">不限</span>
-                    <input type="text" v-model="inpt1" placeholder="万元" style="margin-left: 40px;"/>
-                    <i class="line1">-</i>
-                    <input type="text" v-model="inpt2" placeholder="万元"/>
-                </div>
-            </div> -->
             <div class="money industry">
                 <label>采购单位行业：</label>
                 <div class="right_msg">
-                    <span v-for="item in indus" :key="item.id" class="spa">{{item.name}}</span>
+                    <span class="spa" :class="{spas:qutive}" @click="quanBu('全部')">全部</span>
+                    <span 
+                        v-for="(item,index) in indusData" 
+                        :key="item" 
+                        class="spa" 
+                        :class="{'g_active':caiIndex.indexOf(index)>-1}"
+                        @click="caiIndus(item,index)"
+                    >{{item}}</span>
                 </div>
             </div>
             <div class="money time_msg">
                 <label>时间：</label>
                 <div class="right_msg">
-                    <span v-for="item in timeType" :key="item.id" class="spa">{{item.name}}</span>
+                    <span 
+                        v-for="(item,index) in timeType" 
+                        :key="item.id" 
+                        class="spa" 
+                        :class="{g_active:tims==index}"
+                        @click="timed(index)"
+                    >{{item.name}}</span>
                     <el-date-picker
                         v-model="value1"
                         type="date"
                         placeholder="开始时间"
                         prefix-icon="clearIcons"
                         :clearable="false"
+                        format="yyyy年MM月dd日"
+                        :picker-options="pickerOptions1"
+                        @change="pickerChange1"
+                        value-format="timestamp"
                         align="center"
                         style="margin-left:40px">
                     </el-date-picker>
@@ -49,6 +57,10 @@
                         placeholder="结束时间"
                         prefix-icon="clearIcons"
                         :clearable="false"
+                        format="yyyy年MM月dd日"
+                        :picker-options="pickerOptions2"
+                        @change="pickerChange2"
+                        value-format="timestamp"
                         align="center">
                     </el-date-picker>
                 </div>
@@ -56,13 +68,17 @@
             <div class="money area_msg">
                 <label>区域：</label>
                 <div class="right_msg">
-                    <div class="arr_data">
-                        <span>马鞍山<i class="el-icon-close"></i></span>
-                        <span>马鞍山<i class="el-icon-close"></i></span>
-                        <span>马鞍山<i class="el-icon-close"></i></span>
+                    <div class="arr_data" v-if="arrData">
+                        <span v-for="(item,index) in checkedVal">{{item}}<i class="el-icon-close" @click="delChecked(index)"></i></span>
                     </div>
                     <div class="are_lis">
-
+                        <ul>
+                            <li><span class="a_class">全国</span></li>
+                            <li v-for="(item,index) in proList" :key="item">
+                                <span>{{item}}</span>
+                                <span v-for="(ite,indx) in proMapList[item]" :key="ite" class="a_class" @click="checkArea(ite,indx)">{{ite}}</span>
+                            </li>
+                        </ul>
                     </div>
                 </div>
             </div>
@@ -70,52 +86,47 @@
         <div class="list_data">
             <ul>
                 <li :key="index" v-for="(item, index) in subscriData.list">
-                    <router-link to="/" target="_blank">
+                    <a :href="'/article/content/' + item._id + '.html'" target="_blank">
                         <div class="tit">{{item.title}}</div>
                         <div class="bot">
                             <span class="spa1">{{item.area}}</span>
                             <span class="spa1" style="margin: 0 10px">{{item.buyerclass}}</span>
                             <span class="spa1 spa2" :class="{lActive:item.type == '招标'}" v-if="item.type">{{item.type}}</span>
-                            <span class="spa3">{{item.publishtime}}小时前</span>
+                            <span class="spa3">{{changtime(item.publishtime)}}</span>
                         </div>
-                    </router-link>
+                    </a>
                 </li>
             </ul>
             <el-pagination
                 background
                 layout="prev, pager, next"
+                @current-change="curChange"
                 :total="subscriData.count"
                 >
             </el-pagination>
         </div>
         <!-- 导出提示弹框 -->
-        <v-warn ref="warned"></v-warn>
+        <v-warn ref="warned" :exportData="exportData"></v-warn>
     </div>
 </template>
 
 <script>
-import { scribeData } from '@/api/api';
+import { subscribeList, scribeData, subscribeExport } from '@/api/api';
+import { ChangeDate, ChangeDate1 } from '@/assets/js/time';
+import { industryData } from'@/assets/js/industry_data';
 import vWarn from './warnBox.vue';
 export default {
-    props: {
-        subscriData: {}
-    },
     components: {
         vWarn
     },
     data() {
         return {
+            subscriData: [],
             tips: false,
             change: '0',
-            flag: true,
             inpt1: '',
             inpt2: '',
-            indus: [
-                {id: 1, name: '全部'},
-                {id: 2, name: '安监'},
-                {id: 3, name: '保监'},
-                {id: 4, name: '里监'}
-            ],
+            indusData: [],
             timeType: [
                 {id: 11, name: '不限'},
                 {id: 22, name: '最近7天'},
@@ -123,35 +134,189 @@ export default {
                 {id: 44, name: '去年'}
             ],
             value1: '',
-            value2: ''
+            value2: '',
+            caiIndex: [],
+            qutive: true,
+            indusList: [],
+            tims: 0,
+            pickerOptions1: {
+                disabledDate: (function(time) {
+                    if (this.value2) {
+                        return time.getTime() > this.value2;
+                    }
+                }).bind(this)
+            },
+            pickerOptions2: {
+                disabledDate: (function(time) {
+                    if (this.value1) {
+                        return time.getTime() < this.value1;
+                    }
+                }).bind(this)
+            },
+            provinceData: {
+                // '#': ['全国'],
+                A: ['安徽', '澳门'],
+                B: ['北京'],
+                C: ['重庆'],
+                F: ['福建'],
+                G: ['广东', '广西', '贵州', '甘肃'],
+                H: ['河北', '湖北', '黑龙江', '海南', '河南', '湖南'],
+                J: ['吉林', '江苏', '江西'],
+                L: ['辽宁'],
+                N: ['内蒙古', '宁夏'],
+                Q: ['青海'],
+                S: ['山西', '陕西', '上海', '山东', '四川'],
+                T: ['天津', '台湾'],
+                X: ['西藏', '新疆', '香港'],
+                Y: ['云南'],
+                Z: ['浙江']
+            },
+            proList: [],
+            proMapList: [],
+            checkedVal: [],
+            arrData: false,
+            checkList: [],
+            changtime: Function,
+            exportData: [],
+            proTime: '',
+            pageSize: ''
         }
     },
     created() {
-        scribeData().then(res => {
-            
-        })
+        this.changtime = ChangeDate1;
+        this.indusData = industryData;
+        for (const key in this.provinceData) {
+            this.proList.push(key);
+            this.proMapList[key] =this.provinceData[key].map(v => {
+                return v
+            });
+        }
+        this.sendData();
     },
     methods: {
+        sendData() {
+            subscribeList({
+                buyerclass: this.indusList.length == 0?'': String(this.indusList),
+                time: this.value1 || this.value2?(this.value1 + '_' + this.value2):this.proTime,
+                area: '',
+                pageNum: this.pageSize
+            }).then(res => {
+                this.subscriData = res.data;
+            })
+        },
+        curChange(val) {
+            this.pageSize = val;
+            this.sendData();
+        },
         changed(num) {
             this.change = num;
         },
-        screened () {
-            this.flag = !this.flag
-            if (this.flag) {
-                $('.filter_msg').toggle(200).animate({ height: 352});
-                // $('.filter_msg').toggle(200);
-            } else {
-                $('.filter_msg').toggle(200).animate({ height: 0});
-                // $('.filter_msg').toggle(200);
+        quanBu(val) {
+            this.caiIndex = ["-2"];
+            this.qutive = true;
+            this.indusList = [""];
+        },
+        caiIndus(val, index) {
+            let arrIndex = this.caiIndex.indexOf(index);
+            if(arrIndex>-1){
+                this.caiIndex.splice(arrIndex,1);
+                this.indusList.splice(arrIndex,1);
+            }else{
+                this.caiIndex.push(index);
+                this.indusList.push(val);
+            }
+            if (this.caiIndex.length < this.indusData.length) {
+                this.qutive = false;
+            }
+            if (this.caiIndex.length == this.indusData.length) {
+                this.qutive = true;
+                this.caiIndex = ["-2"];
+            }
+            this.sendData();
+        },
+        // 将ms级时间戳转为m级时间戳
+        getSecondsStamp (stamp) {
+            return stamp.toString().substr(0, 10) - 0
+        },
+        // 时间筛选处理
+        timed(index) {
+            this.tims = index;
+            this.value1 = '';
+            this.value2 = '';
+            if (index == 0) {
+                this.proTime = '';
+            } else if (index == 1) {// 最近7天
+                let sevenTime1 = Date.now() - 7 * 24 * 3600 * 1000;
+                this.proTime = sevenTime1 + '_' + Date.now();
+            } else if (index == 2) {// 最近30天
+                let trityTime = Date.now() - 30 * 24 * 3600 * 1000;
+                this.proTime = trityTime + '_' + Date.now();
+            } else if (index == 3) {// 去年
+                const thisYear = new Date().getFullYear();
+                let startsTime = this.getSecondsStamp(+new Date(`${thisYear - 1}/01/01`));
+                let endsTime = this.getSecondsStamp(+new Date(`${thisYear}/01/01`));
+                this.proTime = startsTime + '_' + endsTime;
+            }
+            this.sendData();
+        },
+        pickerChange1(val) {
+            console.log(this.value2)
+            if (this.value2) {
+                this.sendData();
             }
         },
+        pickerChange2() {
+            this.tims = 5;
+            if (this.value1) {
+                this.sendData();
+            }
+        },
+        checkArea(val,index) {
+            this.arrData = true;
+            this.checkedVal.push(val);
+            console.log(this.checkList)
+
+            // this.sendData();
+        },
+        delChecked(index) {
+            this.checkedVal.splice(index, 1);
+        },
         book() {
             const news = this.$router.resolve({path: '/subscribe'});
             window.open(news.href,'_blank');
         },
         exported() {
-            this.$refs.warned.visibles = true;
-            this.$refs.warned.care = 2;
+            for (var i = 0; i < this.indusList.length; i++) {// 删除数组中的空字符串
+                if (this.indusList[i] == "") {
+                    this.indusList.splice(i,1);
+                }; 
+            }
+            let obj1 = {
+                buyerclass: this.indusList.length == 0?'': String(this.indusList),
+                time: this.value1 || this.value2?(this.value1 + '_' + this.value2):this.proTime,
+                area: '',
+                isFirst: true
+            }
+            let obj2 = {
+                buyerclass: this.indusList.length == 0?'':this.indusList,
+                time: this.value1 || this.value2?(this.value1 + '_' + this.value2):'',
+                area: '',
+                isFirst: false
+            }
+            console.log(obj1)
+            subscribeExport(obj1).then(res => {
+                if (res.isExport) {
+                    subscribeExport(obj2).then(str => {
+                        this.exportData = str;
+                        this.$refs.warned.visibles = true;
+                        this.$refs.warned.care = 1;
+                    })
+                } else {
+                    this.exportData = res;
+                    this.$refs.warned.visibles = true;
+                    this.$refs.warned.care = 2;
+                }
+            })
         }
     }
 }
@@ -224,16 +389,6 @@ export default {
         display: flex;
         align-self: start;
         align-items: center;
-        .high {
-            padding: 13px 0;
-            font-size: 14px;
-            color: #2CB7CA;
-            margin-right: 23px;
-            cursor: pointer;
-            i {
-                margin-left: 6px;
-            }
-        }
         .btn1 {
             padding: 6px 17px;
             font-size: 14px;
@@ -245,27 +400,31 @@ export default {
             right: 20px;
             top: 11px;
         }
+        i {
+            font-size: 12px;
+            color: #999;
+            margin-left: 12px;
+        }
     }
     .filter_msg {
         display: flex;
         flex-direction: column;
-        align-content: center;
-        height: 352px;
-        border: 1px solid #2CB7CA;
+        min-height: 352px;
+        border: 1px solid #e0e0e0;
         box-sizing: border-box;
         border-radius: 5px;
         font-size: 14px;
         label {
             width: 42px;
             color: #686868;
+            flex-shrink:0;
+            line-height: 26px;
         }
         .money {
-            height: 50px;
             display: flex;
             flex-direction: initial;
-            align-items: center;
-            box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
-            padding: 0 20px;
+            align-items: initial;
+            padding: 13px 20px;
             .right_msg {
                 margin-left: 58px;
                 .spa {
@@ -275,10 +434,17 @@ export default {
                     border-radius: 4px;
                     cursor: pointer;
                     &:hover {
-                        border-color: #2CB7CA;
                         color: #2CB7CA;
                     }
                 }
+                .spas {
+                    border-color: #2CB7CA;
+                    color: #2CB7CA;
+                }
+                .g_active {
+                    border-color: #2CB7CA;
+                    color: #2CB7CA;
+                }
                 input {
                     width: 200px;
                     height: 36px;
@@ -291,19 +457,32 @@ export default {
                 }
             }
         }
+        .money:not(:last-child) {
+            box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+        }
+        .time_msg {
+            align-items: center;
+        }
         .industry {
+            display: flex;
+            align-self: start;
             label {
-               width: 98px; 
+                width: 98px;
             }
             .right_msg {
                 margin-left: 2px;
+                text-align: left;
+                span {
+                    margin: 0px 10px 4px 0;
+                }
             }
         }
         .area_msg {
             height: auto;
-            padding: 0 20px 13px 20px;
+            padding: 13px 20px;
             .right_msg {
-                margin-left: 0;
+                display: flex;
+                flex-direction: column;
                 .arr_data {
                     align-items: center;
                     span {
@@ -313,13 +492,31 @@ export default {
                         font-size: 14px;
                         padding: 9px 12px 9px 16px;
                         border-radius: 4px;
-                        margin: 13px 10px 0 0;
+                        margin-right: 10px;
+                        margin-bottom: 10px;
                     }
                     .el-icon-close {
                         margin-left: 14px;
                         cursor: pointer;
                     }
                 }
+                .are_lis {
+                    li {
+                        line-height: 30px;
+                        .a_class {
+                            padding: 5px 8px;
+                            border-radius: 4px;
+                            cursor: pointer;
+                            &:hover {
+                                color: #fff;
+                                background: #2CB7CA;
+                            }
+                        }
+                        span:first-child {
+                            margin: 0 4px;
+                        }
+                    }
+                }
             }
         }
     }

src/views/bus/components/distribute.vue

@@ -7,73 +7,157 @@
                 active-text="开" 
                 inactive-text="关" 
                 inactive-color="#BFBFBF"
+                @change="noSwitch"
                 :width="44">
             </el-switch>
         </div>
-        <el-table 
-        :data="tableData" 
-        empty-text="暂无数据" 
-        cell-class-name="demo-warps" 
-        style="width: 100%;color:#1d1d1d"
-        v-if="!fens && tableData">
-            <el-table-column prop="name" label="分发人员" :width="190"></el-table-column>
-            <el-table-column prop="name" label="分类名称" :width="230"></el-table-column>
-            <el-table-column prop="address" label="区域" :width="230"></el-table-column>
-            <el-table-column prop="address" label="采购单位行业" :width="250"></el-table-column>
-            <el-table-column label="编辑" align="center">
-                <template slot-scope="scope">
-                    <el-button @click="handleExport(scope.row)" type="text" size="small" style="color: #2CB7CA;border:none">编辑</el-button>
-                    <el-button @click="handleDel(scope.row)" type="text" size="small" style="color: #686868;border:none;margin-left:20px">删除</el-button>
-                </template>
-            </el-table-column>
-            <div class="xuan_ze" slot="append">
-                <span style="width:190px">选择分发人员<i class="el-icon-arrow-down"></i></span>
-                <span style="width:230px">选择分类名称<i class="el-icon-arrow-down"></i></span>
-                <span style="width:230px">选择区域<i class="el-icon-arrow-down"></i></span>
-                <span style="width:250px">选择采购单位行业<i class="el-icon-arrow-down"></i></span>
-                <span style="width:120px;text-align:center">
-                    <button type="primary" size="small" class="add_per">添加</button>
-                </span>
-            </div>
-        </el-table>
+        <ul class="fen_list" v-if="!fens && tableData">
+            <li>
+                <div class="biao_tou" style="width:190px">分发人员</div>
+                <div class="biao_tou" style="width:230px">分类名称</div>
+                <div class="biao_tou" style="width:230px">区域</div>
+                <div class="biao_tou" style="width:250px">采购单位行业</div>
+                <div class="biao_tou" style="width:120px;text-align:center">操作</div>
+            </li>
+            <li v-for="(item,index) in tableData" :class="{c_active:chose==index}">
+                <div class="cai_gou" style="width:190px">
+                    <div style="width:170px">
+                        <span @click="cellClick(5,item.persons)" v-if="chose==index">{{item.persons}}</span>
+                        <span v-else>{{item.persons}}</span>
+                        <i :class="chose==index?'el-icon-arrow-down':''"></i>
+                    </div>
+                </div>
+                <div class="cai_gou" style="width:230px">
+                    <div style="width:210px">
+                        <span @click="cellClick(6,item.items)" v-if="chose==index">{{item.items}}</span>
+                        <span v-else>{{item.items}}</span>
+                        <i :class="chose==index?'el-icon-arrow-down':''"></i>
+                    </div>
+                </div>
+                <div class="cai_gou" style="width:230px">
+                    <div style="width:210px">
+                        <span @click="cellClick(1,item.area)" v-if="chose==index">{{item.area}}</span>
+                        <span v-else>{{item.area}}</span>
+                        <i :class="chose==index?'el-icon-arrow-down':''"></i>
+                    </div>
+                </div>
+                <div class="cai_gou" style="width:250px">
+                    <div style="width:250px">
+                        <span @click="cellClick(2,index,item.buyerclass)" v-if="chose==index">{{item.buyerclass}}</span>
+                        <span v-else>{{item.buyerclass}}</span>
+                        <i :class="chose==index?'el-icon-arrow-down':''"></i>
+                    </div>
+                </div>
+                <div class="cai_gou btns">
+                    <div v-if="chose!=index">
+                        <el-button @click="handleExport(index)" type="text" size="small" style="color: #2CB7CA;border:none">编辑</el-button>
+                        <el-button @click="handleDel()" type="text" size="small" style="color: #686868;border:none;margin-left:20px">删除</el-button>
+                    </div>
+                    <button type="primary" size="small" class="add_per" @click="saveFen" v-else>保存</button>
+                </div>
+            </li>
+            <li v-if="newFen">
+                <div class="xuan_ze">
+                    <span @click="cellClick(5)" style="width:190px">选择分发人员<i class="el-icon-arrow-down"></i></span>
+                    <span @click="cellClick(6)" style="width:230px">选择分类名称<i class="el-icon-arrow-down"></i></span>
+                    <span @click="cellClick(1)" style="width:230px">选择区域<i class="el-icon-arrow-down"></i></span>
+                    <span @click="cellClick(2)" style="width:250px">选择采购单位行业<i class="el-icon-arrow-down"></i></span>
+                    <span style="width:120px;text-align:center">
+                        <button type="primary" size="small" class="add_per" @click="addFen">添加</button>
+                    </span>
+                </div>
+            </li>
+        </ul>
         <div class="add_foot" v-if="!fens">
-            <span>+新增分发规则</span>
+            <span @click="newRules">+新增分发规则</span>
         </div>
+        <!-- 选择分发人员弹框 -->
+        <v-fenbox ref="fenModel"></v-fenbox>
+        <!-- 选择区域、采购单位行业、信息类型弹框 -->
+        <v-edit ref="editModel" :digs="digs" :boxData="boxData"></v-edit>
     </div>
 </template>
 
 <script>
+import vFenbox from './fenBox.vue';
+import vEdit from './editBox.vue';
+import { nodiff, nodiffList } from '@/api/api';
 export default {
+    props: {
+        viewDatas: {}
+    },
+    components: {
+        vFenbox,
+        vEdit
+    },
     data() {
         return {
             fens: false,
-            tableData: [{
-                date: '2020/05/02 11:16:12',
-                name: '李虎',
-                address: '上海市普陀区上海市普陀区上海市普陀区',
-                num1: '123',
-                num2: '56'
-            }, {
-                date: '2020/05/02 11:16:12',
-                name: '王小虎',
-                address: '上海市普陀区',
-                num1: '123',
-                num2: '56'
-            }, {
-                date: '2020/05/02 11:16:12',
-                name: '王小虎',
-                address: '上海市普陀区',
-                num1: '123',
-                num2: '56'
-            }]
+            tableData: [],
+            tableData1: [],
+            newFen: false,
+            chose: -1,
+            elBtn: false,
+            digs: 1,
+            boxData: []
         }
     },
+    created() {
+        this.fens = this.viewDatas.nodiff == 1 ? true : false;
+        nodiffList().then(res => {
+            this.tableData1 = res.data.rules;
+            res.data.rules.forEach((el,i) => {
+                let arr = [];
+                for (let ares in el.area) {
+                    arr.push(ares)
+                }
+                this.tableData.push({
+                    area: String(arr.join(",").replace(/,/g, "、")),
+                    buyerclass: String(el.buyerclass.join(",").replace(/,/g, "、")),
+                    persons: String(el.persons),
+                    items: String(el.items)
+                })
+            });
+        })
+    },
     methods: {
-        handleExport(data) {
-            
+        noSwitch() {
+            nodiff({
+                nodiff: this.fens ? 1 : 0
+            }).then(res => {
+                if (res.data.status == 1) {
+                    this.$message({
+                        message: this.fens ? '打开成功' : '关闭成功',
+                        type: 'success'
+                    });
+                }
+            })
+        },
+        handleExport(row) {
+            this.chose = row;
+            this.elBtn = true;
         },
         handleDel(data) {
 
+        },
+        cellClick(indx, index, arr) {
+            this.digs = indx;
+            this.boxData = this.tableData1[index]?this.tableData1[index].buyerclass:[];
+            // console.log(this.boxData)
+            if (indx == 5) {
+                this.$refs.fenModel.centerDialogVisible = true;
+            } else {
+                this.$refs.editModel.boxVisible = true;
+            }
+        },
+        newRules() {
+            this.newFen = true;
+        },
+        saveFen() {
+            this.chose = -1;
+        },
+        addFen() {
+            this.newFen = false;
         }
     }
 }
@@ -84,11 +168,66 @@ export default {
     .jie_switch {
         margin: 29px 0;
     }
+    .fen_list {
+        display: flex;
+        flex-direction: column;
+        li {
+            height: 40px;
+            line-height: 24px;
+            display: flex;
+            flex-direction: initial;
+            align-items: center;
+            text-align: left;
+            font-size: 14px;
+            border-bottom: 1px solid #eee;
+            .biao_tou {
+                font-weight: bold;
+            }
+            .cai_gou {
+                display: flex;
+                flex-direction: initial;
+                div {
+                    display: flex;
+                    align-items: center;
+                    span {
+                        min-width: 16px;
+                        max-width: 230px;
+                        margin-right: 10px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                    }
+                }
+            }
+            .btns {
+                width: 120px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                .add_per {
+                    padding: 8px 12px;
+                    background: #2CB7CA;
+                    border-radius: 4px;
+                    font-size: 13px;
+                    color: #fff;
+                }
+            }
+        }
+        .c_active {
+            color: #2CB7CA;
+            .cai_gou {
+                span {
+                    cursor: pointer;
+                }
+            }
+        }
+    }
     .xuan_ze {
-        height: 41px;
-        line-height: 40px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        line-height: 24px;
         color: #999;
-        text-align: justify;
         span {
             display: inline-block;
             cursor: pointer;

src/views/bus/components/editBox.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="edit_box key_box">
         <el-dialog
-            :title="digs == 1?'请选择区域':digs == 2?'请选择采购单位行业':'请选择信息类型'"
+            :title="digs == 1?'选择区域':digs == 2?'选择采购单位行业':digs == 6?'选择分类名称':'选择信息类型'"
             :visible.sync="boxVisible"
             :show-close="false"
             custom-class="edits-class"
@@ -26,20 +26,30 @@
                         <!-- 区域 -->
                         <div class="lists" v-if="digs == 1">
                             <ul>
-                                <li v-for="item in groupData1" :key="item.id" class="li_data li_area">
-                                    <h3>{{item.letter}}</h3>
-                                    <el-collapse v-model="activeNames">
-                                        <el-collapse-item name="1">
+                                <li v-for="(item,index) in groupData1" :key="item" class="li_data li_area">
+                                    <h3>{{item}}</h3>
+                                    <el-menu default-active="1-1" class="el-menu-vertical-demo">
+                                        <el-submenu v-for="(ite,indx) in proMapList[item]" :key="ite" :index="index-(indx+1)">
+                                            <template slot="title">
+                                                <!-- <div class="quan"> -->
+                                                    <i class="el-icon-circle-check"></i>
+                                                <!-- </div> -->
+                                                <span slot="title">{{ite}}</span>
+                                            </template>
+                                        </el-submenu>
+                                    </el-menu>
+                                    <!-- <el-collapse v-model="activeNames">
+                                        <el-collapse-item v-for="(ite,indx) in proMapList[item]" :key="ite" :name="index+indx">
                                             <template slot="title">
                                                 <div class="quan">
                                                     <i class="el-icon-check"></i>
-                                                </div>安徽
+                                                </div>{{ite}}
                                             </template>
                                             <el-checkbox-group v-model="checkboxGroup1">
-                                                <el-checkbox-button v-for="ite in item.list" :key="ite.id" :label="ite.id">{{ite.name}}</el-checkbox-button>
+                                                <el-checkbox-button></el-checkbox-button>
                                             </el-checkbox-group>
                                         </el-collapse-item>
-                                    </el-collapse>
+                                    </el-collapse> -->
                                 </li>
                             </ul>
                         </div>
@@ -48,18 +58,32 @@
                             <ul>
                                 <li v-for="item in groupData2" :key="item.id" class="li_data">
                                     <h3>{{item.letter}}</h3>
-                                    <el-checkbox-group v-model="checkboxGroup2">
-                                        <el-checkbox-button v-for="ite in item.list" :key="ite.id" :label="ite.id">{{ite.name}}</el-checkbox-button>
+                                    <el-checkbox-group v-model="boxData">
+                                        <el-checkbox-button v-for="ite in item.list" :key="ite.id" :label="ite.name">{{ite.name}}</el-checkbox-button>
                                     </el-checkbox-group>
                                 </li>
                             </ul>
                         </div>
                         <!-- 信息类型 -->
-                        <div class="lists" v-if="digs == 3">
+                        <div class="lists msg_type" v-if="digs == 3">
                             <ul>
-                                <li v-for="item in groupData3" :key="item.id" class="li_data">
-                                    <h3>{{item.letter}}</h3>
+                                <li v-for="item in groupData3" :key="item.title" class="li_data">
+                                    <el-checkbox-group v-model="checkboxGroup3">
+                                        <el-checkbox-button class="titles" :label="item.title">{{item.title}}</el-checkbox-button>
+                                    </el-checkbox-group>
                                     <el-checkbox-group v-model="checkboxGroup3">
+                                        <el-checkbox-button v-for="ite in item.list" :key="ite.name" :label="ite.name">{{ite.name}}</el-checkbox-button>
+                                    </el-checkbox-group>
+                                </li>
+                            </ul>
+                        </div>
+                        <!-- 分类名称 -->
+                        <div class="lists" v-if="digs == 6">
+                            <ul>
+                                <li v-for="item in groupData4" :key="item.id" class="li_data">
+                                    <h3>{{item.letter}}</h3>
+                                    <el-checkbox-group v-model="checkboxGroup4">
+                                        <el-checkbox-button :label="ite.id">{{ite.name}}</el-checkbox-button>
                                         <el-checkbox-button v-for="ite in item.list" :key="ite.id" :label="ite.id">{{ite.name}}</el-checkbox-button>
                                     </el-checkbox-group>
                                 </li>
@@ -77,6 +101,7 @@
 </template>
 
 <script>
+import { industryData2, industryData3 } from'@/assets/js/industry_data';
 export default {
     props: {
         digs: Number,
@@ -92,52 +117,46 @@ export default {
             keyShow: false,
             input1: '',
             checkboxGroup1: ['c21'],
-            checkboxGroup2: ['d5'],
-            checkboxGroup3: ['b1'],
+            checkboxGroup2: [''],
+            checkboxGroup3: ['招标'],
+            checkboxGroup4: ['b1'],
             activeNames: ['1'],
             groupData1: [],
-            groupData2: [
-                {id: 'a1', letter: 'A', list: [
-                    {id: 'b1', name: '安监1'},
-                    {id: 'b2', name: '保监'},
-                    {id: 'b3', name: '安监'}
-                ]},
-                {id: 'a2', letter: 'B', list: [
-                    {id: 'c21', name: '保监'},
-                    {id: 'c3', name: '安监'}
-                ]},
-                {id: 'a3', letter: 'C', list: [
-                    {id: 'd1', name: '财政'},
-                    {id: 'd2', name: '保监'},
-                    {id: 'd3', name: '出版广电'},
-                    {id: 'd4', name: '出版广电'},
-                    {id: 'd5', name: '出版广电'},
-                    {id: 'd6', name: '出版广电'},
-                    {id: 'd7', name: '出版广电'},
-                    {id: 'd8', name: '出版广电'}
-                ]},
-                {id: 'a4', letter: 'D', list: [
-                    {id: 'e1', name: '安监'},
-                    {id: 'e2', name: '保监'},
-                    {id: 'e3', name: '安监'}
-                ]},
-                {id: 'a5', letter: 'E', list: [
-                    {id: 'f1', name: '安监'},
-                    {id: 'f2', name: '保监'},
-                    {id: 'f3', name: '安监'}
-                ]},
-                {id: 'a6', letter: 'F', list: [
-                    {id: 'g1', name: '安监'},
-                    {id: 'g2', name: '保监'},
-                    {id: 'g3', name: '安监'}
-                ]},
-            ],
-            groupData3: []
-            
+            groupData2: [],
+            groupData3: [],
+            groupData4: [],
+            provinceData: {
+                // '#': ['全国'],
+                A: ['安徽', '澳门'],
+                B: ['北京'],
+                C: ['重庆'],
+                F: ['福建'],
+                G: ['广东', '广西', '贵州', '甘肃'],
+                H: ['河北', '湖北', '黑龙江', '海南', '河南', '湖南'],
+                J: ['吉林', '江苏', '江西'],
+                L: ['辽宁'],
+                N: ['内蒙古', '宁夏'],
+                Q: ['青海'],
+                S: ['山西', '陕西', '上海', '山东', '四川'],
+                T: ['天津', '台湾'],
+                X: ['西藏', '新疆', '香港'],
+                Y: ['云南'],
+                Z: ['浙江']
+            },
+            proMapList: []
         }
     },
     created() {
-        
+        this.groupData2 = industryData2;
+        this.groupData3 = industryData3;
+        this.checkboxGroup2 = this.boxData;
+        console.log(this.boxData);
+        for (const key in this.provinceData) {
+            this.groupData1.push(key);
+            this.proMapList[key] =this.provinceData[key].map(v => {
+                return v
+            });
+        }
     },
     methods: {
         confirmed() {
@@ -151,7 +170,7 @@ export default {
 .edit_box {
     .edits-class {
         .middle_cont {
-            width: 400px;
+            min-width: 400px;
             height: 400px;
             border: 1px solid #ECECEC;
             border-radius: 5px;
@@ -178,7 +197,7 @@ export default {
                             flex-direction: column;
                             text-align: left;
                             width: 100%;
-                            min-height: 70px;
+                            min-height: 40px;
                             margin-top: 10px;
                             box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
                             h3 {
@@ -196,6 +215,8 @@ export default {
                         .li_area {
                             box-shadow: none!important;
                             .quan {
+                                display: flex;
+                                flex-direction: initial;
                                 width: 17px;
                                 height: 17px;
                                 border: 1px solid #E0E0E0;

src/views/bus/components/fenBox.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="fen_box edit_box">
+      <el-dialog
+          title="选择分发人员"
+          :show-close="false"
+          :visible.sync="centerDialogVisible"
+          width="890px"
+          center>
+          <div class="content">
+              <div class="content_left">
+                  <h4>选择</h4>
+                  <el-input class="sear" v-model="searchVal" placeholder="搜索" prefix-icon="el-icon-search"></el-input>
+                  <div class="allList">
+                    <div v-for="item in personList.list" :key="item.id">
+                      <h5><el-checkbox v-model="item.status"></el-checkbox> <span class="noselect"  @click="toggle(item)">{{ item.name }}</span> <i class="el-icon-arrow-down"></i></h5>
+                      <div class="itemList" :class="{toggle:!item.toggle}" >
+                         <div v-for="val in item.users" :key="val.user_id" @click="chooseUser(val)">
+                            <span class="userName">{{ val.username }}</span> <span> {{ val.phone }}</span> 
+                         </div>
+                      </div>
+                    </div>
+                  </div>
+              </div>
+              <div class="content_right">
+                  <h4>已选</h4>
+                  <ul>
+                    <li v-for="(item,i) in selectedList" :key="item.id">
+                      <span class="userName">{{ item.username }}</span><span>{{ item.phone }}</span><i class="el-icon-error" @click="delChooseUser(i)"></i>
+                    </li>
+                  </ul>
+              </div>
+          </div>
+          <p>已选择{{ personList.checked }}人共购买{{ personList.quota }}人</p>
+          <span slot="footer" class="dialog-footer btns">
+              <button @click="saveDepart" class="save">保存</button>
+              <button  @click="centerDialogVisible = false" class="cancle">取消</button>
+          </span>
+        </el-dialog>
+  </div>
+</template>
+
+
+<script>
+import { user_sjPersonListInter } from "@/api/api";
+export default {
+   data(){
+     return{
+       centerDialogVisible:false,
+       searchVal:'',
+       personList:{},
+       selectedList:[],
+       checked:false
+     }
+   },
+   created(){
+      this.getData();
+   },
+   methods:{
+     getData(){
+        user_sjPersonListInter({name:this.searchVal}).then(res =>{
+          // console.log(res.data);
+          res.data.list.forEach(v =>{
+            v.toggle = true;
+            v.status = false;
+          })
+          this.personList = res.data;
+          this.selectedList = res.data.checkedList;
+        })
+     },
+     //选择人员
+     chooseUser(val){
+        this.selectedList.push(val)
+     },
+     //删除人员
+     delChooseUser(i){
+        this.selectedList.splice(i,1);
+     },
+     saveDepart(){},
+     toggle(val){
+       val.toggle = !val.toggle;
+
+     }
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+  .fen_box{
+      .el-dialog__header{
+          font-size: 26px;
+          color: $weight_color;
+      }
+      .content{
+          display: flex;
+          justify-content: space-between;
+          .content_left,.content_right{
+              width: 400px;
+              height: 400px;
+              border-radius: 6px;
+              margin: 0 5px;
+              display: flex;
+              flex-direction: column;
+              border: 1px solid #ECECEC;
+          }
+          .content_left{
+            h4{
+              padding: 14px 20px ;
+              font-size: 14px;
+              color: $weight_color;
+            }
+            .sear {
+                width: 360px;
+                height: 40px;
+                margin: 0 20px 0 20px!important;
+            }
+            .allList{
+              flex: 1;
+              overflow: auto;
+              >div{
+                h5,.itemList>div{
+                   padding: 0 20px;
+                   line-height: 40px;
+                   box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+                }
+                h5{
+                  margin-top: 10px;
+                  color: $weight_color;
+                  display: flex;
+                  >span{
+                    flex: 1;
+                    margin-left: 10px;
+                    cursor: pointer;
+                  }
+                  align-items: center;
+                  .el-checkbox__inner,.el-checkbox__input.is-checked .el-checkbox__inner{
+                    width: 20px;
+                    height: 20px;
+                    border-radius: 50%;
+                    font-size: 30px;
+                  }
+                  .el-checkbox__input.is-checked .el-checkbox__inner::after {
+                      transform: rotate(45deg) scaleY(1.4) translate(5px, 0px);
+                  }
+                  .el-checkbox__input.is-checked + .el-checkbox__label{
+                    color: $weight_color;
+                  }
+                  i{
+                    font-size: 16px;
+                     color: #aaa;
+                  }
+                }
+                .itemList{
+                  transition: all  0.5s ;
+                  opacity: 1;
+                  max-height:400px;
+                  >div{
+                    cursor: pointer;
+                    color: $normal_color;
+                    display: flex;
+                    align-items: center;
+                    span{
+                      padding-right: 20px;
+                    }
+                    .userName{
+                      margin-right: auto;
+                    }
+                    &.active{
+                      background: #F5F5FB;
+                    }
+                  }
+                &.toggle{
+                  max-height: 0px!important;
+                  opacity: 0;
+                  overflow: hidden;
+                }
+                }
+              }
+              
+            }
+          }
+          .content_right{ 
+            h4{
+              padding: 14px 15px;
+              font-size: 14px;
+              color: $weight_color;
+            }
+            ul{
+              flex: 1;
+              overflow: auto;
+              li{
+                float: none;
+                padding: 0 20px;
+                box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+                line-height: 40px;
+                color: $normal_color;
+                display: flex;
+                align-items: center;
+                span{
+                  padding-right: 20px;
+                }
+                .userName{
+                  margin-right: auto;
+                }
+                i{
+                  cursor: pointer;
+                  font-size: 24px;
+                  color: #AAAAAA;
+                }
+              }
+            }
+          }
+      }
+      p{
+        color: $light_color;
+        line-height: 24px;
+        padding: 20px 0 0;
+        text-align: center;
+      }
+      button{
+          width: 132px;
+          height: 36px;
+          background: transparent;
+          border-radius: 6px;
+          margin: 0 20px;
+          font-size: 16px;
+          &:active{
+              opacity: 0.8;
+          }
+      }
+      .save{
+          border: 1px solid $light_color;
+          color: $light_color;
+      }
+      .cancle{
+          border: 1px solid #e0e0e0;
+          color: $normal_color;
+      }
+  }
+
+</style>

src/views/bus/components/subMage.vue

@@ -80,12 +80,12 @@
                     </el-form-item>
                     <el-form-item label="关键词匹配方式：" class="tui_checkbox">
                         <div class="wai_quan">
-                            <el-radio v-model="bookForm.pipeiRadio" label="1">
+                            <el-radio v-model="bookForm.pipeiRadio" @change="piType(1)" label="1">
                                 <p>按标题匹配</p>
                             </el-radio>
                         </div>
                         <div class="wai_quan wen_quan">
-                            <el-radio v-model="bookForm.pipeiRadio" label="2">
+                            <el-radio v-model="bookForm.pipeiRadio" @change="piType(2)" label="2">
                                 <p>按全文匹配</p>
                                 <p>会产生无效信息，请根据需要选择</p>
                             </el-radio>
@@ -110,17 +110,17 @@
             <!-- 分发设置 -->
             <h2 style="margin-top:28px">分发设置</h2>
             <el-divider></el-divider>
-            <v-distri></v-distri>
+            <v-distri :viewDatas="viewDatas"></v-distri>
         </div>
         <!-- 开启邮箱提醒 -->
-        <v-warn ref="emailed"></v-warn>
+        <v-warn ref="emailed" :exportData="exportData"></v-warn>
         <!-- 选择区域、采购单位行业、信息类型弹框 -->
         <v-edit ref="editModel" :digs="digs" :boxCheck="boxCheck"></v-edit>
     </div>
 </template>
 
 <script>
-import { scribeData, subdis, areaGetdata, pushset, scribeKey } from '@/api/api';
+import { scribeData, subdis, areaGetdata, pushset, scribeKey, updatePush, projectUpdate } from '@/api/api';
 import vKey from './antistop.vue';
 import vDistri from './distribute.vue';
 import vWarn from './warnBox.vue';
@@ -157,7 +157,11 @@ export default {
             ],
             emailVis: false,
             digs: 1,
-            keyDatas: []
+            keyDatas: [],
+            exportData: [],
+            ratemodes: 0,
+            emails: 2,
+            matchs: 0
         }
     },
     created() {
@@ -184,7 +188,7 @@ export default {
         booked(num) {
             // this.apper = num;
         },
-        dispensed() {
+        dispensed() {// 订阅与分发
             subdis({
                 subdis: this.bookForm.dispense ? 1 : 0
             }).then(res => {
@@ -194,28 +198,79 @@ export default {
                         type: 'success'
                     });
                 }
-                
             })
         },
-        decMsg(nums) {
+        sendUpdate() {// 推送设置函数
+            let obj = {
+                ratemode: this.ratemodes,
+                apppush: this.bookForm.tuiCheck1 ? 1 : 0,
+                mailpush: this.emails,
+                matchway: this.matchs
+            }
+            console.log(obj)
+            updatePush(obj).then(res => {
+                if (res.data.status == 1) {
+                    this.$message({
+                        message: '设置成功',
+                        type: 'success'
+                    });
+                }
+            })
+        },
+        decMsg(nums) {// 弹框
             this.$refs.editModel.boxVisible = true;
             this.digs = nums;
         },
-        tuiChecked(val) {
-            console.log(val)
+        tuiChecked(val) {// 推送时间
+            this.ratemodes = val;
+            this.sendUpdate();
+        },
+        appChanged() {// app
+            console.log(this.bookForm.tuiCheck1)
+            if (!this.bookForm.tuiCheck1 && !this.bookForm.tuiCheck2) {
+                this.$message({
+                    message: '请保留一种推送方式，剑鱼标讯还要推送信息给您！',
+                    type: 'success'
+                });
+                this.bookForm.tuiCheck1 = true;
+                return;
+            }
+            this.sendUpdate();
         },
-        emailChanged() {
+        emailChanged() {// 邮件
+            if (!this.bookForm.tuiCheck1 && !this.bookForm.tuiCheck2) {
+                this.$message({
+                    message: '请保留一种推送方式，剑鱼标讯还要推送信息给您！',
+                    type: 'success'
+                });
+                this.bookForm.tuiCheck2 = true;
+                return;
+            }
             if (this.bookForm.tuiCheck2) {
                 this.$refs.emailed.visibles = true;
                 this.$refs.emailed.care = 2;
                 this.$refs.emailed.mails = true;
+            } else {
+                this.emails = 0;
+                this.sendUpdate();
             }
         },
-        appChanged() {
-
+        piType(num) {
+            this.matchs = num;
+            this.sendUpdate();
         },
         proChanged() {
-
+            console.log(this.bookForm.proPei)
+            projectUpdate({
+                projectmatch: this.bookForm.proPei ? 1 : 0
+            }).then(res => {
+                if (res.data.status == 1) {
+                    this.$message({
+                        message: '设置成功',
+                        type: 'success'
+                    });
+                }
+            })
         }
     }
 }

src/views/bus/components/warnBox.vue

@@ -5,30 +5,31 @@
             :visible.sync="visibles"
             :lock-scroll="false"
             :show-close="false"
-            center>
+            center
+            v-if="exportData">
             <div class="conts" v-if="care == 1">
                 <div v-if="!keyShow">
-                    <p>已选择数据 900 条</p>
-                    <p>其中，重复导出数据 <i style="color:#2CB7CA">600</i> 条（不再扣除）</p>
-                    <p>本次导出扣除数据量 <em style="color:#ff3a20">300</em> 条</p>
+                    <p>已选择数据 {{exportData.count}} 条</p>
+                    <p>其中，重复导出数据 <i style="color:#2CB7CA">{{exportData.count - exportData.newCount}}</i> 条（不再扣除）</p>
+                    <p>本次导出扣除数据量 <em style="color:#ff3a20">{{exportData.newCount}}</em> 条</p>
                 </div>
                 <p v-else>{{keyNames}}</p>
                 <span slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="confirmed">{{keyShow?'删 除':'确 定'}}</el-button>
+                    <el-button type="primary" @click="confirmed(exportData.xlsxUrl)">{{keyShow?'删 除':'确 定'}}</el-button>
                     <el-button @click="visibles = false">取 消</el-button>
                 </span>
             </div>
             <div class="conts limit-footer" v-else>
                 <div v-if="!mails">
                    <p>您的每日导出限额已超过管理员设置数量</p>
-                    <p>新导出：200</p>
-                    <p>已使用：<i style="color:#2CB7CA">600</i></p>
-                    <p>总限额：<em style="color:#ff3a20">300</em> 条</p>
+                    <p>新导出：{{exportData.count}}</p>
+                    <p>已使用：<i style="color:#2CB7CA">{{exportData.exportNum}}</i></p>
+                    <p>总限额：<em style="color:#ff3a20">{{exportData.limitDay}}</em> 条</p>
                     <p>请联系管理员</p> 
                 </div>
                 <p v-else>未填写邮箱信息的员工无法收到推送！</p>
                 <span slot="footer" class="dialog-footer">
-                    <el-button type="primary" :class="{d_active:mails}" @click="visibles = false">我知道了</el-button>
+                    <el-button type="primary" :class="{d_active:mails}" @click="knowed">我知道了</el-button>
                 </span>
             </div>
         </el-dialog>
@@ -38,7 +39,9 @@
 <script>
 export default {
     props: {
-        keyNames: String
+        keyNames: String,
+        exportData: {},
+        tuiNums: Boolean
     },
     data() {
         return {
@@ -49,8 +52,14 @@ export default {
         }
     },
     methods: {
-        confirmed() {
+        confirmed(val) {
             this.visibles = false;
+            window.location.href = val;
+        },
+        knowed() {
+            this.visibles = false;
+            this.$parent.emails = 1;
+            this.$parent.sendUpdate();
         }
     }
 }

vue.config.js

@@ -15,20 +15,40 @@ module.exports = {
     hot: true,
     disableHostCheck: true,
     proxy: {
-      "/api": {
+      "^/entniche": {
+        // target: "http://ent-xzh.jianyu360.cn",
         // target: "https://app2-jytest.jianyu360.cn",
-        target: "http://192.168.20.241:813",
-        // target: "http://127.0.0.1:812",
-
+        // target: "http://192.168.20.241:813",
+        target: "http://127.0.0.1:812",
         // target:'http://192.168.20.51:815/entbase',
         // target:'http://192.168.20.51:813/entdataexport',
-        // target:'http://192.168.20.214:812/entniche',
+        // target:'http://192.168.20.241:813',
         changeOrigin: true,
         ws: true,
         pathRewrite: {
-          "^/api": ""
+          "^/entniche": "/entniche"
         }
       },
+      "^/entbase": {
+        // target: "http://ent-xzh.jianyu360.cn",
+        // target: "https://app2-jytest.jianyu360.cn",
+        // target: "http://192.168.20.241:813/entniche",
+        target: "http://127.0.0.1:812",
+        // target:'http://192.168.20.51:815/entbase',
+        // target:'http://192.168.20.51:813/entdataexport',
+        // target:'http://192.168.20.241:812',
+        changeOrigin: true
+      },
+      "^/entdataexport": {
+        // target: "http://ent-xzh.jianyu360.cn",
+        // target: "https://app2-jytest.jianyu360.cn",
+        // target: "http://192.168.20.241:813/entniche",
+        target: "http://127.0.0.1:813",
+        // target:'http://192.168.20.51:815/entbase',
+        // target:'http://192.168.20.51:813/entdataexport',
+        // target:'http://192.168.20.241:812',
+        changeOrigin: true
+      },
     }
   }
 }