Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

public/index.html

@@ -6,6 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
+    <script src="/map/config.js"></script>
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

public/map/config.js

@@ -0,0 +1,235 @@
+let mapConfig = {
+  default: {
+    map: "/map/fj.json",
+    coordinates: () => {
+      let arrays = [];
+      arrays.concat(mapConfig.漳州地区行社.coordinates);
+      arrays.concat(mapConfig.福州地区行社.coordinates);
+      arrays.concat(mapConfig.宁德地区行社.coordinates);
+      arrays.concat(mapConfig.厦门地区行社.coordinates);
+      arrays.concat(mapConfig.泉州地区行社.coordinates);
+      arrays.concat(mapConfig.三明地区行社.coordinates);
+      arrays.concat(mapConfig.南平地区行社.coordinates);
+      arrays.concat(mapConfig.龙岩地区行社.coordinates);
+      arrays.concat(mapConfig.莆田地区行社.coordinates);
+
+      return arrays;
+    },
+  },
+  漳州地区行社: {
+    map: "/map/zhangzhou.json",
+    coordinates: [
+      { name: "漳州农商行", value: [117.675264, 24.524648, 10] },
+      { name: "龙海农商行", value: [117.813678, 24.453241, 10] },
+      { name: "云霄县农联社", value: [117.347455, 23.94945, 10] },
+      { name: "漳浦县农联社", value: [117.628503, 24.12591, 10] },
+      { name: "诏安县农联社", value: [117.185518, 23.717786, 10] },
+      { name: "长泰县农联社", value: [117.755306, 24.626603, 10] },
+      { name: "东山县农联社", value: [117.432607, 23.713423, 10] },
+      { name: "南靖县农联社", value: [117.37278, 24.523476, 10] },
+      { name: "平和县农联社", value: [117.322431, 24.376604, 10] },
+      { name: "华安县农联社", value: [117.586218, 24.998993, 10] },
+    ],
+  },
+  福州地区行社: {
+    map: "/map/fuzhou.json",
+    coordinates: [
+      { name: "福清汇通农商行", value: [119.357814, 25.722627, 10] },
+      { name: "闽侯县农联社", value: [119.262986, 25.94124, 10] },
+      { name: "闽清县农联社", value: [118.868057, 26.226602, 10] },
+      { name: "永泰县农联社", value: [118.814802, 25.980989, 10] },
+      { name: "长乐农商行", value: [119.47577, 25.970764, 10] },
+      { name: "平潭农商行", value: [119.805094, 25.508058, 10] },
+      { name: "连江县农联社", value: [119.550238, 26.214626, 10] },
+      { name: "罗源县农联社", value: [119.555228, 26.494764, 10] },
+      { name: "福州农商行", value: [119.345806, 26.058267, 10] },
+      { name: "永泰联社", value: [118.939701, 25.871521, 10] },
+      { name: "连江农商银行", value: [119.548364, 26.213602, 10] },
+    ],
+  },
+  宁德地区行社: {
+    map: "/map/ningde.json",
+    coordinates: [
+      { name: "宁德农商行", value: [119.527258, 26.666208, 10] },
+      { name: "福鼎联社", value: [120.219688, 27.315361, 10] },
+      { name: "霞浦县农联社", value: [120.019103, 26.890268, 10] },
+      { name: "福安市农联社", value: [119.689114, 26.969172, 10] },
+      { name: "古田县农联社", value: [118.762266, 26.581451, 10] },
+      { name: "屏南县农联社", value: [118.826127, 26.929013, 10] },
+      { name: "寿宁县农联社", value: [119.518667, 27.461004, 10] },
+      { name: "周宁县农联社", value: [119.439547, 26.987095, 10] },
+      { name: "柘荣县农联社", value: [119.896749, 27.230237, 10] },
+    ],
+  },
+  厦门地区行社: {
+    map: "/map/xiameng.json",
+    coordinates: [{ name: "厦门农商行", value: [118.159546, 24.485303, 10] }],
+  },
+  泉州地区行社: {
+    map: "/map/quanzhou.json",
+    coordinates: [
+      { name: "石狮农商行", value: [118.628645, 24.741741, 10] },
+      { name: "泉州农商行", value: [118.687639, 24.876978, 10] },
+      { name: "惠安县农联社", value: [118.807105, 25.034176, 10] },
+      { name: "晋江农商行", value: [118.580679, 24.811057, 10] },
+      { name: "南安农商行", value: [118.414307, 24.964234, 10] },
+      { name: "安溪县农联社", value: [118.202284, 25.047225, 10] },
+      { name: "永春县农联社", value: [118.297553, 25.328058, 10] },
+      { name: "德化县农联社", value: [118.256646, 25.502722, 10] },
+    ],
+  },
+  三明地区行社: {
+    map: "/map/sanming.json",
+    coordinates: [
+      { name: "三明农商行", value: [117.643759, 26.265176, 10] },
+      { name: "明溪县农联社", value: [116.947323, 26.578251, 10] },
+      { name: "永安市农联社", value: [117.373871, 25.982393, 10] },
+      { name: "清流县农联社", value: [116.862321, 26.057757, 10] },
+      { name: "宁化县农联社", value: [116.671271, 26.255966, 10] },
+      { name: "大田县农联社", value: [117.860583, 25.69679, 10] },
+      { name: "尤溪县农联社", value: [118.20086, 26.177155, 10] },
+      { name: "沙县农商行", value: [117.800659, 26.407476, 10] },
+      { name: "将乐县农联社", value: [117.486567, 26.727451, 10] },
+      { name: "泰宁县农联社", value: [117.182947, 26.899721, 10] },
+      { name: "建宁县农联社", value: [116.849763, 26.836767, 10] },
+    ],
+  },
+  南平地区行社: {
+    map: "/map/nanping.json",
+    coordinates: [
+      { name: "南平农商行", value: [118.185343, 26.648297, 10] },
+      { name: "邵武市农联社", value: [117.499641, 27.339004, 10] },
+      { name: "建阳市农联社", value: [118.128905, 27.337197, 10] },
+      { name: "顺昌县农联社", value: [117.815179, 26.796944, 10] },
+      { name: "建瓯农商银行", value: [118.326437, 27.039505, 10] },
+      { name: "浦城县农联社", value: [118.382047, 27.930925, 10] },
+      { name: "武夷山农商行", value: [118.036163, 27.757306, 10] },
+      { name: "光泽县农联社", value: [117.341868, 27.549505, 10] },
+      { name: "松溪县农联社", value: [118.791577, 27.535192, 10] },
+      { name: "政和县农联社", value: [118.858131, 27.3699, 10] },
+    ],
+  },
+  龙岩地区行社: {
+    map: "/map/longyan.json",
+    coordinates: [
+      { name: "龙岩农商行", value: [117.027016, 25.086651, 10] },
+      { name: "长汀县农联社", value: [116.400555, 25.874531, 10] },
+      { name: "永定县农联社", value: [116.734408, 24.723809, 10] },
+      { name: "上杭农商行", value: [116.44197, 25.049185, 10] },
+      { name: "武平县农联社", value: [116.101001, 25.086408, 10] },
+      { name: "漳平农商行", value: [117.428414, 25.291055, 10] },
+      { name: "连城县农联社", value: [116.650912, 25.615751, 10] },
+    ],
+  },
+  莆田地区行社: {
+    map: "/map/putian.json",
+    coordinates: [
+      { name: "莆田农商银行", value: [119.014794, 25.427314, 10] },
+      { name: "仙游农商银行", value: [118.703527, 25.361068, 10] },
+    ],
+  },
+  马尾农商行:{map:"/map/mawei.json", coordinates:[
+
+  ]},
+  鼓楼区农商行:{map:"/map/gulou.json", coordinates:[]},
+  三明农商银行:{map:"/map/sanming.json", coordinates:[{ name: "三明农商行", value: [117.643759, 26.265176, 10] },]},
+  上杭农商行:{map:"/map/shanghang.json", coordinates:[ { name: "上杭农商行", value: [116.44197, 25.049185, 10] },]},
+  东山联社:{map:"/map/dongshan.json", coordinates:[  { name: "东山县农联社", value: [117.432607, 23.713423, 10] },]},
+  云霄联社:{map:"/map/yunxiao.json", coordinates:[{ name: "云霄县农联社", value: [117.347455, 23.94945, 10] },]},
+  仙游农商银行:{map:"/map/xianyou.json", coordinates:[{ name: "仙游农商银行", value: [118.703527, 25.361068, 10] },]},
+  光泽农信联社:{map:"/map/guangzhe.json", coordinates:[{ name: "光泽县农联社", value: [117.341868, 27.549505, 10] },]},
+  华安县联社:{map:"/map/huaan.json", coordinates:[{ name: "华安县农联社", value: [117.586218, 24.998993, 10] },]},
+  南安农商行:{map:"/map/nanan.json", coordinates:[{ name: "南安农商行", value: [118.414307, 24.964234, 10] },]},
+  南平农商银行:{map:"/map/nanping.json", coordinates:[{ name: "南平农商行", value: [118.185343, 26.648297, 10] },]},
+  南靖县联社:{map:"/map/nanjing.json", coordinates:[{ name: "南靖县农联社", value: [117.37278, 24.523476, 10] },]},
+  厦门农商行:{map:"/map/xiameng.json", coordinates:[{ name: "厦门农商行", value: [118.159546, 24.485303, 10] }]},
+  古田农信联社:{map:"/map/gutian.json", coordinates:[{ name: "古田县农联社", value: [118.762266, 26.581451, 10] }]},
+  周宁县联社:{map:"/map/zhouning.json", coordinates:[{ name: "周宁县农联社", value: [119.439547, 26.987095, 10] },]},
+  大田县联社:{map:"/map/datian.json", coordinates:[{ name: "大田县农联社", value: [117.860583, 25.69679, 10] }]},
+  宁化县联社:{map:"/map/ninghua.json", coordinates:[{ name: "宁化县农联社", value: [116.671271, 26.255966, 10] }]},
+  宁德农商行:{map:"/map/ningde.json", coordinates:[{ name: "宁德农商行", value: [119.527258, 26.666208, 10] }]},
+  安溪农商银行:{map:"/map/anxi.json", coordinates:[{ name: "安溪县农联社", value: [118.202284, 25.047225, 10] }]},
+  寿宁联社:{map:"/map/shouning.json", coordinates:[{ name: "寿宁县农联社", value: [119.518667, 27.461004, 10] }]},
+  将乐县联社:{map:"/map/jiangle.json", coordinates:[{ name: "将乐县农联社", value: [117.445716, 26.972073, 10] }]},
+  尤溪农信联社:{map:"/map/youxi.json", coordinates:[{ name: "尤溪县农联社", value: [118.20086, 26.177155, 10] }]},
+  屏南县联社:{map:"/map/pingnan.json", coordinates:[{ name: "屏南县农联社", value: [118.826127, 26.929013, 10] }]},
+  平和农商银行:{map:"/map/pinghe.json", coordinates:[{ name: "平和县农联社", value: [117.322431, 24.376604, 10] }]},
+  平潭农商行:{map:"/map/pingtan.json", coordinates:[ { name: "平潭农商行", value: [119.805094, 25.508058, 10] }]},
+  建宁联社:{map:"/map/jianning.json", coordinates:[{ name: "建宁县农联社", value: [116.849763, 26.836767, 10] }]},
+  建瓯农商银行:{map:"/map/jianou.json", coordinates:[{ name: "建瓯农商银行", value: [118.326437, 27.039505, 10] }]},
+  建阳区联社:{map:"/map/jianyang.json", coordinates:[{ name: "建阳市农联社", value: [118.128905, 27.337197, 10] }]},
+  德化县联社:{map:"/map/dehua.json", coordinates:[{ name: "德化县农联社", value: [118.256646, 25.502722, 10] }]},
+  惠安联社:{map:"/map/huian.json", coordinates:[{ name: "惠安县农联社", value: [118.807105, 25.034176, 10] }]},
+  政和县联社:{map:"/map/zhenghe.json", coordinates:[{ name: "政和县农联社", value: [118.858131, 27.3699, 10] }]},
+  明溪联社:{map:"/map/mingxi.json", coordinates:[{ name: "明溪县农联社", value: [116.947323, 26.578251, 10] }]},
+  晋江农商行:{map:"/map/jinjiang.json", coordinates:[{ name: "晋江农商行", value: [118.580679, 24.811057, 10] }]},
+  松溪县联社:{map:"/map/songxi.json", coordinates:[{ name: "松溪县农联社", value: [118.791577, 27.535192, 10] }]},
+  柘荣联社:{map:"/map/zherong.json", coordinates:[{ name: "柘荣县农联社", value: [119.896749, 27.230237, 10] }]},
+  武夷山农商行:{map:"/map/wuyishan.json", coordinates:[{ name: "武夷山农商行", value: [118.036163, 27.757306, 10] }]},
+  武平县联社:{map:"/map/wuping.json", coordinates:[{ name: "武平县农联社", value: [116.101001, 25.086408, 10] }]},
+  永安农商银行:{map:"/map/yongan.json", coordinates:[{ name: "永安市农联社", value: [117.373871, 25.982393, 10] }]},
+  永定联社:{map:"/map/yongding.json", coordinates:[{ name: "永定县农联社", value: [116.734408, 24.723809, 10] }]},
+  永春县联社:{map:"/map/yongchun.json", coordinates:[{ name: "永春县农联社", value: [118.297553, 25.328058, 10] }]},
+  永泰联社:{map:"/map/yongtai.json", coordinates:[{ name: "永泰联社", value: [118.939701, 25.871521, 10] }]},
+  沙县农商银行:{map:"/map/shaxian.json", coordinates:[{ name: "沙县农商行", value: [117.800659, 26.407476, 10] },]},
+  泉州农商行:{map:"/map/quanzhou.json", coordinates:[{ name: "泉州农商行", value: [118.687639, 24.876978, 10] }]},
+  泰宁县联社:{map:"/map/taining.json", coordinates:[{ name: "泰宁县农联社", value: [117.182947, 26.899721, 10] }]},
+  浦城县联社:{map:"/map/pucheng.json", coordinates:[{ name: "浦城县农联社", value: [118.382047, 27.930925, 10] }]},
+  清流农信联社:{map:"/map/qingliu.json", coordinates:[{ name: "清流县农联社", value: [116.862321, 26.057757, 10] }]},
+  漳州农商行:{map:"/map/zhangzhou.json", coordinates:[ { name: "漳州农商行", value: [117.675264, 24.524648, 10] }]},
+  漳平农商行:{map:"/map/zhangping.json", coordinates:[{ name: "漳平农商行", value: [117.428414, 25.291055, 10] }]},
+  漳浦农商银行:{map:"/map/zhangpu.json", coordinates:[{ name: "漳浦县农联社", value: [117.628503, 24.12591, 10] }]},
+  石狮农商银行:{map:"/map/shishi.json", coordinates:[{ name: "石狮农商行", value: [118.628645, 24.741741, 10] }]},
+  福安联社:{map:"/map/fuan.json", coordinates:[{ name: "福安市农联社", value: [119.689114, 26.969172, 10] }]},
+  福州农商行:{map:"/map/fuzhou.json", coordinates:[{ name: "福州农商行", value: [119.345806, 26.058267, 10] }]},
+  福清汇通农商行:{map:"/map/fuqing.json", coordinates:[{ name: "福清汇通农商行", value: [119.357814, 25.722627, 10] }]},
+  福鼎市联社:{map:"/map/fuding.json", coordinates:[{ name: "福鼎联社", value: [120.219688, 27.315361, 10] }]},
+  罗源县联社:{map:"/map/luoyuan.json", coordinates:[{ name: "罗源县农联社", value: [119.555228, 26.494764, 10] }]},
+  莆田农商银行:{map:"/map/putian.json", coordinates:[{ name: "莆田农商银行", value: [119.014794, 25.427314, 10] }]},
+  诏安县联社:{map:"/map/zhaoan.json", coordinates:[{ name: "诏安县农联社", value: [117.185518, 23.717786, 10] }]},
+  连城联社:{map:"/map/liancheng.json", coordinates:[{ name: "连城县农联社", value: [116.650912, 25.615751, 10] }]},
+  连江农商银行:{map:"/map/lianjiang.json", coordinates:[{ name: "连江农商银行", value: [119.548364, 26.213602, 10] }]},
+  邵武农商行:{map:"/map/shaowu.json", coordinates:[{ name: "邵武市农联社", value: [117.499641, 27.339004, 10] }]},
+  长乐农商行:{map:"/map/changle.json", coordinates:[{ name: "长乐农商行", value: [119.47577, 25.970764, 10] }]},
+  长汀联社:{map:"/map/changding.json", coordinates:[{ name: "长汀县农联社", value: [116.400555, 25.874531, 10] }]},
+  长泰联社:{map:"/map/changtai.json", coordinates:[{ name: "长泰县农联社", value: [117.755306, 24.626603, 10] }]},
+  闽侯县联社:{map:"/map/minhou.json", coordinates:[{ name: "闽侯县农联社", value: [119.262986, 25.94124, 10] }]},
+  闽清联社:{map:"/map/minqing.json", coordinates:[{ name: "闽清县农联社", value: [118.868057, 26.226602, 10] }]},
+  霞浦县联社:{map:"/map/xiapu.json", coordinates:[{ name: "霞浦县农联社", value: [120.019103, 26.890268, 10] }]},
+  顺昌县联社:{map:"/map/shunchang.json", coordinates:[{ name: "顺昌县农联社", value: [117.815179, 26.796944, 10] }]},
+  龙岩农商行:{map:"/map/longyan.json", coordinates:[{ name: "龙岩农商行", value: [117.027016, 25.086651, 10] }]},
+  龙海农商行:{map:"/map/longhai.json", coordinates:[{ name: "龙海农商行", value: [117.813678, 24.453241, 10] }]},
+};
+
+
+
+window.boardMap = {
+  getMap: (orgName) => {
+    if (mapConfig[orgName]) {
+      return mapConfig[orgName].map;
+    }
+
+    return mapConfig.default.map;
+  },
+
+  /**
+   * 获取坐标
+   * @param {} orgName
+   */
+  getCoord: (orgName) => {
+    if (mapConfig[orgName]) {
+      return mapConfig[orgName].coordinates;
+    }
+
+    let coordinates = [];
+    for (let p in mapConfig) {
+      if (!mapConfig[p].coordinates) {
+        continue;
+      }
+
+      coordinates = coordinates.concat(mapConfig[p].coordinates);
+    }
+
+    return coordinates;
+  },
+};

src/api/board/cockpit.js

@@ -58,3 +58,12 @@ export function question(query) {
       params: query,
     });
   }
+
+  export function getMap(url){
+    let address=location.origin+url
+    
+    return request({
+      url: address,
+      method: "get"
+    });
+  }

src/assets/map/config.js

@@ -1,129 +0,0 @@
-import map from "./fj.json";
-import zhangzhou from "./zhangzhou.json";
-import fuzhou from "./fuzhou.json";
-import ningde from "./ningde.json";
-import longyan from "./longyan.json";
-import nangping from "./nanping.json";
-import quangzhou from "./quanzhou.json";
-import sanming from "./sanming.json";
-import xiameng from "./xiameng.json";
-import putian from "./putian.json";
-
-export default {
-  default: {
-    map,
-    coordinates: [],
-  },
-  漳州地区行社: {
-    map: zhangzhou,
-    coordinates: [
-      { name: "漳州农商行", value: [117.675264, 24.524648, 10] },
-      { name: "龙海农商行", value: [117.813678, 24.453241, 10] },
-      { name: "云霄县农联社", value: [117.347455, 23.94945, 10] },
-      { name: "漳浦县农联社", value: [117.628503, 24.12591, 10] },
-      { name: "诏安县农联社", value: [117.185518, 23.717786, 10] },
-      { name: "长泰县农联社", value: [117.755306, 24.626603, 10] },
-      { name: "东山县农联社", value: [117.432607, 23.713423, 10] },
-      { name: "南靖县农联社", value: [117.37278, 24.523476, 10] },
-      { name: "平和县农联社", value: [117.322431, 24.376604, 10] },
-      { name: "华安县农联社", value: [117.586218, 24.998993, 10] },
-    ],
-  },
-  福州地区行社: {
-    map: fuzhou,
-    coordinates: [
-      { name: "福清汇通农商行", value: [119.200249, 26.078113, 10] },
-      { name: "闽侯县农联社", value: [119.262986, 25.94124, 10] },
-      { name: "闽清县农联社", value: [118.868057, 26.226602, 10] },
-      { name: "永泰县农联社", value: [118.814802, 25.980989, 10] },
-      { name: "长乐农商行", value: [119.47577, 25.970764, 10] },
-      { name: "平潭农商行", value: [119.805094, 25.508058, 10] },
-      { name: "连江县农联社", value: [119.550238, 26.214626, 10] },
-      { name: "罗源县农联社", value: [119.555228, 26.494764, 10] },
-      // { name: "鼓楼区农商行", value: [, 10] },
-      { name: "台江农商2", value: [119.345806, 26.058267, 10] },
-      // { name: "马尾农商行", value: [, 10] },
-    ],
-  },
-  宁德地区行社: {
-    map: ningde,
-    coordinates: [
-      { name: "宁德农商行", value: [119.527258, 26.666208, 10] },
-      { name: "福鼎联社", value: [120.219688, 27.315361, 10] },
-      { name: "霞浦县农联社", value: [120.019103, 26.890268, 10] },
-      { name: "福安市农联社", value: [119.689114, 26.969172, 10] },
-      { name: "古田县农联社", value: [118.762266, 26.581451, 10] },
-      { name: "屏南县农联社", value: [118.826127, 26.929013, 10] },
-      { name: "寿宁县农联社", value: [119.518667, 27.461004, 10] },
-      { name: "周宁县农联社", value: [119.439547, 26.987095, 10] },
-      { name: "柘荣县农联社", value: [119.896749, 27.230237, 10] },
-    ],
-  },
-  厦门地区行社: {
-    map: xiameng,
-    coordinates: [{ name: "厦门农商行", value: [118.159546, 24.485303, 10] }],
-  },
-  泉州地区行社: {
-    map: quangzhou,
-    coordinates: [
-      { name: "石狮农商行", value: [118.726106, 24.805787, 10] },
-      { name: "泉州农村商业银行股份有限", value: [118.20232, 25.047271, 10] },
-      { name: "惠安县农联社", value: [118.807105, 25.034176, 10] },
-      { name: "晋江农村商业银行股份有限", value: [118.640394, 24.801252, 10] },
-      { name: "南安农商行", value: [118.414307, 24.964234, 10] },
-      { name: "安溪县农联社", value: [118.216076, 25.061434, 10] },
-      { name: "永春县农联社", value: [118.297553, 25.328058, 10] },
-      { name: "德化县农联社", value: [118.256646, 25.502722, 10] },
-    ],
-  },
-  三明地区行社: {
-    map: sanming,
-    coordinates: [
-      { name: "三明农商行", value: [117.643759, 26.265176, 10] },
-      { name: "明溪县农联社", value: [116.947323, 26.578251, 10] },
-      { name: "永安市农联社", value: [117.373871, 25.982393, 10] },
-      { name: "清流县农联社", value: [116.862321, 26.057757, 10] },
-      { name: "宁化县农联社", value: [116.671271, 26.255966, 10] },
-      { name: "大田县农联社", value: [117.971007, 25.545598, 10] },
-      { name: "尤溪县农联社", value: [118.20086, 26.177155, 10] },
-      { name: "沙县农商行", value: [117.800659, 26.407476, 10] },
-      { name: "将乐县农联社", value: [117.445716, 26.972073, 10] },
-      { name: "泰宁县农联社", value: [117.182947, 26.899721, 10] },
-      { name: "建宁县农联社", value: [116.849763, 26.836767, 10] },
-    ],
-  },
-  南平地区行社: {
-    map: nangping,
-    coordinates: [
-      { name: "南平农商行", value: [118.185343,26.648297, 10] },
-      { name: "邵武市农联社", value: [117.499641,27.339004, 10] },
-      { name: "建阳市农联社", value: [118.128905,27.337197, 10] },
-      { name: "顺昌县农联社", value: [117.815179,26.796944, 10] },
-      { name: "建瓯农商银行", value: [118.326437,27.039505, 10] },
-      { name: "浦城县农联社", value: [118.382047,27.930925, 10] },
-      { name: "武夷山农商行", value: [118.036163,27.757306, 10] },
-      { name: "光泽县农联社", value: [117.341868,27.549505, 10] },
-      { name: "松溪县农联社", value: [118.791577,27.535192, 10] },
-      { name: "政和县农联社", value: [118.858131,27.3699, 10] },
-    ],
-  },
-  龙岩地区行社: {
-    map: longyan,
-    coordinates: [
-        { name: "龙岩农商行", value: [117.027016,25.086651, 10] },
-        { name: "长汀县农联社", value: [116.400555,25.874531, 10] },
-        { name: "永定县农联社", value: [116.734408,24.723809, 10] },
-        { name: "上杭农商行", value: [116.44197,25.049185, 10] },
-        { name: "武平县农联社", value: [116.101001,25.086408, 10] },
-        { name: "漳平农商行", value: [117.428414,25.291055, 10] },
-        { name: "连城县农联社", value: [116.650912,25.615751, 10] }
-    ],
-  },
-  莆田地区行社: {
-    map: putian,
-    coordinates: [
-        { name: "莆田农商银行", value: [119.014794,25.427314, 10] },
-        { name: "仙游农商银行", value: [118.703527,25.361068, 10] },        
-    ],
-  },
-};

src/views/board/charts/map/mapConfig.js

@@ -1,33 +0,0 @@
-import config from "@/assets/map/config";
-
-export default {
-  /**获取地图数据 */
-  getMap(orgName) {
-    if (config[orgName]) {
-      return config[orgName].map;
-    }
-
-    return config.default.map;
-  },
-  /**
-   * 获取坐标
-   * @param {} orgName
-   */
-  getCoord(orgName) {
-    if (config[orgName]) {
-      return config[orgName].coordinates;
-    }
-
-    let coordinates = [];
-    for (let p in config) {
-      if (!config[p].coordinates) {
-        continue;
-      }
-
-      coordinates = coordinates.concat(config[p].coordinates);
-    }
-
-    return coordinates;
-  },
-};
-// coordinates

src/views/board/charts/map/report.vue

@@ -4,10 +4,11 @@
     <div id="map_Chart" style="height: 100%"></div>
   </div>
 </template>
+
 <script>
 import "./../../board.scss";
 import * as echarts from "echarts";
-import mapConfig from "./mapConfig.js";
+import { getMap } from "@/api/board/cockpit.js";
 import {
   findMaxIndex,
   getChartDOMSize,
@@ -37,14 +38,14 @@ export default {
         this.getData();
       },
     },
-    map: {
-      deep: true,
-      handler() {
-        this.$nextTick(() => {
-          this.initMap();
-        });
-      },
-    },
+    // map: {
+    //   deep: true,
+    //   handler() {
+    //     this.$nextTick(() => {
+    //       this.initMap();
+    //     });
+    //   },
+    // },
   },
 
   created() {
@@ -78,226 +79,150 @@ export default {
       this.isMouseOver = false;
     },
     async getData() {
-      let map = mapConfig.getMap(this.orgName);
-      let coordinates = mapConfig.getCoord(this.orgName);
+      let map = window.boardMap.getMap(this.orgName);
+      let coordinates = window.boardMap.getCoord(this.orgName);
       this.map = map;
       this.coordinates = coordinates;
+      this.$nextTick(() => {
+        this.initMap();
+      });
     },
     initMap() {
       this.myChart && this.myChart.dispose();
 
       // 基于准备好的dom，初始化echarts实例
       this.myChart = echarts.init(document.getElementById("map_Chart"));
-      echarts.registerMap("map", this.map);
       let t = this;
-      //   this.myChart.hideLoading();
 
-      // 指定图表的配置项和数据
-      //   let option = {
-      //     tooltip: {
-      //       trigger: "item",
-      //       showDelay: 0,
-      //       transitionDuration: 0.2,
-      //     },
-      //     // visualMap:{
-      //     //     type:
-      //     // }
-      //     // toolbox:{
-      //     //     show:true,
-      //     //     left:'left'
-      //     // }
-      //     geo: {
-      //       roam: true,
-      //       map: "map",
-      //       label: {
-      //         show: true,
-      //         color: "#ffffff00",
-      //         emphasis: {
-      //           color: "#fff",
-      //           show: true,
-      //         },
-      //       },
-      //       tooltip: {
-      //         show: true,
-      //         confine: true,
-      //         formatter: function (params) {
-      //           return params[0].value
-      //         }
-      //       },
-      //       layoutCenter: ["50%", "50%"], //地图位置
-      //       layoutSize: "100%",
-      //       x: "55%",
-      //       itemStyle: {
-      //         normal: {
-      //           areaColor: "#3fdaff30",
-      //           borderColor: "#3fdaff",
-      //           borderWidth: 1,
-      //           shadowColor: "rgba(63, 218, 255, 0.5)",
-      //           shadowBlur: 10,
-      //         },
-      //         emphasis: {
-      //           areaColor: "#2B91B7",
-      //         },
-      //       },
-      //     },
-      //     series: [
-      //       {
-      //         name: "map",
-      //         type: "effectScatter",
-      //         coordinateSystem: 'geo',
-      //         roam: true,
-      //         map: "map",
-      //         datasetIndex:0,
-      // 		geoIndex: 0,
-      //         // emphasis: {
-      //         //   label: {
-      //         //     show: true,
-      //         //   },
-      //         // },
-      //         zoom: 1.2,
-      //         itemStyle: {
-      //           normal: {
-      //             areaColor: "#3fdaff30",
-      //             borderColor: "#3fdaff",
-      //             borderWidth: 0.2,
-      //             shadowColor: "rgba(63, 218, 255, 0.5)",
-      //             shadowBlur: 2,
-      //           },
-      //           emphasis: {
-      //             areaColor: "#2B91B7",
-      //           },
-      //         },
-      //         symbol: this.icon, //自定义图标
-      //         symbolSize: 20,
-      //         data: [{name:'三明市',value:[117.635001,26.265444,10]}],
-      //       },
-      //     ],
-      //   };
-      let option = {
-        tooltip: {
-          trigger: "item",
-        },
-        geo: {
-          show: true,
-          map: "map",
-          zoom: 1.25,
+      getMap(this.map).then((data) => {
+        echarts.registerMap("map", data);
 
-          showLegendSymbol: false, // 存在legend时显示
-
-          label: {
-            normal: {
-              show: false,
-              color: "#c1b496", //控制地图省市文字颜色
-              fontSize: 14,
-            },
-            emphasis: {
-              show: false,
-              color: "#fff", //悬浮字体颜色
-            },
-          },
-
-          roam: true,
-          selectedMode: "single", //选择模式，单选，只能选中一个地市
-          select: {
-            //这个就是鼠标点击后，地图想要展示的配置
-            disabled: false, //可以被选中
-            itemStyle: {
-              //相关配置项很多，可以参考echarts官网
-              borderWidth: 1, //区域边框宽度
-              borderColor: "#2B91B7ff", //区域边框颜色
-              areaColor: "#2B91B730", //选中
-            },
-            label: {
-              show: false,
-              color: "#fff", //悬浮字体颜色
-            },
-          },
-          itemStyle: {
-            normal: {
-              borderWidth: 1, //区域边框宽度
-              borderColor: "#3fdaffff", //区域边框颜色
-              areaColor: "#3fdaff55", //区域颜色"rgba(23,107,221,0.7)",//
-            },
-            emphasis: {
-              borderWidth: 1,
-              borderColor: "#fff",
-              areaColor: "#2B91B7",
-            },
+        let option = {
+          tooltip: {
+            trigger: "item",
           },
-        },
-        legend: [
-          {
-            selectedMode: true, //取消图例上的点击事件
-          },
-        ],
-        series: [
-          {
+          geo: {
+            show: true,
             map: "map",
-            type: "effectScatter",
-            // silent: true,
-            coordinateSystem: "geo",
-            // datasetIndex: 0,
-            // geoIndex: 0,
-            // selectedMode: false,
-            // focusNodeAdjacency: false,
-            // label: {
-            // 	show: true,
-            // 	width: 13,
-            // 	height: 15,
-            // 	fontSize: 0,
-            // 	color: "#1DF9FC",
-            // 	backgroundColor: {
-            // 		image: iconRQ
-            // 	},
-            // },
+            zoom: 1.25,
+
+            showLegendSymbol: false, // 存在legend时显示
+
             label: {
-              formatter: (param) => {
-                return param.name;
+              normal: {
+                show: false,
+                color: "#c1b496", //控制地图省市文字颜色
+                fontSize: 14,
+              },
+              emphasis: {
+                show: false,
+                color: "#fff", //悬浮字体颜色
               },
-              position: "top",
-              fontSize:"10",
-              color: "#fff",
-              show: true,
             },
-            tooltip: {
-              show: false,
+
+            roam: true,
+            selectedMode: "single", //选择模式，单选，只能选中一个地市
+            select: {
+              //这个就是鼠标点击后，地图想要展示的配置
+              disabled: false, //可以被选中
+              itemStyle: {
+                //相关配置项很多，可以参考echarts官网
+                borderWidth: 1, //区域边框宽度
+                borderColor: "#2B91B7ff", //区域边框颜色
+                areaColor: "#2B91B730", //选中
+              },
+              label: {
+                show: false,
+                color: "#fff", //悬浮字体颜色
+              },
             },
-            //  tooltip:{
-            //   position: "right",
-            //   textStyle:{
-            //     // color:'#fff',
-            //   },
-            //   // backgroundColor:'rgba(184,189,192,1)',
-            //   formatter:function(param){
-            //     return `<div >
-            //     <div> ${param.data.name} </div>
-            //     <div>履职总数：85 </div>
-            //     <div> 已完成：67 </div>
-            //     </div>`
-            //   }
-            // },
             itemStyle: {
-              color: "#ddb926",
-            },
-            symbol: this.icon, //自定义图标
-            symbolSize: [10, 10],
-            // encode: {
-            //   value: 2,
-            // },
-            // showEffectOn: "emphasis", //关闭涟漪
-            // hoverEffectOn: true,
-            rippleEffect: {
-              brushType: "fill",
-              period: 0,
-              number: 0,
+              normal: {
+                borderWidth: 1, //区域边框宽度
+                borderColor: "#3fdaffff", //区域边框颜色
+                areaColor: "#3fdaff55", //区域颜色"rgba(23,107,221,0.7)",//
+              },
+              emphasis: {
+                borderWidth: 1,
+                borderColor: "#fff",
+                areaColor: "#2B91B7",
+              },
             },
-            data: this.coordinates,
           },
-        ],
-      };
-      if (option && typeof option === "object") {
-        this.myChart.setOption(option);
-      }
+          legend: [
+            {
+              selectedMode: true, //取消图例上的点击事件
+            },
+          ],
+          series: [
+            {
+              map: "map",
+              type: "effectScatter",
+              // silent: true,
+              coordinateSystem: "geo",
+              // datasetIndex: 0,
+              // geoIndex: 0,
+              // selectedMode: false,
+              // focusNodeAdjacency: false,
+              // label: {
+              // 	show: true,
+              // 	width: 13,
+              // 	height: 15,
+              // 	fontSize: 0,
+              // 	color: "#1DF9FC",
+              // 	backgroundColor: {
+              // 		image: iconRQ
+              // 	},
+              // },
+              label: {
+                formatter: (param) => {
+                  return param.name;
+                },
+                position: "top",
+                fontSize: "10",
+                color: "#fff",
+                show: true,
+              },
+              tooltip: {
+                show: false,
+              },
+              //  tooltip:{
+              //   position: "right",
+              //   textStyle:{
+              //     // color:'#fff',
+              //   },
+              //   // backgroundColor:'rgba(184,189,192,1)',
+              //   formatter:function(param){
+              //     return `<div >
+              //     <div> ${param.data.name} </div>
+              //     <div>履职总数：85 </div>
+              //     <div> 已完成：67 </div>
+              //     </div>`
+              //   }
+              // },
+              itemStyle: {
+                color: "#ddb926",
+              },
+              symbol: this.icon, //自定义图标
+              symbolSize: [10, 10],
+              // encode: {
+              //   value: 2,
+              // },
+              // showEffectOn: "emphasis", //关闭涟漪
+              // hoverEffectOn: true,
+              rippleEffect: {
+                brushType: "fill",
+                period: 0,
+                number: 0,
+              },
+              data: this.coordinates,
+            },
+          ],
+        };
+        if (option && typeof option === "object") {
+          this.myChart.setOption(option);
+        }
+      });
     },
     windowResize() {
       this.myChart && this.myChart.resize();

src/views/board/index.vue

@@ -8,7 +8,7 @@
         <el-divider direction="vertical" style="margin-top: 5px"></el-divider>
         <el-cascader
           :options="orgOptions"
-          v-model="selectedOrg.id"
+          v-model="orgCascaderSelectedIds"
           :props="{ checkStrictly: true, value: 'id', label: 'shortName' }"
           :show-all-levels="false"
           class="org-cascader"
@@ -27,13 +27,28 @@
     <div class="main">
       <div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id" :api="api.resumption" :orgName="selectedOrg.name" title="日常安全履职" />
+          <resumptionReport
+            :orgId="selectedOrg.id"
+            :api="api.resumption"
+            :orgName="selectedOrg.name"
+            title="日常安全履职"
+          />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id"  :api="api.monitor" :orgName="selectedOrg.name" title="监控调阅" />
+          <resumptionReport
+            :orgId="selectedOrg.id"
+            :api="api.monitor"
+            :orgName="selectedOrg.name"
+            title="监控调阅"
+          />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id"  :api="api.safetyCheck" :orgName="selectedOrg.name" title="日常安全检查" />
+          <resumptionReport
+            :orgId="selectedOrg.id"
+            :api="api.safetyCheck"
+            :orgName="selectedOrg.name"
+            title="日常安全检查"
+          />
         </div>
       </div>
       <div>
@@ -51,12 +66,22 @@
           <question :orgId="selectedOrg.id" />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id"  :api="api.drill" :orgName="selectedOrg.name" title="预案演练" />
+          <resumptionReport
+            :orgId="selectedOrg.id"
+            :api="api.drill"
+            :orgName="selectedOrg.name"
+            title="预案演练"
+          />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id" :api="api.edu" :orgName="selectedOrg.name" title="教育培训" />
+          <resumptionReport
+            :orgId="selectedOrg.id"
+            :api="api.edu"
+            :orgName="selectedOrg.name"
+            title="教育培训"
+          />
         </div>
-       
+
         <!-- <div>
           <div>
             <safetyIndex :orgId="selectedOrg.id" />
@@ -74,7 +99,7 @@ import question from "./charts/question/report.vue";
 import mapChart from "./charts/map/report.vue";
 import orgStatis from "./charts/org/report.vue";
 import dayjs from "dayjs";
-import * as api from '@/api/board/cockpit.js'
+import * as api from "@/api/board/cockpit.js";
 
 import "./board.scss";
 export default {
@@ -89,8 +114,9 @@ export default {
         id: null,
         name: null,
       },
+      orgCascaderSelectedIds:[],
       electricHost: undefined,
-      api
+      api,
     };
   },
 
@@ -166,6 +192,7 @@ export default {
       id: this.orgId,
       name: this.orgName,
     };
+    this.orgCascaderSelectedIds=[this.orgId]
   },
   beforeDestroy() {
     clearInterval(this.orgtimer);
@@ -197,147 +224,11 @@ export default {
         return;
       }
 
-      this.selectedOrg = {id: checked[0].data.id,name:checked[0].data.shortName };
+      this.selectedOrg = {
+        id: checked[0].data.id,
+        name: checked[0].data.shortName,
+      };
     },
-    // handleSelect(e) {
-    //   var item = this.branchlist.find((o) => o.orgId === parseInt(e));
-    //   this.activeIndex = e;
-    //   this.selectedOrg = { ...item };
-    // },
-    // async getOrgList(currentUserOrgId) {
-    //   let r = await getOrgList();
-    //   if (r.ret === 2) {
-    //     this.exitSys();
-    //   } else if (r.ret != 1) {
-    //     this.$notify.error({
-    //       message: `获取机构列表错误：${r.errorMsg}`,
-    //       duration: 20 * 1000,
-    //     });
-
-    //     return;
-    //   }
-
-    //   let { data } = r;
-    //   Vue.prototype.$treeList = data;
-    //   const tree = this.genDropdownTree(data, currentUserOrgId);
-    //   if (tree && tree.length > 0) {
-    //     this.selectedOrg = {
-    //       orgId: tree[0].id,
-    //       name: tree[0].label,
-    //     };
-    //   }
-    //   this.orgTree = tree;
-
-    //   let top = data.find((d) => !data.find((d2) => d2.orgId == d.parentId));
-    //   if (!top) {
-    //     this.$$notify.error({
-    //       message: "未找到顶级机构",
-    //       duration: 20 * 1000,
-    //     });
-    //     return;
-    //   }
-
-    //   let branchlist = [];
-    //   if (
-    //     top.orgType != dictionary.orgType.firstLevelBranchType &&
-    //     top.orgType != dictionary.orgType.secondLevelBranchType &&
-    //     top.orgType != dictionary.orgType.subBranchType
-    //   ) {
-    //     this.$$notify.error({
-    //       message: "不支持机构类型" + top.orgType,
-    //       duration: 20 * 1000,
-    //     });
-    //     return;
-    //   }
-
-    //   branchlist.push(top);
-    //   var subOrgType =
-    //     top.orgType == dictionary.orgType.firstLevelBranchType
-    //       ? dictionary.orgType.secondLevelBranchType
-    //       : top.orgType == dictionary.orgType.secondLevelBranchType
-    //       ? dictionary.orgType.subBranchType
-    //       : undefined;
-    //   let subs = data.filter(
-    //     (d) => d.orgId != top.orgId && d.orgType == subOrgType
-    //   );
-
-    //   this.branchlist = branchlist.concat(subs);
-    //   if (!this.branchlist || this.branchlist.length === 0) {
-    //     this.$notify.error({
-    //       message: "机构列表为空",
-    //       duration: 20 * 1000,
-    //     });
-    //   } else {
-    //     if (!this.selectedOrg) {
-    //       this.selectedOrg = {
-    //         ...this.branchlist[0],
-    //       };
-    //     }
-    //   }
-    // },
-
-    // /**生成下拉树 */
-    // genDropdownTree(orgList, topOrgId) {
-    //   const orgTypeConst = dictionary.orgType;
-    //   const needOrgTypes = [
-    //     orgTypeConst.firstLevelBranchType,
-    //     orgTypeConst.secondLevelBranchType,
-    //     orgTypeConst.subBranchType,
-    //   ];
-    //   const topOrg = orgList.find((org) => org.orgId == topOrgId);
-    //   var top = { id: topOrg.orgId, label: topOrg.orgName, path: topOrg.path };
-    //   var topTypeIndex = needOrgTypes.indexOf(topOrg.orgType);
-    //   if (topTypeIndex < 0) {
-    //     return [];
-    //   }
-
-    //   var nodes = [top];
-    //   if (topTypeIndex == needOrgTypes.length - 1) {
-    //     return [top];
-    //   }
-
-    //   for (var i = topTypeIndex + 1; i < needOrgTypes.length; i++) {
-    //     let tmpNodes = [];
-    //     nodes.forEach((item) => {
-    //       var children = orgList.filter(
-    //         (org) =>
-    //           org.path.startsWith(item.path) && org.orgType == needOrgTypes[i]
-    //       );
-    //       children = children.map((c) => ({
-    //         id: c.orgId,
-    //         label: c.orgName,
-    //         path: c.path,
-    //       }));
-
-    //       tmpNodes = tmpNodes.concat(children);
-    //       item.children = children;
-    //     });
-    //     nodes = tmpNodes;
-    //   }
-
-    //   return [top];
-    // },
-
-    // exitSys() {
-    //   this.$alert("确定退出系统吗？", "提示", {
-    //     confirmButtonText: "确定",
-    //     cancelButtonText: "取消",
-    //     showCancelButton: true,
-    //     callback: (r) => {
-    //       if (r === "confirm") {
-    //         logout()
-    //           .then((r) => {
-    //             location.href =
-    //               Vue.$electricHost + "/security/login/sysCenterMain.html";
-    //           })
-    //           .catch((e) => {
-    //             location.href =
-    //               Vue.$electricHost + "/security/login/sysCenterMain.html";
-    //           });
-    //       }
-    //     },
-    //   });
-    // },
   },
 };
 </script>
@@ -634,3 +525,14 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.board-org-popper {
+   .el-cascader-menu__wrap {
+    height: auto !important;
+  }
+
+   .el-scrollbar__wrap {
+    overflow: auto;
+  }
+}
+</style>

src/views/check/dialog.edit.vue

@@ -802,17 +802,23 @@ export default {
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
+        if (!isValidate) return;
+        this.loading = true;
+        let status=0;
         // console.log(this.formData.hasEdit,"this.formData.hasEdit")
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
+        status=this.formData.planStatus;
         this.formData.planStatus = 0;
-        if (!isValidate) return;
+
         this.formData.rulePointList =
           this.tableData == null ? [] : this.tableData;
+          let rols=this.formData.roleList;
+          let rolis=this.formData.roleIds;
         this.formData.roleList = null;
         this.formData.roleIds =
           this.selectedValues.length == 0 ? null : this.selectedValues;
-        this.loading = true;
+        
         if (this.formData.planCycle == 6) {
           this.formData.buildTaskNow = true;
         }
@@ -824,6 +830,9 @@ export default {
             this.onHide();
           })
           .catch((err) => {
+            this.formData.roleList=rols;
+            this.formData.roleIds=rolis;
+            this.formData.planStatus=status;
             this.loading = false;
             // console.log(err,"err")
           });

src/views/core/configuration/index.vue

@@ -1,168 +1,176 @@
 <template>
   <div class="app-container" style="min-height: 100%;">
-    <el-form :model="day" :rules="rules" ref="day" label-width="130px">
+    <div class="business-options">
+      <div class="item-title">
+        每日履职
+      </div>
       <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每日履职
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业前：" prop="front">
-
-                <template >
+        <el-form ref="day" :model="day" :rules="rules">
+            <el-row :gutter="10">
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="营业前：" prop="front" >
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.front"/>
-                </template>
-            
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业中：" prop="centre">
-              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-              点提醒 -->
-              <template >
+                    v-model="day.front"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="营业中：" prop="centre">
+                  <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
+                    :max="24" label="描述文字"></el-input-number>
+                  点提醒 -->
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.centre"/>
-                </template>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业后：" prop="after">
-              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-                点提醒 -->
-                <template >
+                    v-model="day.centre"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="营业后：" prop="after">
+                  <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
+                    :max="24" label="描述文字"></el-input-number>
+                    点提醒 -->
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.after"/>
-                </template>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="全天提醒：" prop="allDay">
-              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-                点提醒 -->
-                <template >
+                    v-model="day.after"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+              <el-col :lg="6" :md="12" :sm="12" :xs="24">
+                <el-form-item label="全天提醒：" prop="allDay">
+                  <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
+                    :max="24" label="描述文字"></el-input-number>
+                    点提醒 -->
                   <el-time-select
-                    :picker-options="pickerOptions"
-                    style="width: 70%;"  v-model="day.allDay"/>
-                </template>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
+                    v-model="day.allDay"
+                    :picker-options="pickerOptions" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-form>
       </div>
-    </el-form>
-
-    <el-form :model="week" :rules="rules" ref="week" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每周履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
-                :max="100" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-
-
-          </el-col>
-        </el-row>
+      <div class="item-title">
+        每周履职
       </div>
-    </el-form>
+      <el-form ref="week" :model="week" :rules="rules">
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="week.allDay"
+                  :max="100"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
 
-    <el-form :model="month" :rules="rules" ref="month" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每月履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="month.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <el-form :model="season" :rules="rules" ref="season" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每季履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="season.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
+
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">
+        每月履职
       </div>
-    </el-form>
-    <el-form :model="halfYear" :rules="rules" ref="halfYear" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              半年履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前：" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="halfYear.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-form ref="month" :model="month" :rules="rules">
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="month.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">
+        每季履职
       </div>
-    </el-form>
-    <el-form :model="year" :rules="rules" ref="year" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每年履职
-            </div>
-          </el-col>
-          <el-col>
-            <el-form-item label="提前：" prop="allDay">
-              <el-input-number size="mini" style="width: 30%;" v-model="year.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天提醒
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <div style="margin-top: 50px; margin-left: 42%">
-      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-form ref="season" :model="season" :rules="rules">
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="season.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">半年履职</div>
+      <el-form ref="halfYear" :model="halfYear" :rules="rules" >
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="halfYear.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <div class="item-title">每年履职</div>
+      <el-form ref="year" :model="year" :rules="rules" >
+        <div class="form-item">
+          <el-row>
+            <el-col>
+              <el-form-item label="提醒设置" prop="allDay">
+                提前
+                <el-input-number
+                  v-model="year.allDay"
+                  :max="10"
+                  :min="1"
+                  label="描述文字"
+                  size="small"
+                  @change="handleChange">
+                </el-input-number>
+                天
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <div class="button-box">
+      <el-button size="small" type="primary" @click="saveExtend">保存配置</el-button>
       <!--    <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import { insertConfiguration, getInfo } from "@/api/resumption/configuration";
+import {getInfo, insertConfiguration} from "@/api/resumption/configuration";
+
 export default {
   props: [],
   components: {},
@@ -171,7 +179,7 @@ export default {
       coreResumptionConfigurationDTO: [],
       num: 1,
       day: {
-        id:null,
+        id: null,
         resumptionCycle: 2,
         front: null,
         centre: null,
@@ -180,31 +188,31 @@ export default {
         timeUnit: 1,
       },
       week: {
-        id:null,
+        id: null,
         resumptionCycle: 3,
         allDay: null,
         timeUnit: 2
       },
       month: {
-        id:null,
+        id: null,
         resumptionCycle: 4,
         allDay: null,
         timeUnit: 2
       },
       season: {
-        id:null,
+        id: null,
         resumptionCycle: 5,
         allDay: null,
         timeUnit: 2
       },
       halfYear: {
-        id:null,
+        id: null,
         resumptionCycle: 6,
         allDay: null,
         timeUnit: 2
       },
       year: {
-        id:null,
+        id: null,
         resumptionCycle: 7,
         allDay: null,
         timeUnit: 2
@@ -283,19 +291,27 @@ export default {
       };
     },
   },
-  beforeCreate() { },
+  beforeCreate() {
+  },
 
-  beforeMount() { },
-  mounted() { },
-  beforeUpdate() { },
-  updated() { },
-  destroyed() { },
+  beforeMount() {
+  },
+  mounted() {
+  },
+  beforeUpdate() {
+  },
+  updated() {
+  },
+  destroyed() {
+  },
   created() {
     this.selectInfo();
   },
   methods: {
-    request() { },
-    handleChange(value) { },
+    request() {
+    },
+    handleChange(value) {
+    },
     selectInfo() {
       this.loading = true;
       getInfo().then(response => {
@@ -312,11 +328,10 @@ export default {
     },
 
 
-
     checkForm(form) {
       let val
       this.$refs[form].validate(valid => {
-        
+
         val = valid
       });
       return val;
@@ -327,21 +342,21 @@ export default {
       arr.forEach(v => {
         flags.push(this.checkForm(v));
       });
-     
+
       let flag = flags.every(v => {
-      
+
         return v == true;
       })
-    
+
       if (!flag) return;
       let data = {
-      
+
         coreResumptionConfiguration: [this.day, this.week, this.month, this.season, this.halfYear, this.year]
       };
       insertConfiguration(data).then(response => {
         this.$modal.msgSuccess("保存成功");
         this.open = false;
-      this.  selectInfo();
+        this.selectInfo();
       })
     }
   },
@@ -350,21 +365,38 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.business-options {
+
+}
+::v-deep{
+  .el-form-item{
+    margin-bottom: 10px;
+  }
+}
 .form-item {
+  width: 100%;
   border: 1px solid #f1f1f1;
-  margin-bottom: 2px;
-  min-height: 100px;
-  display: flex;
-  align-items: center;
+  padding: 20px;
+  margin-bottom: 10px;
+  min-height: 70px;
+  background-color: #fff;
+  box-shadow: 0 5px 10px #eaeaea;
 }
 
 .item-title {
   width: 100px;
   color: #fff;
-  background-color: #ccc;
+  background-color: #1ea8e9;
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
+
+}
+.button-box{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
 }
 </style>

src/views/core/drill/plan/index.vue

@@ -140,6 +140,7 @@
               align="left"
               header-align="center"
               prop="planName"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
               label="创建机构"

src/views/core/materials/index.vue

@@ -10,62 +10,62 @@
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <div class="main-search-box">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-          <el-form-item label="创建机构">
-            <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" wholeTree></org-tree>
-          </el-form-item>
-          <el-form-item label="资料名称" prop="title">
-            <el-input
-              v-model="queryParams.title"
-              placeholder="请输入关键字"
-              clearable
-              maxlength="50"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+            <el-form-item label="创建机构">
+              <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+                    @click="clickTreeNode" wholeTree></org-tree>
+            </el-form-item>
+            <el-form-item label="资料名称" prop="title">
+              <el-input
+                v-model="queryParams.title"
+                placeholder="请输入关键字"
+                clearable
+                maxlength="50"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
 
-          <el-form-item label="资料类型" prop="knowledgeId">
-            <el-select v-model="queryParams.knowledgeId" placeholder="请选择资料类型" style="width: 100%;" clearable>
-              <el-option v-for="dict in dict.type.edu_materials_type" :key="dict.value" :label="dict.label"
-                         :value="parseInt(dict.value)"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item label="资料类型" prop="knowledgeId">
+              <el-select v-model="queryParams.knowledgeId" placeholder="请选择资料类型" style="width: 100%;" clearable>
+                <el-option v-for="dict in dict.type.edu_materials_type" :key="dict.value" :label="dict.label"
+                           :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
 
 
-          <el-form-item label="资料状态" prop="isOpen">
-            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
-              <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
-                         :value="parseInt(dict.value)"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item label="资料状态" prop="isOpen">
+              <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
+                <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
+                           :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
 
-          <!-- <el-form-item>
+            <!-- <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item> -->
+          </el-form>
+          <el-row :gutter="10" >
+            <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item> -->
-        </el-form>
-        <el-row :gutter="10" >
-          <el-col :span="1.5">
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['core:materials:add']"
-            >新增资料
-            </el-button>
-          </el-col>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['core:materials:add']"
+              >新增资料
+              </el-button>
+            </el-col>
 
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-          </div>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </div>
         <!-- 表格数据 -->
         <el-table
           border
@@ -74,7 +74,7 @@
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="70"/>
           <el-table-column label="创建机构" align="left" header-align="center"  prop="orgName"/>
-          <el-table-column label="资料名称" align="left" header-align="center"  prop="title"/>
+          <el-table-column label="资料名称" align="left" header-align="center"  prop="title" :show-overflow-tooltip="true"/>
 
           <el-table-column label="资料类型" align="center"  prop="knowledgeId">
             <template slot-scope="scope">

src/views/core/reportForms/intrusionTestReport.vue

@@ -38,7 +38,7 @@
       </div>
           <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/monitorAccessReport.vue

@@ -1,9 +1,8 @@
 <template>
     <div class="app-container">
-
+      <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch"
-          label-width="100px">
+          v-show="showSearch">
 
             <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
@@ -26,7 +25,8 @@
             <el-date-picker  :picker-options="{ firstDayOfWeek: 1 }"  v-model="weeks"  type="week"   format='yyyy 第 WW 周'  placeholder="选择周" @change='setWeekNum'>
              </el-date-picker>
           </el-form-item>
-          <el-row :gutter="10" class="mb8">
+
+          <el-row :gutter="10">
             <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -37,15 +37,15 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 
           </el-row>
-            </el-form-item>
           </el-form>
-          <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
-          <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </el-row>
+
+          </div>
+          <div class="main-search-box" style="margin-bottom: 0;">
+            <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+          </div>
           <el-table
             border
-            height="666"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/resumptionReport.vue

@@ -1,9 +1,8 @@
 <template>
     <div class="app-container">
-
+      <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch"
-          label-width="100px">
+          v-show="showSearch">
 
             <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
@@ -40,21 +39,29 @@
                                 align="right" type="month" placeholder="请选择查询时间">
                 </el-date-picker>
               </el-form-item>
+          </el-form>
 
+          <el-row :gutter="10" >
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
                          v-hasPermi="['core:resumptionReport:export']">导出
               </el-button>
-            </el-form-item>
-          </el-form>
-          <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
-          <el-row :gutter="10" class="mb8">
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
+      </div>
+      <div class="main-search-box" style="margin-bottom: 0;">
+        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+      </div>
           <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 
@@ -64,7 +71,7 @@
               </template>
             </el-table-column>
             <el-table-column label="地区" align="center" prop="city" />
-            <el-table-column label="单位名称" align="center" prop="orgName" width="100"/>
+            <el-table-column label="单位名称" align="center" prop="orgName" width="240"/>
             <el-table-column label="网点数量" align="left" prop="networkNumber" width="100"/>
 
                 <el-table-column label="总计" align="center">

src/views/core/reportForms/safetyInspectReport.vue

@@ -70,7 +70,7 @@
     </div>
     <el-table
       border
-      height="732"
+      height="616"
       size="small"
       v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/selfInspectReport.vue

@@ -60,7 +60,7 @@
       v-loading="loading"
       :data="checkList"
       border
-      height="700" size="small" @selection-change="handleSelectionChange">
+      height="616" size="small" @selection-change="handleSelectionChange">
 
       <el-table-column align="center" label="序号" min-width="50">
         <template v-slot:default="scope">

src/views/core/reportForms/serviceBankReport.vue

@@ -1,9 +1,8 @@
 <template>
     <div class="app-container">
-
+      <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch"
-          label-width="100px">
+          v-show="showSearch">
 
             <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
@@ -24,21 +23,31 @@
                                 align="right" type="month" placeholder="请选择查询时间">
                 </el-date-picker>
               </el-form-item>
+          </el-form>
 
+          <el-row :gutter="10">
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-col>
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
                          v-hasPermi="['core:resumptionReport:export']">导出
               </el-button>
-            </el-form-item>
-          </el-form>
-          <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
-          <el-row :gutter="10" class="mb8">
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
-          <el-table
+
+          </div>
+      <div class="main-search-box" style="margin-bottom: 0;">
+        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+      </div>
+
+      <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/reportForms/standbyPowerReport.vue

@@ -34,7 +34,7 @@
       </div>
           <el-table
             border
-            height="700"
+            height="616"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 

src/views/core/safeLevel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-table v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
+    <el-table border height="760" v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
 
       <el-table-column label="安全等级" align="center" prop="levelName"/>
       <el-table-column label="风险等级" align="center" prop="riskLevel">

src/views/question/list/index.vue

@@ -118,8 +118,9 @@
           <el-table
             v-loading="loading"
             :data="questionList"
-            height="640"
+            height="646"
             size="small"
+            border
           >
             <el-table-column
               header-align="center"
@@ -163,6 +164,7 @@
               header-align="center"
               label="隐患描述"
               prop="questionDesc"
+              :show-overflow-tooltip="true"
               v-if="columns[4].visible"
             />
             <el-table-column

src/views/question/reform/index.vue

@@ -102,8 +102,9 @@
           <el-table
             v-loading="loading"
             :data="questionList"
-            height="640"
+            height="646"
             size="small"
+            border
           >
             <el-table-column
               header-align="center"
@@ -141,6 +142,7 @@
               header-align="center"
               label="隐患描述"
               prop="questionDesc"
+              :show-overflow-tooltip="true"
               v-if="columns[3].visible"
             />
 

src/views/resumption/plan/dialog.edit.vue

@@ -6,7 +6,7 @@
       :visible.sync="isShow"
       width="1500px"
     >
-      <div class="page-body">
+      <div class="page-body" v-loading="loading">
         <el-form
           :model="formData"
           :rules="formDataRules"
@@ -217,6 +217,20 @@
             :selectable="handleSelectable"
           ></el-table-column>
 
+
+          <el-table-column prop="ruleName" label="履职手册">
+          </el-table-column>
+          <el-table-column prop="itemName" label="履职项"> </el-table-column>
+          <el-table-column prop="pointName" label="履职内容" width="300px">
+            <template slot-scope="scope">
+              <pre>{{ scope.row.pointName }}</pre>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
+          </el-table-column>
+          <el-table-column prop="areaName" label="履职区域"> </el-table-column>
+          <el-table-column prop="checkName" label="履职点位" v-if="false">
+          </el-table-column>
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
               <el-switch
@@ -240,19 +254,6 @@
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="ruleName" label="履职手册">
-          </el-table-column>
-          <el-table-column prop="itemName" label="履职项"> </el-table-column>
-          <el-table-column prop="pointName" label="履职内容" width="300px">
-            <template slot-scope="scope">
-              <pre>{{ scope.row.pointName }}</pre>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
-          </el-table-column>
-          <el-table-column prop="areaName" label="履职区域"> </el-table-column>
-          <el-table-column prop="checkName" label="履职点位" v-if="false">
-          </el-table-column>
           <el-table-column label="操作">
             <template v-slot="{ row }">
               <el-button
@@ -301,6 +302,7 @@ export default {
     // let o=statusOptions;
     // debugger
     return {
+      loading: false,
       parentCount: 1,
       buildTime: null,
       isSubmitting: false,
@@ -803,12 +805,14 @@ export default {
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
+        if (!isValidate) return;
+        this.loading = true;
         // this.formData.planStatus = 0;
         this.isSubmitting = true;
         // this.formData.note = this.formData.description;
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
-        if (!isValidate) return;
+      
         this.formData.itemList = this.tableData == null ? [] : this.tableData;
         //新需求,自动填充角色
         if (
@@ -822,10 +826,20 @@ export default {
         }
         this.formData.roleList =
           this.selectedValues.length == 0 ? null : this.selectedValues;
-        await api.update(this.formData);
-        this.isSubmitting = false;
-        this.$emit("success");
-        this.onHide();
+
+        await api.update(this.formData).then((data) => {
+          this.isSubmitting = false;
+            this.loading = false;
+            this.$emit("success");
+            this.onHide();
+          })
+          .catch((err) => {
+            this.loading = false;
+            // console.log(err,"err")
+          });
+        
+        // this.$emit("success");
+        // this.onHide();
       });
     },
     handleRolesChange(val) {

src/views/resumption/plan/index.vue

@@ -23,9 +23,7 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="90px"
             >
-              <el-row>
                 <el-form-item label="行社名称">
                   <org-tree
                     v-model="queryParams.orgId"
@@ -69,7 +67,6 @@
                     />
                   </el-select>
                 </el-form-item>
-
                 <el-form-item prop="planCycle" label="任务周期">
                   <el-select
                     prop="planCycle"
@@ -87,8 +84,6 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <!-- </el-row>
-              <el-row> -->
                 <el-form-item prop="planStatus" label="任务状态">
                   <el-select
                     prop="planStatus"
@@ -116,9 +111,7 @@
                     clearable
                   />
                 </el-form-item>
-              </el-row>
               <el-row>
-                <el-form-item>
                   <el-button
                     type="primary"
                     icon="el-icon-search"
@@ -141,16 +134,16 @@
                     v-hasPermi="['system:user:add']"
                     >新增任务</el-button
                   >
-                </el-form-item>
+                <right-toolbar
+                  :showSearch.sync="showSearch"
+                  @queryTable="getList"
+
+                ></right-toolbar>
               </el-row>
               <!-- <el-row :gutter="10" >
             <el-col :span="1.5"> </el-col>
 
-            <right-toolbar
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
 
-            ></right-toolbar>
           </el-row> -->
             </el-form>
           </div>
@@ -158,7 +151,7 @@
 
           <el-table
             border
-            height="596"
+            height="594"
             size="small"
             v-loading="loading"
             :data="pageData"

src/views/resumption/protection/index.vue

@@ -140,7 +140,7 @@
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="640"
+            height="594"
           >
             <el-table-column
               header-align="center"

src/views/resumption/rule/index.vue

@@ -96,11 +96,12 @@
             </el-row>
           </div>
           <el-table
+            border
             size="small"
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            height="640"
+            height="646"
           >
             <el-table-column
               header-align="center"

src/views/resumption/taskManager/index.vue

@@ -132,7 +132,7 @@
           </div>
           <el-table
             border
-            height="580"
+            height="594"
             size="small"
             v-loading="loading"
             :data="pageData"

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -102,7 +102,7 @@
 
           <el-table
             border
-            height="650"
+            height="646"
             size="small"
             v-loading="loading"
             :data="dataList"

src/views/safetyBook/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '安全责任书存档记录详情' : '新增安全责任书存档记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="800px"
+      width="1200px"
     >
       <div class="page-body">
         <el-form
@@ -85,14 +85,18 @@
           style="width: 100%; margin-top: 10px"
           height="500px"
         >
-          <el-table-column prop="names" label="签署人">
+          <!-- <el-table-column prop="names" label="签署人">
             <template slot-scope="scope">
               <template v-for="item in scope.row.names">
                 {{ item }}
                 <br />
               </template>
             </template>
-          </el-table-column>
+          </el-table-column> -->
+          <el-table-column prop="partyA" label="甲方"> </el-table-column>
+          <el-table-column prop="partyAOrg" label="甲方机构"> </el-table-column>
+          <el-table-column prop="partyB" label="乙方"> </el-table-column>
+          <el-table-column prop="partyBOrg" label="乙方机构"> </el-table-column>
           <el-table-column prop="time" label="签署时间">
             <template slot-scope="r">
               {{ r.row.time ? dayjs(r.row.time).format("YYYY年MM月DD日") : "" }}