20230322

src/components/target/typeChart.vue

@@ -45,7 +45,7 @@
                     </div>
                     <div style="font-size: 30px; font-weight: bold" v-if="title == '排队数'">
                         <span style="font-size: 15px;">排队数</span><br />
-                        <span style="font-size: 30px; font-weight: bold">{{ queue }}</span>
+                        <span style="font-size: 30px; font-weight: bold">{{ newDataArr[0].n_queue }}</span>
                     </div>
                     <div style="font-size: 30px; font-weight: bold" v-if="title == '检测数'">
                         <span style="font-size: 15px;">检测数</span><br />
@@ -144,7 +144,6 @@ export default {
             // 流量数值
             flow: 0,
             isRefer: true,
-
             valueShow: {},
             //排队数
             queue: '',
@@ -159,8 +158,8 @@ export default {
     methods: {
         // 计算类型数量的总和
         getDataArr(val) {
-            this.newDataArr = val
+            
-            this.getNewQueue(this.newDataArr)
+            this.getNewQueue(val)
         },
         getTotal(dataArr) {
             if (this.title == '类型') {
@@ -171,20 +170,27 @@ export default {
         },
         // 计算类型的数值
         getNewQueue(val) {
-           
+           console.log("val",val)
+           this.newDataArr = val
             if (val[0].n_queue) {
-                this.queue = val[0].n_queue;
+                this.newDataArr[0].n_queue = val[0].n_queue;
-            } else if (val[0].ave_queue) {
+            }  
-                this.queue = val[0].ave_queue;
+            if (val[0].ave_queue) {
-            } else if (val[0].headway) {
+                this.newDataArr[0].n_queue = val[0].ave_queue;
+            } 
+            if (val[0].headway) {
                 this.newDataArr[0].headway = val[0].headway;
-            } else if (val[0].ave_headway) {
+            } 
+             if (val[0].ave_headway) {
                 this.newDataArr[0].headway = val[0].ave_headway;
-            }else if (val[0].n_stay) {
+            }
+             if (val[0].n_stay) {
                 this.newDataArr[0].n_stay = val[0].n_stay;
-            } else if (val[0].ave_stay) {
+            }
+             if (val[0].ave_stay) {
                 this.newDataArr[0].n_stay = val[0].ave_stay;
             }
+            
         },
 
     },

src/config/apiurl.js

@@ -24,7 +24,7 @@ export default {
     //编辑保存组件弹窗传参
     setHostName: 'http://172.16.1.168:5000/api/SetHostName',
     setHostTime: 'http://172.16.1.168:5000/api/SetHostTime',
-    // changePassowrd:'http://172.16.1.168:5000/api/ChangePassword'
+    changePassowrd:'http://172.16.1.168:5000/api/ChangePassword'
     // `http://${ipUurl}:5000/api/AddShipjk`
     // dataUrl: `http://${ipUurl}:5000/api/AddShipjk`,
     // getSpareElementOrder: `http://${ipUurl}:5000/api/Upload`,

src/views/bounced/analysisConfiguration.vue

@@ -757,8 +757,8 @@ export default {
         OnSceneload(newV) {
               var ip = window.location.host;
             this.ipData = 'http://' + ip.split(':')[0] + ':5000';
-            this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
+            // this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
-            //  this.$refs.analysisWeb.contentWindow.getIpData(this.ipData);
+             this.$refs.analysisWeb.contentWindow.getIpData(this.ipData);
             this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
             this.unityDone = true;
               window.publish('Custom',JSON.stringify({"type":'getImage',"videoid":this.$route.query.id})); 

src/views/general/network.vue

@@ -270,24 +270,37 @@ export default {
       let valdata2 = value.split('/')[1];
       console.log("valdata",valdata)
        console.log("valdata2",valdata2)
+       
+       let valdata3 = value.split('/')[2];
       let isCorrect = true;
       if (valdata.length) {
         for (let i = 0; i < valdata.length; i++) {
+          const re = /^[0-9]*[1-9][0-9]*$/;
+      const rsCheck = re.test(value);  
+        // if (regexp.test(valdata[i]) == false&&!Number(valdata2)&&(valdata2 < 1 || valdata2 > 32)&&valdata3&&!rsCheck) {
         if (regexp.test(valdata[i]) == false) {
+            isCorrect = false;
+            callback(new Error('请输入正确的IP地址'));        
+          }else{
              if (!Number(valdata2)) {
-            // callback(new Error('请输入整数，值为[1,32]'));
+
                 isCorrect = false;
                  callback(new Error('请输入正确的IP地址'));
             } else {
             if (valdata2 < 1 || valdata2 > 32) {
                 callback(new Error('请输入整数，值为[1,32]'));
                 isCorrect = false;
-                } else {
+                } 
-            callback();
+                 if(valdata3){
+                isCorrect = false;
+                 callback(new Error('请输入正确的IP地址'));
             }
                 }
                
           }
+           
+            
+        
         }
       }
     }
@@ -362,7 +375,7 @@ export default {
                 }
             ],
             sizeForm: {
-                name: 'eth0',
+                name: '',
                 region: '00:11:14:1a:62:fe',
                 MTU: '1500',
                 date2: '',
@@ -432,8 +445,8 @@ export default {
             },
             options: [
                 {
-                    value: 'eth0',
+                    value: '',
-                    label: 'eth0'
+                    label: ''
                 },
                 //  {
                 //     value: 'wlan0',
@@ -443,7 +456,7 @@ export default {
             //数据获取
             netWork:[
                {
-                    name: 'eth0',
+                    name: '',
                 region: '00:11:14:1a:62:fe',
                 MTU: '1500',
                 date2: '',
@@ -544,12 +557,12 @@ export default {
     },
       created() {
  this.createMqtt()
+  setTimeout(() => {
+                this.publishClient()
+                    }, 1000 * 3 );
 },
   mounted() {
    
-//     window.setInterval( () => {    //每隔30秒自动请求一次方法 this.getdata() ，保证数据实时的更新
-// 	this.publishClient()
-// }, 1000 * 5 )
   },
     methods:{
         //点击保存
@@ -569,7 +582,7 @@ export default {
            
            var ner = {
             type:"netplanSet",
-            ethName:"eth0",
+            ethName:sizeForm.name,
             dhcp4: false,
             addresses:tableDataN,//静态地址
             gateway4:sizeForm.gateway4,
@@ -582,12 +595,49 @@ export default {
                 type: 'warning'
             })
                 .then(() => {
-                    // this.$message({
+                    this.$message({
-                    //   type: 'success',
+                      type: 'success',
-                    //   message: '删除成功!'
+                      message: '设置成功!'
-                    // });
+                    });
                     console.log("JSON.stringify(ner)",JSON.stringify(ner))
-                    //  window.publish('Contorl_client',JSON.stringify(ner)); 
+        window.publish('Contorl_client',JSON.stringify(ner)); 
+        this.sizeForm={
+                name: '',
+                region: '00:11:14:1a:62:fe',
+                MTU: '1500',
+                date2: '',
+                delivery: false,
+                type: [],
+                resource: '',
+                desc: true,
+                ip: '192.168.1.5/24',
+                ip1: '192.168.50.10/24',
+                ip2: 'e.g.192.168.50.10/24',
+                ip3: 'e.g.192.168.50.10/24',
+                ip4: 'e.g.192.168.50.10/24',
+                dns1: 'e.g.1.1.1.1',
+                dns2: 'e.g.1.0.0.1',
+                dns3: 'e.g.1.0.0.1',
+                status:'NO',
+                gateway4: '',
+                 mtu:'',
+                mac:'',
+                moren:'',
+                speed:'',
+                tableRouter: [],
+              tableData: [],
+            tableDataDNS: [],
+            }
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        setTimeout(() => {
+          loading.close();
+            this.publishClient()
+            }, 5000);  
                 })
                 .catch(() => {
                     this.$message({
@@ -648,9 +698,7 @@ export default {
       //创建链接，接收数据
         var topicSends = ['Contorl_server'];
          window.PubScribe(topicSends,-1,this.realInfo);
-         setTimeout(() => {
+       
-                this.publishClient()
-                    }, 5000);
    },
    publishClient(){
      window.publish('Contorl_client',JSON.stringify({"type":"getNet"})); 
@@ -684,9 +732,9 @@ export default {
     changeNetstates(msg){
          console.log("msg",msg)
         //  var optionsDataN = this.optionsData
-        //  this.sizeForm.mtu = msg.netstates【this.optionsData}.mtu
+        console.log(" msg.netstates[this.optionsData]",this.optionsData)
-        console.log(" msg.netstates[this.optionsData]",msg.netstates[this.optionsData])
         if(msg.netstates[this.optionsData]!=undefined){
+            this.sizeForm.name = this.optionsData
              this.sizeForm.mtu = msg.netstates[this.optionsData].mtu
          var data = msg.netaddres[this.optionsData]
          this.sizeForm.speed = msg.netstates[this.optionsData].speed