Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/echarts_lysd/eP3.vue

@@ -31,7 +31,7 @@ const pieData = [
   { name: "博士", value: 121 },
   { name: "其他", value: 121 },
 ];
-const YData = pieData.map((item) => item.value);
+const YData = data.list.map((item) => item.value);
 const sum = YData.reduce((item, index) => item + index, 0); // 求数据之和
 
 var scale = 1;
@@ -105,7 +105,7 @@ const getOption = () => {
         type: "pie",
         radius: ["25%", "45%"],
         center: ["50%", "50%"],
-        data: pieData,
+        data: data.list,
         avoidLabelOverlap: true, // 开启智能布局 (防止折线位置冲突)
         label: {
           normal: {
@@ -203,6 +203,9 @@ const setChart = () => {
 
 onBeforeMount(() => {
   setTimeout(() => {
+    data.list = props.list;
+    console.log(666,data.list);
+    
     getOption();
     setChart();
   }, 600);

src/view/sy_details.vue

@@ -708,9 +708,18 @@ const listAssignment = () => {
   data.tableData = [];
   data.tableData1 = [];
   data.tableData2 = [];
+  pagination.url = "";
+  pagination1.url = "";
+  pagination2.url = "";
+  if (data.name == "食品安全监管" || data.name == "药品安全监管") {
+    pagination.url = "/api/ggfwyth/pg/spypqy";
+    pagination1.url = "/api/ggfwyth/pg/fwnrqd";
+    pagination2.url = "/api/ggfwyth/pg/spypqy";
+  } else {
     pagination.url = "/api/ggfwyth/pg/fwdxqd";
     pagination1.url = "/api/ggfwyth/pg/fwnrqd";
     pagination2.url = "/api/ggfwyth/pg/fwjgqd";
+  }
   getTable(pagination);
   getTable(pagination1);
   getTable(pagination2);
@@ -753,7 +762,7 @@ const rowState = (row) => {
 onMounted(() => {
   if (routers.query.name) {
     data.name = routers.query.name;
-    if (data.name == "食品安全监管") {
+    if (data.name == "食品安全监管" || data.name == "药品安全监管") {
       data.columns = [];
       data.column_2 = [];
       data.columns = [

src/view/sy_table.vue

@@ -287,16 +287,16 @@ const data = reactive({
       img: icon3,
       visible: false,
       son: [
+        // {
+        //   id: "0",
+        //   name: "概况",
+        // },
         {
           id: "0",
-          name: "概况",
-        },
-        {
-          id: "1",
           name: "就业创业服务",
         },
         {
-          id: "2",
+          id: "1",
           name: "工伤失业保险服务",
         },
       ],
@@ -568,7 +568,6 @@ const tapshow = (parentId, childId) => {
     childId == 0 &&
     (parentId.name == "幼有所育" ||
       parentId.name == "弱有所扶" ||
-      parentId.name == "劳有所得" ||
       parentId.name == "学有所教" ||
       parentId.name == "老有所养" ||
       parentId.name == "病有所医" ||
@@ -588,7 +587,6 @@ const tapshow = (parentId, childId) => {
     const menuName = [
       "幼有善育",
       "学有优教",
-      "劳有所得",
       "病有良医",
       "老有康养",
       "住有宜居",
@@ -631,9 +629,11 @@ const gaikuang = (name) => {
     gaikuangList.work = true;
   } else if (name == "学有所教") {
     gaikuangList.education = true;
-  } else if (name == "劳有所得") {
-    gaikuangList.lysd = true;
-  } else if (name == "老有所养") {
+  } 
+  // else if (name == "劳有所得") {
+  //   gaikuangList.lysd = true;
+  // } 
+  else if (name == "老有所养") {
     gaikuangList.yl = true;
   } else if (name == "病有所医") {
     gaikuangList.hygiene = true;

src/view/table_gk/gk_lysd.vue

@@ -50,7 +50,7 @@
             <i></i>
           </div>
         </div>
-        <eP3></eP3>
+        <eP3 :list="data.rczy"></eP3>
       </div>
     </div>
 
@@ -208,7 +208,7 @@ const data = reactive({
       show: true,
       data: ["0", "0", "0", "0", "0", "0"], //五级/初级工
     },
-  ],//新增技能人才数
+  ], //新增技能人才数
   jnrcs: {
     month: [],
   }, //新增技能人才数月份
@@ -217,7 +217,13 @@ const data = reactive({
     zd: [], //重点
   }, // 失业率
   jyfws: {}, // 就业服务
-  rczy: {}, // 人才资源统计
+  rczy: [
+    { name: "大专", value: 0 },
+    { name: "大学本科", value: 0 },
+    { name: "研究生", value: 0 },
+    { name: "博士", value: 0 },
+    { name: "其他", value: 0 },
+  ], // 人才资源统计
   sybx: {}, // 失业保险概况
   gsbx: {
     list1:[100,200,300],
@@ -274,7 +280,12 @@ const getData = async () => {
       data.syl.bf = res.data.syl.bf; // 失业率 帮扶
       data.syl.zd = res.data.syl.zd; // 失业率 重点
       updateEmploymentValues(data.employmentList, res.data.jyfws); //就业服务
-      data.rczy = res.data.rczy; // 人才资源统计
+      data.rczy[0].value = res.data.rczy.dz; // 人才资源统计
+      data.rczy[1].value = res.data.rczy.bk; // 人才资源统计
+      data.rczy[2].value = res.data.rczy.yjs; // 人才资源统计
+      data.rczy[3].value = res.data.rczy.bs; // 人才资源统计
+      data.rczy[4].value = res.data.rczy.qt; // 人才资源统计
+
       data.sybx = res.data.sybx; // 失业保险概况
       data.gsbx = res.data.gsbx; //工伤保险
     }
@@ -282,7 +293,7 @@ const getData = async () => {
 };
 
 onBeforeMount(async () => {
-  // getData();
+  getData();
 });
 onMounted(() => {});
 </script>