111

src/api/user.js

@@ -1,35 +1,32 @@
 import axios from "axios";
-export const GetDbwirldList = () => {
+axios.defaults.baseURL = "http://inspur.dev.umayle.com/";
-  return axios.get(
+
-    "http://111.229.30.246:10013/Handler/Config.ashx?action=queryanswer&mark=DB-IotLite_yx"
-  );
-};
 export const SaveUserAnswer = (data) => {
   return axios.post(
-    `http://111.229.30.246:10013/Handler/Config.ashx?action=updatecache&mark=${data.mark}&user_id=${data.user_id}&mark_value=${data.mark_value}`
+    `/Handler/Config.ashx?action=updatecache&mark=${data.mark}&user_id=${data.user_id}&mark_value=${data.mark_value}`
   );
 };
 export const GetUserAnswer = (data) => {
   return axios.get(
-    `http://111.229.30.246:10013/Handler/Config.ashx?action=querycache&mark=${data.mark}&user_id=${data.user_id}`
+    `/Handler/Config.ashx?action=querycache&mark=${data.mark}&user_id=${data.user_id}`
   );
 };
 export const GetTree = (data) => {
   return axios.get(
-    `http://111.229.30.246:10013/Handler/Config.ashx?action=queryacquisition&user_id=${data.user_id}&type=${data.type}`
+    `/Handler/Config.ashx?action=queryacquisition&user_id=${data.user_id}&type=${data.type}`
   );
 };
 export const SendTree = (data) => {
   return axios.get(
-    `http://111.229.30.246:10013/Handler/Config.ashx?action=updateacquisition&user_id=${data.user_id}&data=${data.data}&type=${data.type}`
+    `/Handler/Config.ashx?action=updateacquisition&user_id=${data.user_id}&data=${data.data}&type=${data.type}`
+  );
+};
+//获取各模块分数
+export const getGrade = (data) => {
+  return axios.get(
+    `/Handler/Config.ashx?action=displaychart&user_id=${data.user_id}&mark=${data.mark}`
   );
 };
-//最新拿缓存请求接口
-// export let GetUserAnswer = (data) => {
-//   return axios.get(
-//     `/Handler/Config.ashx?action=querycache&mark=${data.mark}&user_id=${data.user_id}`
-//   );
-// };
 
 //避免考生中途换电脑的解决方案  在每次拿取考试缓存数据的时候本地存储一份
 // function(mark,data) {

src/components/IpConfiguration.vue

@@ -196,7 +196,7 @@ export default {
       dialogVisible: true,
       labelPosition: "left",
       ruleForm: {
-        ippz_ip_hqfs: "Static IP",
+        ippz_ip_hqfs: "",
         ippz_dns_hqfs: "自动获取",
         ippz_ip: "",
         ippz_zwym: "",
@@ -316,6 +316,7 @@ export default {
       let res = await SaveUserAnswer({
         mark: "CKFWQ_yx",
         user_id: `${this.user_id}`,
+        // user_id: "USER202307301109254198",
         mark_value: JSON.stringify(datas),
       });
       console.log(res);
@@ -333,6 +334,7 @@ export default {
       let answers = await GetUserAnswer({
         mark: "CKFWQ_yx",
         user_id: `${this.user_id}`,
+        // user_id: "USER202307301109254198",
       });
       console.log(answers.data);
       if (answers.data.data && answers.data.state) {

src/components/NetworkManagement.vue

@@ -1,6 +1,17 @@
 <template>
   <div>
     <el-dialog title="网络管理" :visible.sync="dialogVisible" width="40%">
+      <p
+        style="
+          color: red;
+          position: absolute;
+          top: 20px;
+          left: 110px;
+          font-size: 18px;
+        "
+      >
+        本页面涉及排错，请检查修改默认值
+      </p>
       <h3 style="color: #fff">内网网卡</h3>
       <el-divider></el-divider>
       <el-table :data="tableData" style="width: 100%" border>
@@ -140,14 +151,14 @@ export default {
     return {
       user_id: "",
       type: "",
-      wlgl_nw_ip1: "",
+      wlgl_nw_ip1: "192",
-      wlgl_nw_ip2: "",
+      wlgl_nw_ip2: "168",
-      wlgl_nw_ip3: "",
+      wlgl_nw_ip3: "1",
-      wlgl_nw_ip4: "",
+      wlgl_nw_ip4: "1",
-      wlgl_nw_zwym1: "",
+      wlgl_nw_zwym1: "255",
-      wlgl_nw_zwym2: "",
+      wlgl_nw_zwym2: "255",
-      wlgl_nw_zwym3: "",
+      wlgl_nw_zwym3: "255",
-      wlgl_nw_zwym4: "",
+      wlgl_nw_zwym4: "0",
       wlgl_ww_ip1: "",
       wlgl_ww_ip2: "",
       wlgl_ww_ip3: "",

src/components/ObjectManagement.vue

@@ -110,8 +110,8 @@ export default {
       ip3: "",
       ip4: "",
       ruleForm: {
-        iplx: "IPV4",
+        iplx: "",
-        dxmc: "有线区交换机",
+        dxmc: "",
         ip: "",
       },
       rules: {
@@ -166,25 +166,37 @@ export default {
     },
     async SaveUserAnswer() {
       //拿本地存的数据
+      if (this.dxgl.length == 2) {
+        return false;
+      }
+      var json = JSON.parse(sessionStorage.getItem(this.$store.state.type));
+
       // console.log(this.dxgl);
-      var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
-      this.dxgl.push({
-        dx_name: this.ruleForm.dxmc,
-        iplx: this.ruleForm.iplx,
-        ip: this.ip1 + "." + this.ip2 + "." + this.ip3 + "." + this.ip4,
-      });
       let { data } = await SaveUserAnswer({
         mark: `${this.$store.state.type}`,
-        user_id: `${this.user_id}`,
+        user_id: this.user_id,
         mark_value: JSON.stringify({ ...json, ...{ dxgl: this.dxgl } }),
       });
       console.log(data.state);
       if (data.state) {
+        console.log(data.data.mark_value);
+        this.dxgl.push({
+          dx_name: this.ruleForm.dxmc,
+          iplx: this.ruleForm.iplx,
+          ip: this.ip1 + "." + this.ip2 + "." + this.ip3 + "." + this.ip4,
+        });
+        this.ruleForm.dxmc = "";
+        this.ruleForm.iplx = "";
+        this.ip1 = "";
+        this.ip2 = "";
+        this.ip3 = "";
+        this.ip4 = "";
         this.$message({
           message: "保存成功",
           type: "success",
         });
         this.dialogVisible1 = false;
+        this.GetUserAnswer();
       } else {
         this.$message.error("保存失败");
       }
@@ -192,7 +204,7 @@ export default {
     async GetUserAnswer() {
       let { data } = await GetUserAnswer({
         mark: `${this.$store.state.type}`,
-        user_id: `${this.user_id}`,
+        user_id: this.user_id,
       });
       if (data.state && data.data) {
         console.log(JSON.parse(data.data.mark_value).dxgl);
@@ -203,13 +215,13 @@ export default {
     },
     //删除
     async deleteRow(index, rows) {
+      var json = JSON.parse(sessionStorage.getItem(this.$store.state.type));
       this.dxgl.splice(index, 1);
-      var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
+      let { data } = await SaveUserAnswer({
-      let { data } = await {
         mark: `${this.$store.state.type}`,
-        user_id: `${this.user_id}`,
+        user_id: this.user_id,
         mark_value: JSON.stringify({ ...json, ...{ dxgl: this.dxgl } }),
-      };
+      });
       console.log(data.data);
       if (data.state) {
         this.$message({
@@ -221,7 +233,7 @@ export default {
       }
     },
     addObj() {
-      if (this.dxgl.length >= 2) {
+      if (this.dxgl.length == 2) {
         return;
       }
       this.dialogVisible1 = true;

src/components/PolicyManagement.vue

@@ -298,11 +298,13 @@ export default {
       let { data } = await SaveUserAnswer({
         mark: `${this.$store.state.type}`,
         user_id: `${this.user_id}`,
-        mark_value: JSON.stringify(localStorage.getItem("GYWZ_yx")),
+        mark_value: JSON.stringify(
+          localStorage.getItem(this.$store.state.type)
+        ),
       });
       if (data.state) {
         this.tableData.splice(index, 1);
-        var obj = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
+        var obj = JSON.parse(sessionStorage.getItem(this.$store.state.type));
         let newSessObj = {
           clgl_name: "",
           cmdlist_qsdz: "",
@@ -320,7 +322,7 @@ export default {
           clgl_mddk: "",
         };
         sessionStorage.setItem(
-          "GYWZ_yx",
+          this.$store.state.type,
           JSON.stringify({ ...obj, ...newSessObj })
         );
         this.$message({

src/components/PortConfiguration.vue

@@ -43,6 +43,7 @@
             <el-col :span="15">
               <el-select v-model="ruleForm.dkpz_sjw">
                 <el-option label="8" value="8"></el-option>
+                <el-option label="7" value="7"></el-option>
               </el-select>
             </el-col>
           </el-form-item>
@@ -151,7 +152,7 @@ export default {
       labelPosition: "left",
       ruleForm: {
         dkpz_btl: "",
-        dkpz_sjw: "",
+        dkpz_sjw: "8",
         dkpz_jyw: "",
         dkpz_tzw: "",
         dkpz_lkms: "",

src/views/Cockpit.vue

@@ -7,27 +7,27 @@
     </div>
     <div class="bottom">
       <div class="topBox">
-        <div>
+        <div v-if="clgrade && resultObj.YXDBWG">
           <span>25</span>
           <p>产量</p>
         </div>
-        <div>
+        <div v-if="zzgrade && resultObj.YXCHWG">
           <span>2130</span>
           <p>主轴转速</p>
         </div>
-        <div>
+        <div v-if="jtgrade && resultObj.WXDBWG">
           <span>1</span>
           <p>急停状态</p>
         </div>
-        <div>
+        <div v-if="qxgrade && resultObj.WXCHWG">
           <span>1090</span>
           <p>切削速度</p>
         </div>
-        <div>
+        <div v-if="yxgrade && resultObj.SerialServerYX">
           <span>21</span>
           <p>负载电流</p>
         </div>
-        <div>
+        <div v-if="wxgrade && resultObj.SerialServerWX">
           <span>19</span>
           <p>额定电流</p>
         </div>
@@ -36,39 +36,42 @@
         <p>
           <span>产量数据监控</span>
         </p>
-        <div id="productChart"></div>
+        <div id="productChart" v-show="clgrade && resultObj.YXDBWG"></div>
       </div>
 
       <div class="loadChart">
         <p>
           <span>负载电流监控</span>
         </p>
-        <div id="loadChart"></div>
+        <div id="loadChart" v-show="yxgrade && resultObj.SerialServerYX"></div>
       </div>
       <div class="chartsDiv">
         <div class="mainshaftChart">
           <p>
             <span>主轴转换监控</span>
           </p>
-          <div id="mainshaftChart"></div>
+          <div id="mainshaftChart" v-show="zzgrade && resultObj.YXCHWG"></div>
         </div>
         <div class="two">
           <p>
             <span>急停状态监控</span>
           </p>
-          <div id="two"></div>
+          <div id="two" v-show="jtgrade && resultObj.WXDBWG"></div>
         </div>
         <div class="one">
           <p>
             <span>切削速度监控</span>
           </p>
-          <div id="one"></div>
+          <div id="one" v-show="qxgrade && resultObj.WXCHWG"></div>
         </div>
         <div class="ratedChart">
           <p>
             <span>额定电流监控</span>
           </p>
-          <div id="ratedChart"></div>
+          <div
+            id="ratedChart"
+            v-show="wxgrade && resultObj.SerialServerWX"
+          ></div>
         </div>
       </div>
     </div>
@@ -85,6 +88,7 @@ import {
   CuttingSpeedChart,
   stopChart,
 } from "../util/chartConfig";
+import { getGrade } from "../api/user";
 export default {
   data() {
     return {
@@ -97,9 +101,25 @@ export default {
       data: "",
       time: "",
       timer: null,
+      user_id: "",
+      resultObj: {},
+      clgrade: "",
+      jtgrade: "",
+      zzgrade: "",
+      qxgrade: "",
+      yxgrade: "",
+      wxgrade: "",
     };
   },
   created() {
+    // DB网关有线-产量
+    // DB网关无线-急停状态
+    // 斥候网关有线-主轴转速
+    // 斥候网关无线-切削速度
+    // 上面四个要求设备连线、设备配置信息、设备上云配置信息都对才展示数据
+    // 有线串口 - 负载电流;
+    // 无线串口 - 额定电流;
+    // 这两个只要设备连线和设备配置信息对就展示数据;
     let that = this;
     window.getParameter = that.getParameter;
     this.time = this.$moment().format("HH:mm:ss");
@@ -109,10 +129,36 @@ export default {
     this.ratedChartOption = ratedChart;
     this.CuttingSpeedChartOption = CuttingSpeedChart;
     this.stopChartOption = stopChart;
+    // this.toObj(
+    //   "USER202307301109254198|YXDBWG,False;YXCHWG,True;WXDBWG,False;WXCHWG,False;SerialServerYX,False;SerialServerWX,False;"
+    // );
+    this.getClGrade();
+    this.getJtGrade();
+    this.getZzGrade();
+    this.getQxGrade();
+    this.getYxGrade();
+    this.getWxGrade();
   },
   methods: {
     getParameter(data) {
-      // alert(data);
+      this.toObj(data);
+    },
+    //获取三维数据
+    toObj(data) {
+      const inputString = data;
+      this.user_id = inputString.split("|")[0];
+      let str = inputString.split("|")[1];
+      // 分割成键值对数组
+      const keyValuePairs = str.split(";");
+      keyValuePairs.splice(keyValuePairs.length - 1, 1);
+      // 创建对象
+      const resultObject = {};
+      keyValuePairs.forEach((pair) => {
+        const [key, value] = pair.split(",");
+        resultObject[key] = value;
+      });
+      this.resultObj = resultObject;
+      console.log(this.resultObj);
     },
     //根据屏幕自适应图表字体
     fontSize(res) {
@@ -136,6 +182,54 @@ export default {
         myChart.resize();
       });
     },
+    //获取产量分数
+    async getClGrade() {
+      let { data } = await getGrade({
+        user_id: this.user_id,
+        mark: "DB-IotLite_yx",
+      });
+      this.clgrade = data.data;
+    },
+    //获取急停状态分数
+    async getJtGrade() {
+      let { data } = await getGrade({
+        user_id: this.user_id,
+        mark: "DB-IotLite_wx",
+      });
+      this.jtgrade = data.data;
+    },
+    //获取主轴转速分数
+    async getZzGrade() {
+      let { data } = await getGrade({
+        user_id: this.user_id,
+        mark: "CHGYWG_yx",
+      });
+      this.zzgrade = data.data;
+    },
+    //获取切削速度分数
+    async getQxGrade() {
+      let { data } = await getGrade({
+        user_id: this.user_id,
+        mark: "CHGYWG_wx",
+      });
+      this.qxgrade = data.data;
+    },
+    //获取有线串口分数
+    async getYxGrade() {
+      let { data } = await getGrade({
+        user_id: this.user_id,
+        mark: "CKFWQ_yx",
+      });
+      this.yxgrade = data.data;
+    },
+    //获取无线串口分数
+    async getWxGrade() {
+      let { data } = await getGrade({
+        user_id: this.user_id,
+        mark: "CKFWQ_wx",
+      });
+      this.wxgrade = data.data;
+    },
   },
   mounted() {
     this.getLoadEcharts("productChart", this.productChartOption);