修改蓝牙基站，手动选择修改功能

src/main/index.js

@@ -63,11 +63,11 @@ let jar_time = null;
 //设置访问路径
 //打包访问的路径
 
-let serveUrl = "./resources/exe"
-let serveUrlJar = '\\resources\\exe'
+// let serveUrl = "./resources/exe"
+// let serveUrlJar = '\\resources\\exe'
 //本地访问的路径
-// let serveUrl = "./exe"
-// let serveUrlJar = '\\exe'
+let serveUrl = "./exe"
+let serveUrlJar = '\\exe'
 /**
  * Set `__static` path to static files in production
  * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html

src/renderer/components/ManageEquipment.vue

@@ -8,6 +8,9 @@
           <el-button size="small" class="xl_down_button" @click="addEquipment()">
             新增设备</el-button
           >
+          <el-button size="small" class="xl_down_button" @click="updateJizhan()">
+            修改蓝牙基站MAC</el-button
+          >
         </el-col>
         <el-col :span="11" style="text-align: left"> </el-col>
         <el-col :span="1">&nbsp;</el-col>
@@ -35,7 +38,7 @@
             </el-table-column>
             <el-table-column prop="Mac" align="center" label="mac"> </el-table-column>
 
-            <el-table-column label="操作" align="center" width='100px'>
+            <el-table-column label="操作" align="center" width="100px">
               <template slot-scope="scope">
                 <!-- <el-button
                   class="xl_d_button"
@@ -93,7 +96,7 @@
             >
             </el-table-column>
             <el-table-column prop="mac" align="center" label="mac"> </el-table-column>
-            <el-table-column label="操作" align="center" width='200px'>
+            <el-table-column label="操作" align="center" width="200px">
               <template slot-scope="scope">
                 <el-button
                   :disabled="buttonLinkFlag"
@@ -107,7 +110,7 @@
                 >
 
                 <el-button
-                style='margin-top:10px'
+                  style="margin-top: 10px"
                   v-show="scope.row.addFlag"
                   :disabled="buttonLinkFlag"
                   class="xl_d_button"
@@ -177,15 +180,124 @@
         <button class="com_add" @click="addFun()">确定</button>
       </span>
     </el-dialog>
+
+    <el-dialog :visible.sync="centerDialogVisible" width="545px" center class="dig_equi">
+      <div slot="title" class="title_di" style="width: 545px">
+        <img width="545px" src="../assets/manage/bg_di.png" />
+        <div  class="equipment_title">新增设备</div>
+        <img
+          class="equipment_bg"
+          width="85px"
+          height="85px"
+          src="../assets/manage/bg_title.png"
+        />
+      </div>
+      <span class="min_equi">
+        <div class="equipment_class">
+          <div style="margin-left: 40px; width: 120px">选择设备：&nbsp;&nbsp;</div>
+          <el-select
+            v-model="type"
+            style="width: 100%; margin-right: 40px"
+            placeholder="请选择设备"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="equipment_class">
+          <div style="margin-left: 40px; width: 120px">设备mac：&nbsp;&nbsp;</div>
+          <el-input
+            style="width: 100%; margin-right: 40px"
+            v-model="mac"
+            placeholder="例如DC:0D:30:03:39:05"
+          ></el-input>
+        </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <button class="cancle_add" @click="centerDialogVisible = false">取消</button>
+        <button class="com_add" @click="addFun()">确定</button>
+      </span>
+    </el-dialog>
+
+    <!-- 修改mac -->
+    <el-dialog :visible.sync="baseStationFlag" width="545px" center class="dig_equi">
+      <div slot="title" class="title_di" style="width: 545px">
+        <img width="545px" src="../assets/manage/bg_di.png" />
+        <div  class="equipment_title">选择蓝牙基站</div>
+        <img
+          class="equipment_bg"
+          width="85px"
+          height="85px"
+          src="../assets/manage/bg_title.png"
+        />
+      </div>
+      <span class="min_equi">
+        <div class="equipment_class">
+          <div style="margin-left: 40px; width: 240px">选择蓝牙基站mac：&nbsp;&nbsp;</div>
+          <el-select
+            v-model="baseStationDes"
+            style="width: 100%; margin-right: 40px"
+            placeholder="请选择设备"
+          >
+            <el-option
+              v-for="item in baseStationOptions"
+              :key="item.mac"
+              :label="item.mac"
+              :value="item.mac"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <button class="cancle_add" @click="baseStationFlag = false">取消</button>
+        <button class="com_add" @click="saveBaseSation">确定</button>
+      </span>
+    </el-dialog>
+
+    <!-- 关闭弹框 -->
+    <el-dialog :visible.sync="comFlag" width="545px" center class="dig_equi">
+      <div slot="title" class="title_di" style="width: 545px">
+        <img width="545px" src="../assets/manage/bg_di.png" />
+        <div  class="equipment_title">提示</div>
+        <img
+          class="equipment_bg"
+          width="85px"
+          height="85px"
+          src="../assets/manage/bg_title.png"
+        />
+      </div>
+      <span class="min_equi">
+        <div class="equipment_class">
+          <div style="margin-left: 40px; width: 240px">提示：关闭软件后生效,确认关闭吗？</div>
+        </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <button class="cancle_add" @click="comFlag = false">取消</button>
+        <button class="com_add" @click="visiblePopFun">确定</button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import jsFileDownload from "js-file-download";
+let ipcRenderer = require("electron").ipcRenderer;
 export default {
   data() {
     return {
+      comFlag:false,
+      visiblePop: false,
       centerDialogVisible: false,
+      //蓝牙基站所选参数
+      baseStationDes: "",
+      baseStationOptions: [],
+
       options: [
         {
           value: "0",
@@ -230,6 +342,8 @@ export default {
       },
       buttonLinkFlag: false,
       disabledTimeFlag: null,
+      //蓝牙基站的flag
+      baseStationFlag: false,
     };
   },
   created() {
@@ -257,6 +371,57 @@ export default {
     //离开之后断开websocket连接
   },
   methods: {
+    visiblePopFun() {
+      this.baseStationFlag = false;
+      this.visiblePop = false;
+      this.comFlag=false;
+      //调用关闭软件的方法
+      ipcRenderer.send("window-close");
+    },
+    //保存蓝牙基站mac
+    saveBaseSation() {
+      //判断选择框是否选了mac了
+      if (this.baseStationDes == "") {
+        this.visiblePop = false;
+        this.$message.info("尚未选择蓝牙基站mac");
+        return;
+      }
+
+      let path = `v2/gateway/set`;
+      this.$http.postTmp(path, { mac: this.baseStationDes }, (res) => {
+        if (res.data.code == 200) {
+          this.baseStationFlag = false;
+          this.comFlag=true;
+          //修改成功后提示需要重启软件
+          //修改成功后关掉
+          // this.$message.success("添加成功");
+          // this.queryEle();
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
+    //更新蓝牙基站mac
+    updateJizhan() {
+      let that = this;
+      that.baseStationDes = "";
+      //清空选项
+      this.baseStationFlag = true;
+      //调用蓝牙基站mac
+      //查询接口得到返回的mac数据
+      that.$http.getTmp(`v2/gateway/find`, {}, (res) => {
+        if (res.code == 200) {
+          that.baseStationOptions = res.data;
+          // if(res.data,length>0){
+          //   for(let i =0;i<res.data.length;i++){
+          //     let a = res.data[i]
+          //   }
+          // }
+        } else {
+          // this.$message.error(res.message);
+        }
+      });
+    },
     //新增设备
     addEquiLine(val) {
       let path = "v1/device/add";
@@ -266,7 +431,7 @@ export default {
       };
       this.$http.postTmp(path, data, (res) => {
         if (res.data.code == 200) {
-          this.$message.success('添加成功');
+          this.$message.success("添加成功");
           this.queryEle();
         } else {
           this.$message.error(res.data.message);
@@ -315,8 +480,8 @@ export default {
     rssiFor(val) {
       if (val.rssi == 0) {
         return "";
-      }else{
-        return val.rssi
+      } else {
+        return val.rssi;
       }
     },
     nameFormatter(val) {
@@ -827,7 +992,7 @@ export default {
           }
         }
       }
-      console.log(finalData)
+      console.log(finalData);
       this.mergeData = finalData;
     },
     changeList(obj) {
@@ -1063,4 +1228,12 @@ export default {
   left: 10px;
   top: -10px;
 }
+.equipment_title{
+  position: absolute;
+  left: 0;
+  right:0;
+  top: 14px;
+  font-size:24px;
+  color:#ffffff;
+}
 </style>

src/renderer/components/treatDepression.vue

@@ -737,21 +737,42 @@ export default {
             }
 
             if (result.question && result.question.includes("测评结果")) {
+              //当时量表抑郁的时候是这样显示结果的
               // let str = sessionStorage.getItem("testResults");
-              let str = sessionStorage.getItem("testResultsScore");
-              if (str <= 52) {
-                result.question =
-                  "您的情绪状态在正常范围内。请继续保持积极心态，关注生活中的美好，预防抑郁情绪。如有需要，随时与我沟通，共同守护您的心理健康。";
-              } else if (str >= 53 && str <= 62) {
-                result.question =
-                  "您可能正经历轻度抑郁。请放心，我会为您提供专业的心理支持，帮助您学习情绪调节技巧，及时缓解抑郁情绪。我们一起努力，让心情重回明朗。";
-              } else if (str >= 63 && str <= 72) {
-                result.question =
-                  "您的抑郁症状已较为明显。我强烈建议您接受专业的心理治疗，如CBT等，以改善当前状况。我会与您并肩作战，共同应对这个挑战，助您早日走出阴霾。";
-              } else if (str >= 73) {
-                result.question =
-                  "您可能正面临严重的抑郁症状。这是一个紧急状况，我强烈建议您立即寻求专业医疗帮助，包括药物治疗和精神评估。我会全力支持您，与您共度难关，直至您重拾生活的希望。";
+              if (that.interveneId == 2) {
+                let str = sessionStorage.getItem("testResultsScore");
+                if (str <= 52) {
+                  result.question =
+                    "您的情绪状态在正常范围内。请继续保持积极心态，关注生活中的美好，预防抑郁情绪。如有需要，随时与我沟通，共同守护您的心理健康。";
+                } else if (str >= 53 && str <= 62) {
+                  result.question =
+                    "您可能正经历轻度抑郁。请放心，我会为您提供专业的心理支持，帮助您学习情绪调节技巧，及时缓解抑郁情绪。我们一起努力，让心情重回明朗。";
+                } else if (str >= 63 && str <= 72) {
+                  result.question =
+                    "您的抑郁症状已较为明显。我强烈建议您接受专业的心理治疗，如CBT等，以改善当前状况。我会与您并肩作战，共同应对这个挑战，助您早日走出阴霾。";
+                } else if (str >= 73) {
+                  result.question =
+                    "您可能正面临严重的抑郁症状。这是一个紧急状况，我强烈建议您立即寻求专业医疗帮助，包括药物治疗和精神评估。我会全力支持您，与您共度难关，直至您重拾生活的希望。";
+                }
               }
+
+              if (that.interveneId == 1) {
+                let str = sessionStorage.getItem("testResultsScore");
+                if (str <= 49) {
+                  result.question =
+                    "您的得分在正常范围内，显示您目前的焦虑水平是正常的。请继续保持心态平和，有效管理压力。如有任何焦虑情绪出现，请及时与我沟通，共同守护您的心理健康。";
+                } else if (str >= 50 && str <= 59) {
+                  result.question =
+                    "您可能有轻度焦虑。请放心，我会提供专业的心理支持，帮助您学习应对焦虑的技巧。一起努力，让您的心情更加轻松自在。";
+                } else if (str >= 60 && str <= 69) {
+                  result.question =
+                    "您的焦虑症状已较明显。我建议您接受系统的心理咨询，如放松训练、认知重构等，以减轻焦虑对您生活的影响。我会与您同行，共克时艰。";
+                } else if (str >= 70) {
+                  result.question =
+                    "您可能正面临严重的焦虑症状。我强烈建议您立即寻求专业医疗和心理援助。我会全力支持您，与您一起应对这个挑战，直至您重获内心的安宁。";
+                }
+              }
+
               // result.question = str;
             }
 
@@ -1245,23 +1266,8 @@ export default {
 
           if (this.interveneId == 1) {
             let score = Number(testResult[0].newTableContext.result[0].score);
-            if (score < 50) {
-              this.chatContents.push({
-                from: 1,
-                isScale: false,
-                isType: -1,
-                question: "根据测试，你很健康，无焦虑表现",
-                from1: HeadImg,
-              });
-              let contant1 = document.getElementById("contant1");
-              this.sleep(101).then(() => {
-                contant1.scrollTop = contant1.scrollHeight;
-              });
-            } else if (score < 70) {
-              this.getNext(this.currentId);
-            } else {
-              this.getNext(this.currentId);
-            }
+            sessionStorage.setItem("testResultsScore", score);
+            this.getNext(this.currentId);
           } else if (this.interveneId == 2) {
             let score = Number(testResult[0].newTableContext.result[0].score);
             sessionStorage.setItem("testResultsScore", score);