修改智能对话逻辑

src/renderer/components/AnimationDes.vue

@@ -199,7 +199,7 @@
               </el-table-column> -->
           <el-table-column prop="userNum" align="center" label="已绑用户">
           </el-table-column>
-          <el-table-column prop="mac" align="center" label="mac"> </el-table-column>
+          <el-table-column prop="mac" align="center" label="MAC"> </el-table-column>
 
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">

src/renderer/components/AnimationDouble.vue

@@ -228,7 +228,7 @@
           </el-table-column>
           <el-table-column prop="userNum" align="center" label="已绑用户">
           </el-table-column>
-          <el-table-column prop="mac" align="center" label="mac"> </el-table-column>
+          <el-table-column prop="mac" align="center" label="MAC"> </el-table-column>
 
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">

src/renderer/components/ManageEquipment.vue

@@ -38,7 +38,7 @@
             </el-table-column>
             <el-table-column prop="AliasName" align="center" label="名称">
             </el-table-column>
-            <el-table-column prop="Mac" align="center" label="mac"> </el-table-column>
+            <el-table-column prop="Mac" align="center" label="MAC"> </el-table-column>
 
             <el-table-column label="操作" align="center" width="100px">
               <template slot-scope="scope">
@@ -99,25 +99,28 @@
               :formatter="typeFormatter"
             >
             </el-table-column>
-            <el-table-column prop="mac" align="center" label="mac"> </el-table-column>
+            <el-table-column prop="mac" align="center" label="MAC"> </el-table-column>
             <el-table-column label="操作" align="center" width="140px">
               <template slot-scope="scope" style='width:120px'>
                 <div style='display:flex;flex-direction:column;justify-items: center;align-items:center'>
                   <el-button
                     :disabled="buttonLinkFlag"
                     class="xl_d_button"
-                    style='width:70px'
+                    style='width:auto'
                     size="mini"
                     slot="reference"
                     @click="linkJudge(scope.$index, scope.row, scope.row.connect)"
                   >
                     <span v-if="scope.row.connect">断开连接</span
                     ><span v-if="!scope.row.connect">连接</span>
+                    <!-- <span >断开连接</span
+                    > -->
                   </el-button>
-
+                  <!-- v-show="scope.row.addFlag" -->
                   <el-button
                     style="margin-top: 10px;width:100px;margin-right:2px"
                     v-show="scope.row.addFlag"
+                    
                     :disabled="buttonLinkFlag"
                     class="xl_d_button"
                     size="mini"
@@ -174,7 +177,7 @@
           </el-select>
         </div>
         <div class="equipment_class">
-          <div style="margin-left: 40px; width: 120px">设备mac：&nbsp;&nbsp;</div>
+          <div style="margin-left: 40px; width: 150px">设备MAC：&nbsp;&nbsp;</div>
           <el-input
             style="width: 100%; margin-right: 40px"
             v-model="mac"
@@ -217,7 +220,7 @@
           </el-select>
         </div>
         <div class="equipment_class">
-          <div style="margin-left: 40px; width: 120px">设备mac：&nbsp;&nbsp;</div>
+          <div style="margin-left: 40px; width: 125px">设备MAC：&nbsp;&nbsp;</div>
           <el-input
             style="width: 100%; margin-right: 40px"
             v-model="mac"
@@ -279,7 +282,7 @@
         />
       </div>
       <p class="eweima">
-        提示：蓝牙基站mac填写，可以选择蓝牙基站上附带的二维码图片，也可以手动书写
+        提示：蓝牙基站MAC填写，可以选择蓝牙基站上附带的二维码图片，也可以手动书写
       </p>
       <button class="sweep">
         <input
@@ -291,7 +294,7 @@
       </button>
       <span class="min_equi">
         <div class="equipment_class">
-          <div style="margin-left: 40px; width: 220px">填写蓝牙基站mac：&nbsp;&nbsp;</div>
+          <div style="margin-left: 40px; width: 220px">填写蓝牙基站MAC：&nbsp;&nbsp;</div>
           <el-input v-model="baseStationDes"></el-input>
 
           <!-- <el-select
@@ -501,7 +504,7 @@ export default {
       //判断选择框是否选了mac了
       if (this.baseStationDes == "") {
         this.visiblePop = false;
-        this.$message.info("尚未填写蓝牙基站mac");
+        this.$message.info("尚未填写蓝牙基站MAC");
         return;
       }
 
@@ -888,7 +891,7 @@ export default {
         aliasName: this.aliasName,
       };
       if (this.mac == "") {
-        this.$message.info("设备mac不能为空");
+        this.$message.info("设备MAC不能为空");
         return;
       }
       if (this.aliasName == "") {

src/renderer/components/Smart1.vue

@@ -192,6 +192,7 @@ const HTTP_AXIOS = axios.create();
 export default {
   data() {
     return {
+      totalFlag: 0,
       identifier: "",
       //用户测试记录
       userName: "",
@@ -306,8 +307,10 @@ export default {
       //将记录清空然后开始调用查询的返回的接口
       this.chatContents = [];
       this.moonNegative = 0;
+      this.totalFlag = 0;
       this.pageNum = 1;
       this.pageSize = 10;
+
       clearInterval(this.flagTime);
       this.buttonFlag = false;
       this.selectPage();
@@ -320,10 +323,10 @@ export default {
       if (syncData.data == null) {
         // this.$message.info("情绪判别模型尚未启动");
         this.$message({
-          message:'情绪判别模型尚未启动',
-          type:'info',
-          duration:1000
-        })
+          message: "情绪判别模型尚未启动",
+          type: "info",
+          duration: 1000,
+        });
       }
       // if (syncData.data.includes("RUNNING")) {
       // }else{
@@ -335,10 +338,10 @@ export default {
       if (syncData1.data == null) {
         // this.$message.info("对话模型尚未启动");
         this.$message({
-          message:'对话模型尚未启动',
-          type:'info',
-          duration:1000
-        })
+          message: "对话模型尚未启动",
+          type: "info",
+          duration: 1000,
+        });
       }
       // if (syncData1.data.includes("RUNNING")) {
       // }else{
@@ -1040,7 +1043,10 @@ export default {
         from1: HeadImg,
         type: 1,
       };
+      
       this.chatContents.push(tmp);
+      this.totalFlag+=1;
+      console.log(this.totalFlag)
 
       this.getQuestion();
       //在调用一个方法，将这个值的情绪发送给另一个方法
@@ -1156,11 +1162,11 @@ export default {
       // this.pFun("我收到了", true);
       //先判断list是否是奇数  如果是奇数就没问题如果并不是奇数择传输少一位即可
 
-      if(list.length%2==0){
-        list.shift()
+      if (list.length % 2 == 0) {
+        list.shift();
       }
-      console.log('list')
-      console.log(list)
+      console.log("list");
+      console.log(list);
       HTTP_AXIOS({
         method: "post",
         url: `http://127.0.0.1:9998/chat`,
@@ -1264,9 +1270,18 @@ export default {
               };
               this.saveRecord(ob);
               //在这判断负面情绪是否足够5个
-              if (this.moonNegative == 5) {
-                this.startScale();
+              //找个方法判断等于会回答的问题大于19个时且history字段为false时且负面情绪大于一半
+              // this.judgeTotality();
+              if (this.totalFlag >= 19) {
+                let ban = Math.ceil(this.totalFlag / 2);
+                if (this.moonNegative >= ban) {
+                  this.startScale();
+                }
               }
+
+              // if (this.moonNegative == 5) {
+              //   this.startScale();
+              // }
             } else {
               this.printIndex = 0;
               this.chatContents[this.chatContents.length - 1].question = ".";
@@ -1276,7 +1291,6 @@ export default {
         flag ? 60 : 300
       );
     },
-
     //保存记录的接口
     saveRecord(val) {
       let data = {