修改

config/dev.env.js

@@ -6,7 +6,7 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

src/xt_pages/data/druguseTemplate.vue

@@ -1211,7 +1211,7 @@
         day_count: '',
 
         crumbs: [
-          { path: false, name: '数据字典' },
+          { path: false, name: '管理中心' },
           { path: 'data/druguse', name: '医嘱模版' }
         ],
         rowIndex: -1,
@@ -1928,7 +1928,7 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
-                  this.$message.error('添加成功')
+                  this.$message.success('添加成功')
 
                   this.efFormVisible = false
                   this.resetForm(formName)

src/xt_pages/data/index.vue

@@ -31,8 +31,8 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: '数据字典' },
-        { path: 'data/dictionary', name: '字段配置' }
+        { path: false, name: '管理中心' },
+        { path: 'data/dictionary', name: '数据字典' }
       ],
       tabMapOptions: [
         { label: this.$t('data_config.patient'), key: 'patient' },

src/xt_pages/data/printTemplate.vue

@@ -181,7 +181,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "系统管理" },
+        { path: false, name: "管理中心" },
         { path: "data/print", name: "打印模版" }
       ],
       imgUrl_One: require("@/assets/home/1.jpg"),

src/xt_pages/data/showConfig.vue

@@ -52,7 +52,7 @@
     data() {
       return {
         crumbs: [
-          { path: false, name: '数据字典' },
+          { path: false, name: '管理中心' },
           { path: '/data/showconfig', name: '显示配置' }
         ],
         activeName: 'first',

src/xt_pages/data/template.vue

@@ -27,7 +27,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: '数据字典' },
+        { path: false, name: '管理中心' },
         { path: 'data/template', name: '模版配置' },
       ],
       tabMapOptions: [

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -265,7 +265,7 @@
           align="center"
           width="120"
         ></el-table-column>
-        <el-table-column label="透中血压(Hgmm)" align="center">
+        <el-table-column label="透中血压(mmHg)" align="center">
           <el-table-column
             v-for="(item, index) in labelArr"
             :key="index"
@@ -336,23 +336,59 @@ export default {
           {
             text: "今天",
             onClick(picker) {
-              picker.$emit("pick", new Date());
+              var date = new Date();
+              var year = date.getFullYear();
+              var month = date.getMonth() + 1;
+              var day = date.getDate();
+              if (month < 10) {
+                month = "0" + month;
+              }
+              if (day < 10) {
+                day = "0" + day;
+              }
+              var nowDate = year + "-" + month + "-" + day;
+              var date1 = new Date(nowDate + " 00:00:00");
+              picker.$emit("pick", date1.getTime());
             }
           },
           {
             text: "昨天",
             onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
+              var d = new Date();
+              d.setTime(d.getTime() - 3600 * 1000 * 24);
+              var date = d;
+              var year = date.getFullYear();
+              var month = date.getMonth() + 1;
+              var day = date.getDate();
+              if (month < 10) {
+                month = "0" + month;
+              }
+              if (day < 10) {
+                day = "0" + day;
+              }
+              var nowDate = year + "-" + month + "-" + day;
+              var date1 = new Date(nowDate + " 00:00:00");
+              picker.$emit("pick", date1.getTime());
             }
           },
           {
             text: "一周前",
             onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
+              var d = new Date();
+              d.setTime(d.getTime() - 3600 * 1000 * 24 * 7);
+              var date = d;
+              var year = date.getFullYear();
+              var month = date.getMonth() + 1;
+              var day = date.getDate();
+              if (month < 10) {
+                month = "0" + month;
+              }
+              if (day < 10) {
+                day = "0" + day;
+              }
+              var nowDate = year + "-" + month + "-" + day;
+              var date1 = new Date(nowDate + " 00:00:00");
+              picker.$emit("pick", date1.getTime());
             }
           },
           {

src/xt_pages/role/admin.vue

@@ -163,7 +163,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "权限管理" },
+        { path: false, name: "管理中心" },
         { path: false, name: "员工管理" }
       ],
       is_loading_admins: true,

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -10,6 +10,19 @@
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
       </el-form-item>
 
+      <el-form-item label="角色 : " prop="role" label-width="60px">
+
+           <el-checkbox-group v-model="form.role">
+            <el-checkbox label="子管理员" name="type"></el-checkbox>
+            <el-checkbox label="医生" name="type"></el-checkbox>
+            <el-checkbox label="护士" name="type"></el-checkbox>
+            <el-checkbox label="技师" name="type"></el-checkbox>
+            <el-checkbox label="运营" name="type"></el-checkbox>
+            <el-checkbox label="库存" name="type"></el-checkbox>
+            <el-checkbox label="院长" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
       <el-form-item label="职称 : ">
         <el-select v-model="form.user_type" placeholder="用户类型">
           <el-option
@@ -114,8 +127,8 @@
         },
         rules: {
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
-          name: [{ required: true, validator: checkName, trigger: 'blur' }]
-
+          name: [{ required: true, validator: checkName, trigger: 'blur' }],
+          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
         }
       }
     },

src/xt_pages/role/components/EditRole.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
-    title="新增用户"
-    width="660px"
+    title="新增员工"
+    width="750px"
     :visible.sync="visible"
     :before-close="_close"
   >
@@ -14,7 +14,7 @@
             </el-form-item>
     </el-form>-->
     <div class="chooseuser">
-      <span style="color:#303133">选择用户：</span>
+      <span style="color:#303133">选择员工：</span>
       <el-radio v-model="checked" label="1">从已有员工中选择</el-radio>
       <el-radio v-model="checked" label="2">新增员工</el-radio>
     </div>
@@ -78,6 +78,18 @@
 
           <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
         </el-form-item>
+        <el-form-item label="角色" prop="role" label-width="70px">
+
+           <el-checkbox-group v-model="ruleForm.role">
+            <el-checkbox label="子管理员" name="type"></el-checkbox>
+            <el-checkbox label="医生" name="type"></el-checkbox>
+            <el-checkbox label="护士" name="type"></el-checkbox>
+            <el-checkbox label="技师" name="type"></el-checkbox>
+            <el-checkbox label="运营" name="type"></el-checkbox>
+            <el-checkbox label="库存" name="type"></el-checkbox>
+            <el-checkbox label="院长" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 
         <el-form-item label="职称 : " label-width="50px">
           <el-select v-model="ruleForm.user_type" placeholder="用户类型">
@@ -160,7 +172,7 @@
         rules: {
           phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
-          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
+          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }],
         },
         admin_user: [],
         is_check_admin_user: [],
@@ -202,7 +214,8 @@
           name: [
             { required: true, message: '请输入用户名字', trigger: 'blur' },
             { max: 10, message: '10个字以内', trigger: 'blur' }
-          ]
+          ],
+          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
         }
       }
     },

src/xt_pages/role/role.vue

@@ -161,7 +161,7 @@ export default {
   data: function() {
     return {
       crumbs: [
-        { path: false, name: "权限管理" },
+        { path: false, name: "管理中心" },
         { path: false, name: "角色管理" }
       ],
       loading_roles: true,

src/xt_pages/workforce/remind_print.vue

@@ -125,6 +125,7 @@
 
       getScheduleWeekDay({week_type: this.week_type}).then(rs => {
         var resp = rs.data
+        console.log(resp)
         if (resp.state == 1) {
           this.scheduleData = resp.data.schdules
         } else {