删除默认密码 修改判断 修改回显

ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue

@@ -4,7 +4,8 @@
       <ElFormItem class="formItem" :rules="getRules(item)" v-if="formItemVisible(item)" :key="item.key"
         :label="item.label" :style="gridStyle(item, index)">
         <slot :name="item.key" :data="item" :formData="formData">
-          <component :is="getComponent(item.type)" v-bind="getBindData(item)" v-model="formData[item.key]" />
+          <component :is="getComponent(item.type)" v-bind="getBindData(item)" v-model="formData[item.key]"
+            v-on="resolveListeners(item.ons)" />
         </slot>
       </ElFormItem>
     </template>
@@ -94,6 +95,16 @@ export default {
     }
   },
   methods: {
+    resolveListeners(callbacks) {
+
+      const result = {};
+
+      for (const key in callbacks) {
+        result[key] = (...args) => callbacks[key](...args, this.formData, this)
+      }
+
+      return result
+    },
     reset() {
       return this.formData = reduceDefaultValue(this.formList);
     },

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue

@@ -113,13 +113,13 @@ export default {
         {
           label: "选择时间:",
           key: "displayTime",
-          type: "datePicker",
+          type: "timePicker",
           required: true,
           visible: (data) => data.controlType == "automatic",
           options: {
-            type: "datetimerange",
-            angeSeparator: "至",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            isRange: true,
+            rangeSeparator: "至",
+            valueFormat: "HH:mm",
             startPlaceholder: "开始时间",
             endPlaceholder: "结束时间",
           },
@@ -143,6 +143,12 @@ export default {
       handler(bool) {
         if (!bool) return;
 
+        this.reDisplay();
+      }
+    }
+  },
+  methods: {
+    reDisplay() {
       request.post(`business/device/functions/${this.deviceId}/${52}`, {})
         .then(async (result) => {
           if (result.code != 200) return;
@@ -152,6 +158,7 @@ export default {
           const formData = this.$refs.FormConfigRef?.formData;
 
           const data = result.data[0];
+          console.log("%c [ data ]-155-「DeviceControlDialog.vue」", "font-size:15px; background:#66352f; color:#aa7973;", data);
 
           switch (data.mode) {
             case "00":
@@ -163,14 +170,14 @@ export default {
             case "01":
               formData.controlType = "automatic";
 
-                formData.datePicker = [data.startDisplay, data.endDisplay];
+              formData.displayTime = [data.startDisplay, data.endDisplay];
               break;
           }
+
+          this.oldFormData = cloneDeep(formData);
         })
-      }
-    }
+
     },
-  methods: {
     handleSubmit() {
       const result = cloneDeep(this.$refs.FormConfigRef?.formData);
 

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js

@@ -132,9 +132,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
         content:
           content ||
           `<div style="
-          background-image: url(${
-            item.deviceState !== "0" ? faultBg : normalBg
-          });
+          background-image: url(${item.deviceState == 1 ? normalBg : faultBg});
           background-size: 100% 100%;
           background-repeat: no-repeat;
           width: 42px;
@@ -148,7 +146,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
           height: 18px;
           margin-left: 3px;
           margin-bottom: 6px;
-          " src='${item.deviceState !== "0" ? fault : normal}'>
+          " src='${item.deviceState == 1 ? normal : fault}'>
         </div>`,
       };
     }),

ruoyi-ui/src/views/login.vue

@@ -1,77 +1,39 @@
 <template>
   <div class="login">
-    <el-form
-      ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
-      class="login-form"
-    >
-      <div
-        style="
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+      <div style="
           width: 100%;
           text-align: center;
           padding-right: 20px;
           padding-bottom: 10px;
-        "
-      >
+        ">
         <!-- <img src="../assets/image/login-logo.png" width="120px;" /> -->
         <div class="loginTitle">欢迎登录</div>
       </div>
       <div class="title">{{ '' }}</div>
       <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="请输入用户名"
-        >
-        <img
-            slot="prefix"
-            src="../assets/images/Vector.png"
-            class="el-input__icon input-icon"
-          />
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="请输入用户名">
+          <img slot="prefix" src="../assets/images/Vector.png" class="el-input__icon input-icon" />
         </el-input>
         <!-- <div style="border-bottom: 1px solid #cfcfcf; margin-top: 5px"></div> -->
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="请输入密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <img
-            slot="prefix"
-            src="../assets/images/locked.png"
-            class="el-input__icon input-icon"
-          />
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="请输入密码"
+          @keyup.enter.native="handleLogin">
+          <img slot="prefix" src="../assets/images/locked.png" class="el-input__icon input-icon" />
         </el-input>
         <!-- <div style="border-bottom: 1px solid #cfcfcf; margin-top: 5px"></div> -->
       </el-form-item>
-      <Verify
-        @success="capctchaCheckSuccess"
-        :mode="'pop'"
-        :captchaType="'blockPuzzle'"
-        :imgSize="{ width: '330px', height: '155px' }"
-        ref="verify"
-      ></Verify>
+      <Verify @success="capctchaCheckSuccess" :mode="'pop'" :captchaType="'blockPuzzle'"
+        :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 20px 0px;">记住密码</el-checkbox>
       <el-form-item style="width: 100%; text-align: center">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="goon"
-          style="width: 100%"
-          @click.native.prevent="handleLogin"
-        >
+        <el-button :loading="loading" size="medium" type="goon" style="width: 100%" @click.native.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
         <div style="float: right" v-if="register">
-          <router-link class="link-type" :to="'/register'"
-            >立即注册</router-link
-          >
+          <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
       </el-form-item>
     </el-form>
@@ -101,8 +63,10 @@ export default {
       title: "", // 系统标题
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "dxc123!@#", 
+        // username: "admin",
+        // password: "dxc123!@#",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: "",
@@ -253,7 +217,6 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
 ::v-deep .el-input__inner {
   background-color: transparent !important;
   height: 100%;
@@ -299,6 +262,7 @@ export default {
   background-size: auto 100%;
   background-position: center center;
 }
+
 .title {
   margin: 0px auto 10px auto;
   font-size: 24px;
@@ -314,7 +278,8 @@ export default {
   top: 0px;
   width: 4px;
   height: 100%;
-   background:linear-gradient(180deg, #BDFFF600 0%, #BDFFF6 50%, #BDFFF600 100%); ;
+  background: linear-gradient(180deg, #BDFFF600 0%, #BDFFF6 50%, #BDFFF600 100%);
+  ;
 }
 
 .login-form::before {
@@ -324,7 +289,8 @@ export default {
   top: 0px;
   width: 4px;
   height: 100%;
-   background:linear-gradient(180deg, #BDFFF600 0%, #BDFFF6 50%, #BDFFF600 100%); ;
+  background: linear-gradient(180deg, #BDFFF600 0%, #BDFFF6 50%, #BDFFF600 100%);
+  ;
 }
 
 .login-form {
@@ -360,7 +326,8 @@ export default {
     opacity: 1;
     border: 1px solid #01CFFE;
     background-color: transparent;
-    margin-bottom: 12px;;
+    margin-bottom: 12px;
+    ;
 
 
     input {
@@ -368,6 +335,7 @@ export default {
       height: 35px;
     }
   }
+
   .input-icon {
     height: 28px;
     width: 28px;
@@ -377,20 +345,24 @@ export default {
     top: 18px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 37%;
   height: 35px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -403,6 +375,7 @@ export default {
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 35px;
 }
@@ -420,7 +393,5 @@ export default {
   opacity: 1;
 }
 
-.el-button--goon:hover {
- 
-}
+.el-button--goon:hover {}
 </style>