新增页面

src/main/java/com/baosight/hpjx/core/security/UserSessionUtils.java

@@ -34,7 +34,7 @@ public class UserSessionUtils extends UserSession {
 		EiInfo eiInfo = new EiInfo();
 		eiInfo.set("loginName", UserSession.getLoginName());
 		eiInfo.set(EiConstant.serviceName, "HPXSUser");
-		eiInfo.set(EiConstant.methodName, "getUser");
+		eiInfo.set(EiConstant.methodName, "getUserByLogin");
 		EiInfo outInfo = XLocalManager.call(eiInfo);
 		// -1表示报错
 		if (outInfo.getStatus() == -1) {

src/main/webapp/HP/BI/components/hipi/003/home-echarts.vue

 <template>
-  <div ref="chartContainer" :style="{ width: '100%', height: '40vh' }"></div>
+  <div ref="chartContainer" :style="{ width: width+'vw', height: height + 'vh' }"></div>
 </template>
 
 <script>
 module.exports = {
   props: {
-    option: Object
+    option: {
+      type: Object,
+      required: true,
+    },
+    height: {
+      type: Number,
+      default: 40
+    },
+    width: {
+      type: Number,
+      default: 100
+    }
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  watch: {
+    option: {
+      handler(newVal) {
+        if (this.chart) {
+          this.chart.setOption(newVal);
+        }
+      },
+      deep: true, // 监听对象内部属性的变化
+      immediate: true, // 在绑定时立即执行一次监听器
+    },
   },
   mounted() {
     this.initChart();
@@ -26,7 +53,7 @@ module.exports = {
       if (this.chart) {
         this.chart.resize();
       }
-    }
-  }
+    },
+  },
 };
 </script>

src/main/webapp/HP/BI/components/hipi/003/home-page-left.vue

@@ -10,7 +10,7 @@
         <div v-for="(item,index) in queryInfoList"
         :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px"
         >
-           <div class="content-main-title">{{ queryDataObject[3-index]}}</div>
+           <div class="content-main-title">{{ queryDataObject[item]}}</div>
            <img src="../../hpjx/common/img/production-icon.png" class="production-icon" alt/>
            <div class="content-main-footer">{{queryRCLList[index]}}</div>
         </div>
@@ -23,10 +23,10 @@
         </div>
       </div>
       <div class="page-content-main">
-        <div v-for="(item,index) in queryInfoList"
+        <div v-for="(item,index) in queryMonthList"
              :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px"
         >
-          <div class="content-main-title">{{ queryMonthObject[3-index]}}</div>
+          <div class="content-main-title">{{ queryMonthObject[item]}}</div>
           <img src="../../hpjx/common/img/production-icon.png" class="production-icon" alt/>
           <div class="content-main-footer">{{queryRCLList[index]}}</div>
         </div>
@@ -39,10 +39,10 @@
         </div>
       </div>
       <div class="page-content-main">
-        <div v-for="(item,index) in queryInfoList"
+        <div v-for="(item,index) in queryYearList"
              :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px"
         >
-          <div class="content-main-title">{{ queryYearObject[3-index]}}</div>
+          <div class="content-main-title">{{ queryYearObject[item]}}</div>
           <img src="../../hpjx/common/img/production-icon.png" class="production-icon" alt/>
           <div class="content-main-footer">{{queryRCLList[index]}}</div>
         </div>
@@ -84,17 +84,8 @@ module.exports = {
       inInfo.set('inqu_status-0-date',this.datapicker)
       IPLAT.EiCommunicator.send('HPBI003', 'queryRCLInfo', inInfo, {
             onSuccess: function (res) {
-              console.log('queryRCLInfo',res)
-              if(undefined != res.blocks.result.rows[0] && undefined != res.blocks.result.meta.metas){
-                // const queryRCLInfoList = res.blocks.result.rows[0];
-                // const tempMetas = res.blocks.result.meta.metas;
-                // const queryData = Object.entries(tempMetas).reduce((acc, [key, value], index) => {
-                //   acc[key] = queryRCLInfoList[index] || 0;
-                //   return acc;
-                // }, {});
-                // _this.queryDataObject = _this.queryInfoList.map(item => queryData[item] || null);
-                // console.log('_this.queryDataObject',_this.queryDataObject)
-                _this.queryDataObject = res.blocks.result.rows[0];
+              if(undefined != res.extAttr.result[0]){
+                _this.queryDataObject = res.extAttr.result[0];
               }
             },
             onFail: function (err) {
@@ -109,21 +100,10 @@ module.exports = {
       var inInfo = new EiInfo();
       inInfo.set('inqu_status-0-factoryCode',this.factory)
       inInfo.set('inqu_status-0-date',this.datapicker)
-      // inInfo.set('requestList','[{\\"ids\\":[\\"show65\\"],\\"params\\":\\"\\"}]')
       IPLAT.EiCommunicator.send('HPBI003', 'queryYCLinfo', inInfo, {
             onSuccess: function (res) {
-              console.log('queryYCLinfo',res)
-              if(undefined != res.blocks.result.rows[0] && undefined != res.blocks.result.meta.metas){
-                // const queryRCLInfoList = res.blocks.result.rows[0];
-                // const tempMetas = res.blocks.result.meta.metas;
-                //
-                // const queryData = Object.entries(tempMetas).reduce((acc, [key, value], index) => {
-                //   acc[key] = queryRCLInfoList[index] || 0;
-                //   return acc;
-                // }, {});
-                // _this.queryMonthObject = _this.queryMonthList.map(item => queryData[item] || null);
-                // console.log('_this.queryMonthObject',_this.queryMonthObject)
-                _this.queryMonthObject = res.blocks.result.rows[0];
+              if(undefined != res.extAttr.result[0]){
+                _this.queryMonthObject = res.extAttr.result[0];
               }
             },
             onFail: function (err) {
@@ -140,18 +120,8 @@ module.exports = {
       inInfo.set('inqu_status-0-date',this.datapicker)
       IPLAT.EiCommunicator.send('HPBI003', 'queryNCLinfo', inInfo, {
             onSuccess: function (res) {
-              console.log('queryNCLinfo',res)
-              if(undefined != res.blocks.result.rows[0] && undefined != res.blocks.result.meta.metas){
-                // console.log('queryNCLinfo',res)
-                // const queryRCLInfoList = res.blocks.result.rows[0];
-                // const tempMetas = res.blocks.result.meta.metas;
-                // const queryData = Object.entries(tempMetas).reduce((acc, [key, value], index) => {
-                //   acc[key] = queryRCLInfoList[index] || 0;
-                //   return acc;
-                // }, {});
-                // _this.queryYearObject = _this.queryYearList.map(item => queryData[item] || null);
-                // console.log('_this.queryYearObject',_this.queryYearObject)
-                _this.queryYearObject = res.blocks.result.rows[0]
+              if(undefined != res.extAttr.result[0]) {
+                _this.queryYearObject = res.extAttr.result[0];
               }
             },
             onFail: function (err) {