修改新版本

src/components/PlanReport.vue

@@ -10,7 +10,7 @@
         <p
           style="
             text-align: center;
-            font-size: 18px;
+            font-size: 22px;
             margin-bottom: 20px;
             font-weight: 700;
           "
@@ -215,7 +215,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!-- @change="userDimensionality" -->
           <el-form-item label="年级选择">
             <el-select v-model="grade" placeholder="请选择年级" @change="gradeChange">
               <el-option
@@ -258,11 +257,18 @@
             >
           </el-radio-group>
         </div>
+
         <div style="display: flex; flex-direction: row">
           <el-radio-group
             v-model="subValue"
             @change="userSubFun"
-            style="flex-direction: column; width: 100%; flex: 3; display: flex"
+            style="
+              width: 100%;
+              flex: 3;
+              display: flex;
+              flex-direction: column;
+              justify-content: left;
+            "
           >
             <el-radio
               v-for="item in subOption"
@@ -271,7 +277,7 @@
               style="margin-top: 20px"
             ></el-radio>
           </el-radio-group>
-          <div class="chart_wrap" style="flex: 6">
+          <div class="chart_wrap" style="flex: 4">
             <BingChart2
               :options="options7"
               chartId="myPieChart7"
@@ -285,10 +291,13 @@
               display: flex;
               flex-direction: row;
               align-items: center;
+              justify-content: center;
+              margin-bottom: 40px;
             "
           >
             <div>
               <div style="display: flex; font-size: 20px">
+                {{ tabNameCurrent }}:
                 {{
                   subValue
                 }}&nbsp;&nbsp;&nbsp;&nbsp;已完成&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span
@@ -298,20 +307,22 @@
                     padding: 0 20px;
                     margin-left: 20px;
                     margin-bottom: 20px;
-                    color:#ffffff
+                    color: #ffffff;
                   "
                   >{{ subAll }}人</span
                 >
               </div>
+              <!-- this.dime=='躯体化'?'压力':this.dime -->
               <div style="display: flex; font-size: 20px">
-                {{ subValue }}&nbsp;&nbsp;&nbsp;&nbsp;中重度{{ dime
+                {{ tabNameCurrent }}: {{ subValue }}&nbsp;&nbsp;&nbsp;&nbsp;中重度{{
+                  dime == "躯体化" ? "压力" : dime
                 }}<span
                   style="
                     background-color: #ffae00;
                     display: flex;
                     padding: 0 20px;
                     margin-left: 20px;
-                    color:#ffffff
+                    color: #ffffff;
                   "
                   >{{ subSingle }}人</span
                 >
@@ -319,36 +330,38 @@
             </div>
           </div>
         </div>
-
-        <el-table
-          :data="subData"
-          :row-style="{ height: '0px' }"
-          :cell-style="{ padding: '5px' }"
-          :header-cell-style="{ background: '#F8F8F8', color: '#606266' }"
-        >
-          <el-table-column
-            show-overflow-tooltip
-            prop="userName"
-            label="姓名"
-            align="center"
-            width=""
-          >
-          </el-table-column>
-          <el-table-column prop="userNo" label="学号" align="center" width="">
-          </el-table-column>
-          <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
-          </el-table-column>
-          <el-table-column
-            prop="dimensionName"
-            label="维度"
-            :formatter="forDimen"
-            align="center"
-            width=""
+        <div class='finish_class'>
+          <el-table
+            :data="subData"
+            :row-style="{ height: '0px' }"
+            :cell-style="{ padding: '5px' }"
+            :header-cell-style="{ background: '#F8F8F8', color: '#606266' }"
           >
-          </el-table-column>
-          <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              show-overflow-tooltip
+              prop="userName"
+              label="姓名"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column prop="userNo" label="学号" align="center" width="">
+            </el-table-column>
+            <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+            </el-table-column>
+            <el-table-column
+              prop="dimensionName"
+              label="维度"
+              :formatter="forDimen"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
+            </el-table-column>
+          </el-table>
+        </div>
+
         <el-pagination
           class="pag_class"
           background
@@ -414,6 +427,8 @@ export default {
       subDimeList: [],
       //子维度默认绑定的值
       tabName: "1",
+
+      tabNameCurrent: "性别",
       //子维度的子选项
       subValue: "",
       subOption: [],
@@ -581,9 +596,20 @@ export default {
     },
     //tab状态改变
     tabFun(a) {
-      debugger;
-      // console.log(this.subDimeList);
-      // debugger;
+      console.log("this.tabName");
+      console.log(this.tabName);
+      console.log(this.subDimeList);
+      // this.tabNameCurrent=
+      let linT = [];
+      linT = this.subDimeList.filter((item) => {
+        return item.paramValue == a;
+      });
+
+      //修改名字
+      this.tabNameCurrent = linT[0].paramName;
+
+      //设置选中的文字
+
       // this.subValue = "";
       // this.tabName = a.name;
       // //根据已选的tab ---
@@ -608,6 +634,15 @@ export default {
     //维度选择
     userDimensionality() {
       this.queryStudentData();
+      //查询饼状图的数据
+      let params = {
+        dimensionName: this.dime,
+        orgList: this.orgName,
+        planId: this.planId,
+        quesType: this.tabName,
+        quesValue: this.subValue,
+      };
+      this.queryBread(params);
     },
     open(val) {
       this.planId = val.id;
@@ -723,11 +758,25 @@ export default {
           // scoreList.push(
           //   parseInt(((this.completeNum - this.abnormalNum) / this.completeNum) * 100)
           // );
-          scoreList.push(this.completeNum==0?0:  parseInt((dimensionList[1]["抑郁"] / this.completeNum) * 100));
-          scoreList.push(this.completeNum==0?0:parseInt((dimensionList[2]["压力"] / this.completeNum) * 100));
-          scoreList.push(this.completeNum==0?0:parseInt((dimensionList[0]["焦虑"] / this.completeNum) * 100));
           scoreList.push(
-            this.completeNum==0?0:  parseInt((dimensionList[3]["精神障碍"] / this.completeNum) * 100)
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[1]["抑郁"] / this.completeNum) * 100)
+          );
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[2]["压力"] / this.completeNum) * 100)
+          );
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[0]["焦虑"] / this.completeNum) * 100)
+          );
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[3]["精神障碍"] / this.completeNum) * 100)
           );
 
           this.echarts_zhu = this.$refs.echarts_zhu;
@@ -744,7 +793,11 @@ export default {
         this.getAbnormalList();
       } else {
         this.dimensionName = val;
-        this.getDimensionPeopleList(val);
+        if (val == "压力") {
+          this.getDimensionPeopleList("躯体化");
+        } else {
+          this.getDimensionPeopleList(val);
+        }
       }
     },
     searchTarget() {
@@ -944,8 +997,8 @@ export default {
         {},
         (res) => {
           if (res && res.code == 200) {
-            console.log("饼图数据");
-            console.log(res.data);
+            // console.log("饼图数据");
+            // console.log(res.data);
 
             this.subAll = res.data.totalNum;
             this.subSingle = res.data.highNum;
@@ -954,8 +1007,12 @@ export default {
                 value: res.data.totalNum,
                 name: `已完成${this.subValue}`,
               },
-              { value: res.data.highNum, name: this.subValue },
+              {
+                value: res.data.highNum,
+                name: `中重度${this.dime == "躯体化" ? "压力" : this.dime}`,
+              },
             ];
+            // {{ subValue }}&nbsp;&nbsp;&nbsp;&nbsp;中重度{{ dime}}
             this.queryStudentData();
             //调用接口开始查询选择的列表
           } else {
@@ -1005,6 +1062,10 @@ export default {
   border-radius: 20px;
   background-color: #f8f8f8;
 }
+.finish_class>>> .el-table__header-wrapper {
+  border-radius: 20px;
+  background-color: #f8f8f8;
+}
 .radio_group_style >>> .el-radio-button__orig-radio:checked + .el-radio-button__inner {
   color: #000000;
   background-color: #ffffff;
@@ -1086,7 +1147,7 @@ export default {
     margin-right: 5px;
   }
   .com {
-    font-size: 24px;
+    font-size: 22px;
     font-weight: 700;
   }
 }

src/components/PlanUserStatus.vue

@@ -10,7 +10,7 @@
       >
         <div slot="title">
           <div label-width="150px" class="demo-ruleForm">
-            <p v-if="isView" class="dig_title">人员配置</p>
+            <p v-if="isView" class="dig_title">进度查看</p>
             <p v-if="!isView" class="dig_title">编辑计划</p>
             <div slot=""></div>
             <div slot="footer"></div>
@@ -40,12 +40,38 @@
                   width=""
                 >
                   <template slot-scope="scope">
-                    <div v-if="scope.row.isComplete == '0'" style="color: #ff7800">
-                      未开始
+                    <div
+                      style="display: flex; justify-content: center; align-items: center"
+                      v-if="scope.row.isComplete == '1'"
+                    >
+                      <img
+                        style="width: 16px"
+                        src="../assets/img/home/isCom.png"
+                        alt=""
+                      />&nbsp;&nbsp;
+                      <div style="color: #333333">已完成</div>
                     </div>
-
-                    <div v-if="scope.row.isComplete == '1'" style="color: #333333">
-                      已完成
+                    <!-- <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="view.status == '进行中'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div> -->
+                    <div
+                      style="display: flex; justify-content: center; align-items: center"
+                      v-if="scope.row.isComplete == '0'"
+                    >
+                      <img
+                        style="width: 16px"
+                        src="../assets/img/home/isNo.png"
+                        alt=""
+                      />&nbsp;&nbsp;
+                      <div style="color: #d52121">未开始</div>
                     </div>
                   </template>
                 </el-table-column>
@@ -240,7 +266,7 @@ export default {
     handleSizeChange(val) {
       //将首页重置为1时---且总条数变化
       //设置为当前总条数
-      this.pageSize=val;
+      this.pageSize = val;
       this.searchList();
     },
     handleCurrentChange(val) {

src/components/Report.vue

@@ -40,13 +40,46 @@
                   width=""
                 >
                 <template slot-scope="scope">
-                    <div v-if="scope.row.isComplete == '0'" style="color: #ff7800">
+                  <div
+                      style="display: flex; justify-content: center; align-items: center"
+                      v-if="scope.row.isComplete == '1'"
+                    >
+                      <img
+                        style="width: 16px"
+                        src="../assets/img/home/isCom.png"
+                        alt=""
+                      />&nbsp;&nbsp;
+                      <div style="color: #333333">已完成</div>
+                    </div>
+                    <!-- <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="view.status == '进行中'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div> -->
+                    <div
+                      style="display: flex; justify-content: center; align-items: center"
+                      v-if="scope.row.isComplete == '0'"
+                    >
+                      <img
+                        style="width: 16px"
+                        src="../assets/img/home/isNo.png"
+                        alt=""
+                      />&nbsp;&nbsp;
+                      <div style="color: #d52121">未开始</div>
+                    </div>
+                    <!-- <div v-if="scope.row.isComplete == '0'" style="color: #ff7800">
                       未开始
                     </div>
 
                     <div v-if="scope.row.isComplete == '1'" style="color: #333333">
                       已完成
-                    </div>
+                    </div> -->
                   </template>
                 </el-table-column>
                 <!-- <el-table-column

src/utils/http.js

@@ -17,8 +17,8 @@ import { router } from "@/router";
 // axios.defaults.baseURL = 'https://child.hhnao.com:8070';
 // axios.defaults.baseURL = 'https://child.hhnao.com:8070';
 //https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx01d1a44906973cf2&redirect_uri=http%3A%2F%2F192.168.18.51%3A8085&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect
-export const basePath='http://10.113.248.4:8089'
-// export const basePath = "http://43.143.198.30:8089";
+// export const basePath='http://10.113.248.4:8089'
+export const basePath = "http://43.143.198.30:8089";
 // const base_url = 'http://43.143.198.30:8089/'
 // const base_url = 'http://10.113.248.4:8090/'
 // export const basePath='http://43.143.198.30:8086'
@@ -100,13 +100,24 @@ axios.interceptors.response.use(
     // loadingInstance.close();
     //返回code若为401，则表示token有问题
     if (response.data.code === 401) {
+      //当401时清除缓存信息
+     
+      if(oSessionStorage.getItem("userInfo") !== ""){
+        oSessionStorage.removeItem('userInfo')
+        Message.error(response.data.msg);
+      
+      }
       // 重定向到登录页
       router.replace({
         path: "/",
         // query: {redirect: router.currentRoute.fullPath}
       });
+      return;
       // Toast.fail(response.data.msg);
-      Message.error(response.data.msg);
+      // if(){
+
+      // }
+     
     }
 
     return response;
@@ -159,7 +170,6 @@ const http = {
       }
 
     ).then((res) => {
-      debugger;
       sCallBack(res);
     });
   },

src/views/manage/channelInfo/invite.vue

@@ -17,14 +17,14 @@
               >
               </el-option>
             </el-select>
-            &nbsp;&nbsp;&nbsp;&nbsp;
-            &nbsp;&nbsp;&nbsp;&nbsp;
+            &nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
               >搜索</el-button
             >
             <el-button type="info" round @click="clearSearch">清空</el-button>
 
             <el-button
+            v-show="userInfo.roleType=='4'||userInfo.roleType=='3'"
               type="success"
               round
               class="add_class"
@@ -88,9 +88,43 @@
             :formatter="planStatusFun"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.planStatus == '1'" style="color: #ff7800">未开始</div>
+              <!-- <div v-if="scope.row.planStatus == '1'" style="color: #ff7800">未开始</div>
               <div v-if="scope.row.planStatus == '2'" style="color: #2342ff">进行中</div>
-              <div v-if="scope.row.planStatus == '3'" style="color: #333333">已完成</div>
+              <div v-if="scope.row.planStatus == '3'" style="color: #333333">已完成</div> -->
+
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '3'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isCom.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #333333">已完成</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '2'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '1'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isNo.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #d52121">未开始</div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="450px" align="center">
@@ -205,10 +239,43 @@
           <div class="user_out">
             <div class="user_out_sub">状态</div>
             <div class="user_out_subNext">
-              <span v-if=" view.status=='进行中'" style="color: #2342ff"> {{ view.status }}</span>
+              <!-- <span v-if=" view.status=='进行中'" style="color: #2342ff"> {{ view.status }}</span>
 
               <span  v-if=" view.status=='未开始'" style="color: #ff7800"> {{ view.status }}</span>
-              <span  v-if=" view.status=='已完成'" style="color: #333333"> {{ view.status }}</span>
+              <span  v-if=" view.status=='已完成'" style="color: #333333"> {{ view.status }}</span> -->
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="view.status == '已完成'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isCom.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #333333">已完成</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="view.status == '进行中'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="view.status == '未开始'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isNo.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #d52121">未开始</div>
+              </div>
             </div>
           </div>
         </div>

src/views/manage/channelInfo/orderSettlement.vue

@@ -98,7 +98,7 @@ export default {
       // },
       treeData: {
         //公司名称
-        orgName: "大米科技公司",
+        orgName: "根节点",
         proportionShares: "100",
         //公司层级
         level: 2,

src/views/manage/generalSituation.vue

@@ -913,7 +913,7 @@ export default {
           .table_body {
             display: flex;
             // justify-content: space-around;
-            line-height: 40px;
+            line-height: 42px;
             .detail {
               display: inline-block;
               white-space: nowrap;