fit:案件核查大屏（案件问题性质、禁闭处理情况）;

src/api/screen/caseVerif.ts

@@ -16,6 +16,22 @@ export function getCaseProblemProperty(times) {
     });
 }
 
+/**
+ * 获取案件性质数据
+ * */
+export const getCaseType=(times)=>{
+    return request.get({
+        url:`/datav/caseVerif/getCaseType?beginTime=${times[0]}&endTime=${times[1]}`
+    })
+}
+/**
+ * 获取禁闭处理情况
+ * */
+export const getConfinementBar =(times)=>{
+    return request.get({
+        url:`/datav/caseVerif/getConfinementBar?beginTime=${times[0]}&endTime=${times[1]}`
+    })
+}
 
 
 export function getCaseVerificationCount(times) {

src/components/negative/verify.vue

@@ -667,7 +667,11 @@
                   >
                     <el-radio-group
                         v-model="item.superviseMeasuresCode"
-                        clearabled
+                        @change="val => {
+                          if(item.superviseMeasuresCode != 1){
+                           item.confinementId = null
+                          }
+                        }"
                     >
                       <el-radio
                           v-for="dictItem in dict.superviseMeasures"
@@ -698,9 +702,10 @@
                 </el-col>
               </template>
             </el-row>
-            <el-row>
+            <el-row  v-if="item.superviseMeasuresCode == 1">
               <el-col>
                 <el-form-item label="禁闭关联">
+<!--                {{item.superviseMeasuresCode}}-->
                   <el-select v-model="item.confinementId"
                              filterable
                              remote
@@ -1639,6 +1644,9 @@ const negative = inject("negative");
 const form = ref({
   handlePolices: [{}],
 });
+
+
+
 //禁闭信息数组
 
 let confinementOpens = ref([])
@@ -1962,7 +1970,7 @@ async function validate() {
 function getData() {
   return form.value;
 }
-
+console.log('dict.superviseMeasures',dict)
 defineExpose({
   validate,
   getData,

src/views/datav/CaseVerif.vue

@@ -190,7 +190,9 @@ import {
   getCaseVerificationMap,
   getCaseProblemProperty,
   getConfinementAndPause,
-  getCaseVerificationCount
+  getCaseVerificationCount,
+  getCaseType,
+  getConfinementBar
 } from "@/api/screen/caseVerif.ts";
 import {circularChart} from "@/views/datav/simulateData/AnimationTestData.js";
 import {mapOrgNameMapping} from "@/enums/orgMapping.js";
@@ -508,17 +510,31 @@ const tzcloption = ref({
 
 
 // region 所有函数
+const getCaseTypeFun = async(timeValue)=>{
+  const res = await getCaseType(timeValue);
+  console.log(res);
+  zfbaPieOption.value.series[0].data = res.enforceList;
+  fwglPieOption.value.series[0].data=res.interiorList;
+  jgjjPieOption.value.series[0].data=res.disciplineList
+}
+
+const getConfinementBarFun = async(timeValue) =>{
+  const  res = await  getConfinementBar(timeValue);
+  jbcloption.value.series[0].data=res.confinementList;
+}
+
+
 const getCaseVerificationRankData = async (timeValue) => {
   const res = await getCaseVerificationRank(timeValue);
   fxsjBarList.value = res.fxsjRankList
   jsdwBarList.value = res.jsdwRankList
 }
-const getCaseProblemPropertyData = async (timeValue) => {
-  const res = await getCaseProblemProperty(timeValue);
-  zfbaPieOption.value.series[0].data = res.zfbaPieList;
-  // zfbaPieOption.value.series[0].data = circularChart
-  fwglPieOption.value.series[0].data = res.fwglPieList;
-}
+// const getCaseProblemPropertyData = async (timeValue) => {
+//   const res = await getCaseProblemProperty(timeValue);
+//   zfbaPieOption.value.series[0].data = res.zfbaPieList;
+//   // zfbaPieOption.value.series[0].data = circularChart
+//   fwglPieOption.value.series[0].data = res.fwglPieList;
+// }
 const getCaseVerificationCountData = async (timeValue) => {
   const res = await getCaseVerificationCount(timeValue)
   overview.value = res.overview
@@ -551,21 +567,24 @@ const getCaseSourceRateAndDealSituationData = async (timeValue) => {
   // ajlyPieOption.value.series[0].data = circularChart
   wzclPieOption.value.series[0].data = res.dealSituationPieList
 }
-const getConfinementAndPauseData = async (timeValue) => {
-  const res = await getConfinementAndPause(timeValue);
-  jbcloption.value.series[0].data = res.jbclList;
-  // jbcloption.value.series[0].data = circularChart
-  tzcloption.value.series[0].data = res.dzclList;
-}
+// //停职和禁闭处理之前的接口
+// const getConfinementAndPauseData = async (timeValue) => {
+//   const res = await getConfinementAndPause(timeValue);
+//   // jbcloption.value.series[0].data = res.jbclList;
+//   // jbcloption.value.series[0].data = circularChart
+//   tzcloption.value.series[0].data = res.dzclList;
+// }
 
 function getData() {
   getCaseVerificationRankData(time.value);
-  getCaseProblemPropertyData(time.value)
+  // getCaseProblemPropertyData(time.value)
   getCaseVerificationCountData(time.value);
   getCaseVerificationMapData(time.value);
   getCaseVerificationTrendData(selectedYear.value);
   getCaseSourceRateAndDealSituationData(time.value);
-  getConfinementAndPauseData(time.value);
+  // getConfinementAndPauseData(time.value);
+  getCaseTypeFun(time.value)
+  getConfinementBarFun(time.value)
 }
 
 // endregion

src/views/datav/Jwpy.vue

@@ -367,15 +367,15 @@ const toggleSelect=()=> {
 // region 下拉框
 const handleYearChange = (checkedYear) => {
   toggleSelect()
-  console.log(checkedYear)
-   // yearValue.value= years.value.find(s=>s.ID === checkedYear).PeriodName;
+
+   yearValue.value= years.value.find(s=>s.ID == checkedYear).PeriodName;
   console.log("年份" + selectYear.value + "  月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
   getData();
 
 }
 const handleMonthChange = (checkedMonth) => {
   toggleSelect()
-  // monthValue.value= months.value.find(s=>s.ID === checkedMonth).SonPeriodName;
+   monthValue.value= months.value.find(s=>s.ID === checkedMonth).SonPeriodName;
   console.log(monthValue.value)
   console.log("年份" + selectYear.value + "  月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
   getData();
@@ -387,7 +387,7 @@ const handleOrgChange = async (checkedOrg) => {
     // 使用 await 等待异步操作完成   因为要等返回选中第一个 task 之后才能发送正确的请求
     content.value = await GetOffLineStatisticsSetList(selectOrg.value);
     task.value = content.value[0].ID;
-    // taskValue.value= content.value[0].text;
+    taskValue.value= content.value[0].text;
     // 找到对应单位在地图上的位置
     const targetName = mapDataList.value.find(item => item.value === checkedOrg).name;
     const chart = echarts.getInstanceByDom(document.querySelector('.map-option'));
@@ -405,7 +405,7 @@ const handleOrgChange = async (checkedOrg) => {
 // 任务选项改变时
 const handleTaskChange = (checkedTask) => {
   toggleSelect()
-  // taskValue.value= task.value.find(s=>s.ID === checkedTask).SetName;
+  taskValue.value= task.value.find(s=>s.ID === checkedTask).SetName;
   console.log("年份" + selectYear.value + "  月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
   getData();
 }
@@ -757,6 +757,7 @@ const option4 = ref({
 
 // region 初始化
 onMounted(async () => {
+
   await getDistributionFun();
   // 年
   const resYears = await GetMyPeriod();
@@ -767,8 +768,8 @@ onMounted(async () => {
 
   if (years.value.length > 0) {
     selectYear.value = years.value[0].ID; // 选择第一个年份
-    console.log("第一个年份" + selectYear.value)
-    // yearValue.value = years.value[0].PeriodName;
+
+    yearValue.value = years.value[0].PeriodName;
     console.log('yearValue',years.value)
   }
 
@@ -790,8 +791,8 @@ onMounted(async () => {
       months.value.unshift({SonPeriodName: '全年', ID: '-1'});
     }
     selectMonth.value = months.value[0].ID;
-    // monthValue.value = months.value[0].SonPeriodName;
-    console.log('monthValue.value',months.value)
+    monthValue.value = months.value[0].SonPeriodName;
+    console.log('months.value',months.value)
   }
 
   // 组织机构
@@ -799,16 +800,16 @@ onMounted(async () => {
   org.value = resOrgs;
   if (org.value.length > 0) {
     selectOrg.value = org.value[0].id;
-    console.log('selectOrg.value',org.value);
-    // orgValue.value = org.value[0].text;
+    console.log('org.value',org.value);
+    orgValue.value = org.value[0].text;
   }
 
   const resTasks = await GetOffLineStatisticsSetList(selectOrg.value);
   content.value = resTasks;
   if (content.value.length > 0) {
     task.value = content.value[0].ID;
-    console.log('task.value', content.value)
-    // taskValue.value = content.value[0].SetName;
+    console.log('content.value', content.value)
+    taskValue.value = content.value[0].SetName;
   }
   // 获取数据
   await getData();
@@ -820,15 +821,19 @@ async function getData() {
   // 调查情况
   GetDCQK(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => {
     reviewOk.value = res
+    console.log('调查情况',reviewOk.value)
   });
-  console.log('-----调查情况----')
+
   // 调查满意度
   GetGLFW(selectYear.value, selectOrg.value, task.value).then((res) => {
     dcmyd.value = res
-    option1.value.xAxis.data = dcmyd.value[0].lstson.slice(-6).map(item => item.SonPeriodName);
-    option1.value.series[0].data = dcmyd.value[0].lstson.slice(-6).map(item => item.FinalRP);
+    console.log('-----调查满意度----',dcmyd.value)
+
+
+    option1.value.xAxis.data = dcmyd.value[0].lstson.slice(new Date().getMonth()+1).map(item => item.SonPeriodName);
+    option1.value.series[0].data = dcmyd.value[0].lstson.slice(new Date().getMonth()+1).map(item => item.FinalRP);
   });
-  console.log('-----调查满意度----')
+
   // 业务满意率
   GetZRSJXF(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => {
     let temp = res.lstShen
@@ -845,13 +850,15 @@ async function getData() {
     const group3 = temp.filter(item => item.SetName === "(省)区");
     tableData2.value = group2
     tableData3.value = group3
+    console.log('综合满意度排名.value', tableData1.value)
   });
 
   // 不满意样本趋势
   GetBMYYBQS(selectYear.value, selectOrg.value, task.value).then((res) => {
-    bmyybqs.value = res;
+    bmyybqs.value = res?res:[];
     option2.value.xAxis.data = bmyybqs.value.map(item => item.SonPeriodName);
     option2.value.series[0].data = bmyybqs.value.map(item => item.QACount);
+    console.log('不满意样本趋势.value', bmyybqs.value)
   });
 
   // 单项分析
@@ -861,6 +868,7 @@ async function getData() {
     option3.value.series[0].data = dxfx.value[0].lstson.map(item => item.FinalRP);   // 本周期
     option3.value.series[1].data = dxfx.value[1].lstson.map(item => item.FinalRP);   // 上一期
     option3.value.series[2].data = dxfx.value[2].lstson.map(item => item.FinalRP);   // 去年同期
+    console.log('单项分析.value', dxfx.value)
   });
 
   // 单项调查情况
@@ -877,6 +885,7 @@ async function getData() {
       return {name: org.OrganizeName, value: org.OrganizeID};
     })
     option.value.series.data = mapDataList.value
+    console.log('tempMap.value',tempMap.value)
   });
 
   getDistributionFun();