[plg137200.] 1 рік тому
батько
коміт
fc914056af

+ 2 - 2
build/script/installer.nsh

@@ -39,8 +39,8 @@
 !macro customUnInit
 ; 卸载页面出现前执行
     # 提示窗
-        nsExec::Exec "sc stop ct" "" "SW_HIDE"
-        nsExec::Exec "sc delete ct" "" "SW_HIDE"
+        nsExec::Exec "sc stop ctV2" "" "SW_HIDE"
+        nsExec::Exec "sc delete ctV2" "" "SW_HIDE"
         nsExec::Exec "taskkill /f /im rpc_thrift.exe" "" "SW_HIDE"
         ;  ExecWait "sc stop psychological"
         ;  ExecWait "sc delete psychological"

+ 1 - 1
exe/global.js

@@ -1 +1 @@
-var env = {dev: 'http://localhost:8088/',prod: 'http://localhost:8088/'};export default env;
+var env = {dev: 'http://localhost:8096/',prod: 'http://localhost:8096/'};export default env;

+ 2 - 2
src/main/index.js

@@ -726,13 +726,13 @@ ipcMain.on('asynchronoushrv-controlpanel', function (event, arg) {
 //------------------------是否需要初始化数据库------------------------------//
 function dbInit() {
   let syncData = null;
-  syncData = cmd.runSync('sc query ct')
+  syncData = cmd.runSync('sc query ctV2')
   if (syncData.data == null) {
     //cmd.runSync('powershell.exe Start-Process -FilePath "./resources/exe/mysql/mysql-5.7.24-winx64/bin/mysql_init.bat" -WindowStyle Hidden -Verb runAs')
     let dbInitScript = 'powershell.exe Start-Process -FilePath "' + serveUrl + '/mysql/mysql-5.7.24-winx64/bin/mysql_init.bat" -WindowStyle Hidden -Verb runAs'
     cmd.runSync(dbInitScript)
     do {
-      syncData = cmd.runSync('sc query ct')
+      syncData = cmd.runSync('sc query ctV2')
       // console.log("数据库服务正在初始化")
     } while (syncData.data == null)
   } else {

+ 18 - 8
src/renderer/components/LoginPage.vue

@@ -738,9 +738,11 @@ IF NOT EXISTS t_user_table (
                 "isMarried",
                 res.data.data.marriageSituation
               );
-              that.$router.push({
-                path: "/mainTable",
-              });
+              // that.$router.push({
+              //   path: "/mainTable",
+              // });
+
+              that.goPage('/menu/smart1', 'rjdh')
             }
             //当type等于2时跳转到我的测试页面
 
@@ -750,7 +752,8 @@ IF NOT EXISTS t_user_table (
               sessionStorage.setItem("num", that.account);
               sessionStorage.setItem("pass", that.$md5(that.password));
               sessionStorage.setItem("userType", "2");
-              that.$router.push({ path: "/mainTable" });
+              // that.$router.push({ path: "/mainTable" });
+                that.goPage('/menu/manageUser', 'yhgl')
             }
           } else {
             this.$message.error("访问服务器失败!");
@@ -788,9 +791,10 @@ IF NOT EXISTS t_user_table (
                 "isMarried",
                 res.data.data.marriageSituation
               );
-              that.$router.push({
-                path: "/mainTable",
-              });
+              // that.$router.push({
+              //   path: "/mainTable",
+              // });
+              that.goPage('/menu/smart1', 'rjdh')
             }
             //当type等于2时跳转到我的测试页面
 
@@ -800,13 +804,19 @@ IF NOT EXISTS t_user_table (
               sessionStorage.setItem("num", that.account);
               sessionStorage.setItem("pass", that.$md5(that.password));
               sessionStorage.setItem("userType", "2");
-              that.$router.push({ path: "/mainTable" });
+              // that.$router.push({ path: "/mainTable" });
+               that.goPage('/menu/manageUser', 'yhgl')
             }
           } else {
             this.$message.error("访问服务器失败!");
           }
         }
       );
+    },
+      goPage(url, val) {
+      sessionStorage.setItem("defaultUrl", url);
+      this.$router.push({ path: url, query: { url: val } });
+      //this.$router.push({ path: url });
     },
     formateSex(val) {
       if (val === "男") {

+ 9 - 15
src/renderer/components/Menu.vue

@@ -4,7 +4,7 @@
     <el-row class="main_right_height">
       <el-col :span="4" class="menu_style" style="position: relative">
         <div class="menu_title_top">
-          <span class="menu_title_top_des">心理与认知干预系统</span>
+          <span class="menu_title_top_des">智能对话式心理健康评估</span>
         </div>
         <div class="menu_feature">
           <div style="margin-left: 10%">
@@ -68,18 +68,15 @@
               class="el-icon-s-home"
             ></i>
           </p> -->
-          <el-menu-item index="" @click="goMain" v-show="true">
-            <!-- <i class="el-icon-menu"></i> -->
+          <!-- <el-menu-item index="" @click="goMain" v-show="true">
             <img class="menu_icon_cla" src="../assets/menuIcon/main.png" />
             <span slot="title" class="menu_text_cla">主页</span>
-          </el-menu-item>
+          </el-menu-item> -->
           <el-menu-item
             index="/menu/smart1"
             v-show="userType === 1"
             @click="menuClick('rjdh')"
           >
-            <!-- @mouseover="menuClick('rjdh')" -->
-            <!-- @click="menuClick('rjdh')" -->
             <img
               class="menu_icon_cla"
               :src="require('@/assets/menuIcon/' + rjdhUrl)"
@@ -91,7 +88,7 @@
               >智能对话</span
             >
           </el-menu-item>
-          <el-menu-item
+          <!-- <el-menu-item
             index="/menu/evaluation"
             v-show="userType === 1"
             @click="menuClick('xlcp')"
@@ -138,12 +135,9 @@
               class="menu_text_cla"
               >认知行为干预</span
             >
-          </el-menu-item>
-          <!-- <el-menu-item index="/menu/pulse" v-show="userType === 1">
-            <i class="el-icon-menu"></i>
-            <span slot="title">脉搏采集</span>
           </el-menu-item> -->
-          <el-menu-item
+
+          <!-- <el-menu-item
             index="/menu/animation"
             v-show="userType === 1"
             @click="menuClick('swfk')"
@@ -155,7 +149,7 @@
             <span slot="title" :style="{ color: swfk ? '#ffffff' : '#0FB577' }"
               >生物反馈训练</span
             >
-          </el-menu-item>
+          </el-menu-item> -->
 
           <el-menu-item
             index="/menu/manageUser"
@@ -173,7 +167,7 @@
               >用户管理</span
             >
           </el-menu-item>
-          <el-menu-item
+          <!-- <el-menu-item
             index="/menu/manageUserScale"
             v-show="userType === 2"
             @click="menuManageClick('yhlt')"
@@ -252,7 +246,7 @@
               :style="{ color: yhsb ? '#ffffff' : '#0FB577' }"
               >设备管理</span
             >
-          </el-menu-item>
+          </el-menu-item> -->
         </el-menu>
         <div class="foot_main_exit">
           <div class="menu_main_exit">