解决冲突

src/views/vent/home/clique/index.vue

@@ -107,49 +107,63 @@
     }, 10000);
   }
 
-//获取公司端首页数据
-async function getHomeDataList() {
-  let res = await getHomeData();
-  if (res && res.length > 0) {
-    earlyWarn.value = res;
-    roadData.totallength = res.reduce((len, r) => {
-      return r.sys_data ? len + r.sys_data.totallength : len;
-    }, 0);
-    roadData.data.length = 0;
-    roadData.data1.length = 0;
-    airKjStatus.length = 0;
-    const warningListTemp: { orgcode: string; isWarning: boolean }[] = [];
-    res.forEach((el) => {
-      airKjStatus.push({
-        deviceName: el.sys_data.deviceName,
-        jf: el.sys_data.zongjinfeng,
-        xf: el.sys_data.xufengliang,
-        hf: el.sys_data.zonghuifeng,
-        isWarning: el.sys_data.zongjinfeng < el.sys_data.xufengliang,
-      });
+  //获取公司端首页数据
+  async function getHomeDataList() {
+    let res = await getHomeData();
+    if (res && res.length > 0) {
+      earlyWarn.value = res;
+      roadData.totallength = res.reduce((len, r) => {
+        return r.sys_data ? len + r.sys_data.totallength : len;
+      }, 0);
+      roadData.data.length = 0;
+      roadData.data1.length = 0;
+      airKjStatus.length = 0;
+      const warningListTemp: { orgcode: string; isWarning: boolean }[] = [];
+      res.forEach((el) => {
+        airKjStatus.push({
+          deviceName: el.sys_data.deviceName,
+          jf: el.sys_data.zongjinfeng,
+          xf: el.sys_data.xufengliang,
+          hf: el.sys_data.zonghuifeng,
+          isWarning: el.sys_data.zongjinfeng < el.sys_data.xufengliang,
+        });
 
-      //临时添加，前端判断，后期后端加上预警再处理
-      if (el.sys_data.zongjinfeng < el.sys_data.xufengliang) {
-        warningListTemp.push({ orgcode: el.orgcode, isWarning: true });
-      } else {
-        warningListTemp.push({ orgcode: el.orgcode, isWarning: false });
-      }
+        //临时添加，前端判断，后期后端加上预警再处理
+        if (el.sys_data.zongjinfeng < el.sys_data.xufengliang) {
+          warningListTemp.push({ orgcode: el.orgcode, isWarning: true });
+        } else {
+          warningListTemp.push({ orgcode: el.orgcode, isWarning: false });
+        }
 
-      roadData.data.push(el.sys_data.flength);
-      // roadData.data.push(el.sys_data.totallength);
-      roadData.data1.push(el.sys_data.deviceName);
-    });
-    warningList.value = warningListTemp;
-    compositeData.value = res.reduce((arr, e) => {
-      return [...arr, ...e.majorpath_data];
-    }, []);
-    centerDetail.value = res.filter((v) => v.orgcode == orgcode.value)[0];
+        roadData.data.push(el.sys_data.flength);
+        // roadData.data.push(el.sys_data.totallength);
+        roadData.data1.push(el.sys_data.deviceName);
+      });
+      warningList.value = warningListTemp;
+      compositeData.value = res.reduce((arr, e) => {
+        return [...arr, ...e.majorpath_data];
+      }, []);
+      centerDetail.value = res.filter((v) => v.orgcode == orgcode.value)[0];
+    }
   }
-}
-//获取文件共享中心数据
-async function getLists() {
-  let res = await getList();
-  if (res.length != 0) {
+  //获取文件共享中心数据
+  async function getLists() {
+    let res = await getList();
+    if (res.length != 0) {
+      shareData.length = 0;
+      res.forEach((el) => {
+        shareData.push({ title: el.sysOrgName, value: el.tolalNum, value1: el.approveNum });
+      });
+    }
+  }
+
+  function showDetail(code, label, leftV, topV) {
+    if (code) {
+      orgcode.value = code;
+      dialogTitle.value = label;
+      isShowDialog.value = true;
+      getHomeDataList();
+    }
     nextTick(() => {
       const tooltipDom = document.getElementById('detailModal') as HTMLElement;
       tooltipDom.style.left = leftV;