new

config/index.js

@@ -13,8 +13,8 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    port: 8089, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,

src/utils/methodsTool.js

@@ -1,5 +1,12 @@
 const BASE_IMG_URL = 'https://file.xyyxt.net'
 export default {
+	clearUserInfo() {
+		var TenantId = sessionStorage.getItem("TenantId")
+		localStorage.clear()
+		sessionStorage.clear()
+		cookie.delCookie('token' + sessionStorage.TenantId)
+		window.location.replace(`/login${TenantId ? '?TenantId=' + TenantId : null}`)
+	},
 	isLogin() {
 		if (uni.getStorageSync('union_id')) {
 			return true;

src/utils/request.js

@@ -9,7 +9,8 @@ import methods from '@/utils/methodsTool';
 // axios 配置
 axios.defaults.timeout = 5000; //设置连接超时时间
 // axios.defaults.baseURL = "https://cloud.xyyxt.net/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
-axios.defaults.baseURL = "http://192.168.1.222:9099/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
+// axios.defaults.baseURL = "https://txlapi.gdzzkj.net/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
+axios.defaults.baseURL = "http://120.79.166.78:9099/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
 // 也可以这样书写
 const service = axios
 // 如:http://localhost:3000/user/loginUser            使用aixos的时候直接写   /user/loginUser   就可以了

src/view/homePage/home.vue

@@ -14,7 +14,7 @@
       ref="myChart"
     ></div>
     <p style="font-size: 28px;">后台项目进度</p></div> -->
-<div class="post">
+    <!-- <div class="post">
         <div class="bg1"></div>
         <div class="bg2"></div>
         <div class="bg3"></div>
@@ -23,8 +23,8 @@
     </div>
     <div style="text-align: center;">
         <button id="actives">融合</button>
-    </div>
-    
+    </div> -->
+    工作台
   </div>
 </template>
 
@@ -34,77 +34,77 @@ export default {
     return {};
   },
   mounted() {
-    var ast = document.getElementById('actives')
-        ast.addEventListener('click', function () {
-            var lis = ['bg1', 'bg2', 'bg4', 'bg5']
-            var lisClass = ['anmins1', 'anmins2', 'anmins4', 'anmins5']
-            for (let i = 0; i < lis.length; i++) {
-                document.getElementsByClassName(lis[i])[0].classList.add(lisClass[i])
-                setTimeout(()=>{
-                    document.getElementsByClassName(lis[i])[0].classList.add('ans')
-                },900)
-            }
-        })
+    // var ast = document.getElementById("actives");
+    // ast.addEventListener("click", function () {
+    //   var lis = ["bg1", "bg2", "bg4", "bg5"];
+    //   var lisClass = ["anmins1", "anmins2", "anmins4", "anmins5"];
+    //   for (let i = 0; i < lis.length; i++) {
+    //     document.getElementsByClassName(lis[i])[0].classList.add(lisClass[i]);
+    //     setTimeout(() => {
+    //       document.getElementsByClassName(lis[i])[0].classList.add("ans");
+    //     }, 900);
+    //   }
+    // });
     // this.drawLine();
   },
   methods: {
     drawLine() {
-    //     var self = this
-    //     // 基于准备好的dom，初始化echarts实例
-    //     let myChart = this.$echarts.init(this.$refs.myChart);
-    //     // 绘制图表
-    //     myChart.setOption({
-    //       series: [
-    //         {
-    //           type: "gauge",
-    //           progress: {
-    //             show: true,
-    //             width: 14,
-    //           },
-    //           axisLine: {
-    //             lineStyle: {
-    //               width: 14,
-    //             },
-    //           },
-    //           axisTick: {
-    //             show: false,
-    //           },
-    //           splitLine: {
-    //             length: 15,
-    //             lineStyle: {
-    //               width: 2,
-    //               color: "#999",
-    //             },
-    //           },
-    //           axisLabel: {
-    //             distance: 25,
-    //             color: "#999",
-    //             fontSize: 20,
-    //           },
-    //           anchor: {
-    //             show: true,
-    //             showAbove: true,
-    //             size: 21,
-    //             itemStyle: {
-    //               borderWidth: 10,
-    //             },
-    //           },
-    //           title: {
-    //             show: false,
-    //           },
-    //           detail: {
-    //             valueAnimation: true,
-    //             fontSize: 50,
-    //             offsetCenter: [0, "70%"],
-    //           },
-    //           data: [
-    //             {
-    //               value: 70,
-    //             },
-    //           ],
-    //         },
-    //       ],
-    //   });
+      //     var self = this
+      //     // 基于准备好的dom，初始化echarts实例
+      //     let myChart = this.$echarts.init(this.$refs.myChart);
+      //     // 绘制图表
+      //     myChart.setOption({
+      //       series: [
+      //         {
+      //           type: "gauge",
+      //           progress: {
+      //             show: true,
+      //             width: 14,
+      //           },
+      //           axisLine: {
+      //             lineStyle: {
+      //               width: 14,
+      //             },
+      //           },
+      //           axisTick: {
+      //             show: false,
+      //           },
+      //           splitLine: {
+      //             length: 15,
+      //             lineStyle: {
+      //               width: 2,
+      //               color: "#999",
+      //             },
+      //           },
+      //           axisLabel: {
+      //             distance: 25,
+      //             color: "#999",
+      //             fontSize: 20,
+      //           },
+      //           anchor: {
+      //             show: true,
+      //             showAbove: true,
+      //             size: 21,
+      //             itemStyle: {
+      //               borderWidth: 10,
+      //             },
+      //           },
+      //           title: {
+      //             show: false,
+      //           },
+      //           detail: {
+      //             valueAnimation: true,
+      //             fontSize: 50,
+      //             offsetCenter: [0, "70%"],
+      //           },
+      //           data: [
+      //             {
+      //               value: 70,
+      //             },
+      //           ],
+      //         },
+      //       ],
+      //   });
     },
   },
 };
@@ -116,116 +116,130 @@ export default {
 //   flex-wrap: wrap;
 // }
 
-.post{
-            margin: 40px auto;
-            width: 600px;
-            height: 600px;
-            position: relative;
-        }
-        .bg1 {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 200px;
-            height: 200px;
-            background: linear-gradient(238deg,
-                    rgb(130, 255, 0) 0%,
-                    rgb(0, 84, 166) 100%);
-            mix-blend-mode: overlay;
-            transition: all 1s;
-        }
+.post {
+  margin: 40px auto;
+  width: 600px;
+  height: 600px;
+  position: relative;
+}
+.bg1 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 200px;
+  height: 200px;
+  background: linear-gradient(
+    238deg,
+    rgb(130, 255, 0) 0%,
+    rgb(0, 84, 166) 100%
+  );
+  mix-blend-mode: overlay;
+  transition: all 1s;
+}
 
-        .bg2 {
-            position: absolute;
-            top: 0;
-            left: 400px;
-            width: 200px;
-            height: 200px;
-            background: linear-gradient(238deg, rgb(33, 200, 69) 0%, rgb(0, 0, 100) 100%);
-            mix-blend-mode: multiply;
-            transition: all 1s;
-        }
+.bg2 {
+  position: absolute;
+  top: 0;
+  left: 400px;
+  width: 200px;
+  height: 200px;
+  background: linear-gradient(238deg, rgb(33, 200, 69) 0%, rgb(0, 0, 100) 100%);
+  mix-blend-mode: multiply;
+  transition: all 1s;
+}
 
-        .bg3 {
-            position: absolute;
-            top: 200px;
-            left: 200px;
-            width: 200px;
-            height: 200px;
-            background: linear-gradient(238deg, rgb(200, 255, 255) 48%, rgb(3, 0, 151) 100%);
-            mix-blend-mode: difference;
-            transition: all 1s;
-        }
+.bg3 {
+  position: absolute;
+  top: 200px;
+  left: 200px;
+  width: 200px;
+  height: 200px;
+  background: linear-gradient(
+    238deg,
+    rgb(200, 255, 255) 48%,
+    rgb(3, 0, 151) 100%
+  );
+  mix-blend-mode: difference;
+  transition: all 1s;
+}
 
-        .bg4 {
-            position: absolute;
-            top: 400px;
-            left: 0;
-            width: 200px;
-            height: 200px;
-            background: radial-gradient(100% 85% at 0% 100%,
-                    rgb(0, 0, 0) 0%,
-                    rgb(0, 131, 255) 50%,
-                    rgb(255, 0, 0) 100%);
-            mix-blend-mode: difference;
-            transition: all 1s;
-        }
+.bg4 {
+  position: absolute;
+  top: 400px;
+  left: 0;
+  width: 200px;
+  height: 200px;
+  background: radial-gradient(
+    100% 85% at 0% 100%,
+    rgb(0, 0, 0) 0%,
+    rgb(0, 131, 255) 50%,
+    rgb(255, 0, 0) 100%
+  );
+  mix-blend-mode: difference;
+  transition: all 1s;
+}
 
-        .bg5 {
-            position: absolute;
-            top: 400px;
-            left: 400px;
-            width: 200px;
-            height: 200px;
-            mix-blend-mode: overlay;
-            background: radial-gradient(100% 225% at 0% 100%,
-                    rgb(255, 0, 0) 0%,
-                    rgb(66, 255, 0) 100%);
-            transition: all 1s;
-        }
-        .ans{
-            animation: name1 5s infinite linear;
-            box-shadow: 1px 1px 12px 3px rgba(0,0,100,.5);
-        }
-        @keyframes name1 {
-            0%{
-                filter: hue-rotate(0deg);
-            }
-            100%{
-                filter: hue-rotate(360deg);
-            }
-        }
-        .anmins1 {
-            transform: translateX(200px) translateY(200px);
-        }
+.bg5 {
+  position: absolute;
+  top: 400px;
+  left: 400px;
+  width: 200px;
+  height: 200px;
+  mix-blend-mode: overlay;
+  background: radial-gradient(
+    100% 225% at 0% 100%,
+    rgb(255, 0, 0) 0%,
+    rgb(66, 255, 0) 100%
+  );
+  transition: all 1s;
+}
+.ans {
+  animation: name1 5s infinite linear;
+  box-shadow: 1px 1px 12px 3px rgba(0, 0, 100, 0.5);
+}
+@keyframes name1 {
+  0% {
+    filter: hue-rotate(0deg);
+  }
+  100% {
+    filter: hue-rotate(360deg);
+  }
+}
+.anmins1 {
+  transform: translateX(200px) translateY(200px);
+}
 
-        .anmins2 {
-            transform: translateX(-200px) translateY(200px);
-        }
+.anmins2 {
+  transform: translateX(-200px) translateY(200px);
+}
 
-        .anmins4 {
-            transform: translateX(200px) translateY(-200px);
-        }
+.anmins4 {
+  transform: translateX(200px) translateY(-200px);
+}
 
-        .anmins5 {
-            transform: translateX(-200px) translateY(-200px);
-        }
-        #actives{
-            padding: 0px 20px;
-            line-height: 40px;
-            text-align: center;
-            font-size: 20px;
-            border-radius: 8px;
-            color: #eee;
-            background: linear-gradient(238deg, rgb(102, 175, 172) 0%, rgb(0, 0, 100) 100%);
-            height: 40px;
-            border: none;
-            cursor: pointer;
-            transition: all 0.4s;
-        }
-        #actives:hover{
-            box-shadow: 1px 1px 12px 3px rgba(0,0,100,.5);
-            color: antiquewhite;
-            transform: scale(1.05);
-        }
+.anmins5 {
+  transform: translateX(-200px) translateY(-200px);
+}
+#actives {
+  padding: 0px 20px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 20px;
+  border-radius: 8px;
+  color: #eee;
+  background: linear-gradient(
+    238deg,
+    rgb(102, 175, 172) 0%,
+    rgb(0, 0, 100) 100%
+  );
+  height: 40px;
+  border: none;
+  cursor: pointer;
+  transition: all 0.4s;
+}
+#actives:hover {
+  box-shadow: 1px 1px 12px 3px rgba(0, 0, 100, 0.5);
+  color: antiquewhite;
+  transform: scale(1.05);
+}
 </style>

src/view/systemSettings/usermanagement/index.vue

@@ -75,7 +75,7 @@
               ref="listData"
             >
               <el-form-item
-                v-for="(items, indexs) in listitem"
+                v-for="(items, indexs) in compy(listitem)"
                 :key="indexs"
                 :label="items.label"
                 :prop="items.prop"
@@ -138,6 +138,10 @@
                   v-model="listData[items.prop]"
                   ><template slot="append">登入账号</template></el-input
                 >
+                <el-input
+                  v-else-if="items.scope === 'pwd'"
+                  v-model="listData[items.prop]"
+                ></el-input>
                 <el-input
                   :disabled="statusPop === 2"
                   v-else
@@ -276,6 +280,11 @@ export default {
           label: "用户昵称",
           prop: "nickName",
         },
+        {
+          label: "用户密码",
+          prop: "password",
+          scope: "pwd",
+        },
         {
           label: "手机号码",
           prop: "phonenumber",
@@ -348,6 +357,9 @@ export default {
         userName: [
           { required: true, message: "请输入用户名称", trigger: "blur" },
         ],
+        password: [
+          { required: true, message: "请输入用户密码", trigger: "blur" },
+        ],
         nickName: [
           { required: true, message: "请输入用户昵称", trigger: "blur" },
         ],
@@ -363,7 +375,22 @@ export default {
       },
     };
   },
-    computed: { ...mapGetters(["UserDict"]) },
+  computed: {
+    ...mapGetters(["UserDict"]),
+    compy: function () {
+      return function (arr) {
+        let ary = [];
+        if (this.statusPop === 0) {
+          ary = arr.filter((item) => {
+            return item.scope !== "pwd";
+          });
+        } else {
+          ary = arr;
+        }
+        return ary;
+      };
+    },
+  },
   watch: {
     filterText(val) {
       this.$refs.tree.filter(val);
@@ -425,13 +452,13 @@ export default {
       this.search();
     },
     //搜索
-    search(v,os) {
+    search(v, os) {
       this.loading = true;
-      if(os){
-        this.currentPage = 1
+      if (os) {
+        this.currentPage = 1;
       }
-      if(v === undefined){
-        v = {}
+      if (v === undefined) {
+        v = {};
       }
       var data = {
         deptId: this.deptId,
@@ -507,7 +534,7 @@ export default {
       });
       this.listitem.forEach((item, index) => {
         if (item.label === "用户性别") {
-          item.options = this.UserDict['sys_user_sex'];
+          item.options = this.UserDict["sys_user_sex"];
         }
       });
     },
@@ -517,6 +544,7 @@ export default {
       if (v === undefined) {
         this.statusPop = 1;
         this.listData = {};
+        console.log(this.listData);
       } else {
         this.statusPop = int;
         var data = v.userId;
@@ -527,9 +555,9 @@ export default {
           this.listData.sex = Number(res.data.sex);
         });
       }
-      this.$nextTick(()=>{
-this.$refs.listData.clearValidate();
-})
+      this.$nextTick(() => {
+        this.$refs.listData.clearValidate();
+      });
       this.dialogVisible = true;
     },
     //表单验证
@@ -568,7 +596,7 @@ this.$refs.listData.clearValidate();
     // 关闭窗口
     close() {
       this.dialogVisible = false;
-      this.resetForm();
+      // this.resetForm();
     },
     //重置表单验证
     resetForm() {