预警后台-测试问题修改-d9

2024-09-24 16:37:50 +08:00 · 2024-09-24 16:37:50 +08:00 · 58041a59d2
parent f0b47faea9
commit 58041a59d2
16 changed files with 267 additions and 36 deletions
--- a/src/assets/iconFont/titleFont.ttf
+++ b/src/assets/iconFont/titleFont.ttf
--- a/src/assets/images/warn-bg.png
+++ b/src/assets/images/warn-bg.png
--- a/src/components/TableModel/index.vue
+++ b/src/components/TableModel/index.vue
@ -538,6 +538,7 @@ export default {
  align-items: center;
 }
 ::v-deep .btn-handler {
+  display: flex;
  flex: 1;

  .el-button {
--- a/src/views/base/crew/components/form-crew.vue
+++ b/src/views/base/crew/components/form-crew.vue
@ -88,10 +88,10 @@
          ></i>
        </template>
        <template slot="idCard" slot-scope="{ data }">
-          {{ idCardCrypto(data.idCard) }}
+          {{ idCardCrypto(data.idCard) || '-' }}
        </template>
        <template slot="relPhone" slot-scope="{ data }">
-          {{ phoneCrypto(data.relPhone) }}
+          {{ phoneCrypto(data.relPhone) || '-' }}
        </template>
      </TableModel>

--- a/src/views/base/crew/components/table-crew.vue
+++ b/src/views/base/crew/components/table-crew.vue
@ -35,10 +35,10 @@
          {{ data.sex === 1 ? '男' : '女' }}
        </template>
        <template slot="idCard" slot-scope="{ data }">
-          {{ idCardCrypto(data.idCard) }}
+          {{ idCardCrypto(data.idCard) || '-' }}
        </template>
        <template slot="relPhone" slot-scope="{ data }">
-          {{ phoneCrypto(data.relPhone) }}
+          {{ phoneCrypto(data.relPhone) || '-' }}
        </template>
        <template slot="relName" slot-scope="{ data }">
          {{ data.relName }}
--- a/src/views/base/crew/index.vue
+++ b/src/views/base/crew/index.vue
@ -36,11 +36,11 @@
        <el-button
          type="danger"
          size="mini"
-          @click="handleDeleteData(data.id, deleteCrewApi)"
+          @click="handleDeleteCrew(data.id, deleteCrewApi)"
          v-if="data.teamStatus === '正常' && data.peopleCount === 1"
        >解散</el-button
        >
-<!--        <span v-else>-</span>-->
+        <span v-if="data.teamStatus !== '正常'">-</span>
      </template>
      <template slot="relName" slot-scope="{ data }">
        {{ data.relName.split('/')[0] }}/{{ phoneCrypto(data.relName.split('/')[1]) }}
@ -119,6 +119,15 @@ export default {
      this.dialogConfigCrewTab.outerVisible = false
      this.$refs.tableRef.getTableList()
    },
+    /** 删除 */
+    handleDeleteCrew(id, method) {
+      this.$modal.confirm('是否确定解散').then(() => {
+        method(id).then(res => {
+          this.$modal.msgSuccess('操作成功！')
+          this.$refs.tableRef.getTableList()
+        }).catch(err => {})
+      })
+    },
    handleCrew(v) {
      if(v.teamStatus === '正常') {
        this.tableCrewData = v
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@ -50,11 +50,11 @@
      <template slot="configName" slot-scope="{ data }">
        <span
          style="color:blue;"
-        >{{ data.configName }}</span>
+        >{{ data.configName || '-' }}</span>
      </template>

      <template slot="devStatusName" slot-scope="{ data }">
-        <span 
+        <span
          v-if="data.devStatusName === '在线'"
          style="color: #11AB21;"
        >{{ data.devStatusName }}</span>
@ -82,7 +82,7 @@
        />
      </template>
    </DialogModel>
-    
+
  </div>
 </template>

--- a/src/views/base/edgeInsert/index.vue
+++ b/src/views/base/edgeInsert/index.vue
@ -60,7 +60,7 @@
        >
      </template>
      <template slot="relPhone" slot-scope="{ data }">
-        {{ phoneCrypto(data.relPhone) }}
+        {{ phoneCrypto(data.relPhone) || '-' }}
      </template>
      <template slot="auditStatus" slot-scope="{ data }">
        <span v-if="data.auditStatus === 0">审核中</span>
--- a/src/views/base/mixins/component/pwd-dialog.vue
+++ b/src/views/base/mixins/component/pwd-dialog.vue
@ -0,0 +1,77 @@
+<template>
+  <!-- 工程管理 新增、编辑 表单组件 -->
+  <div>
+    <el-form
+      label-width="100px"
+      size="medium"
+      ref="pwdFormRef"
+      :model="projectParams"
+      :rules="projectParamsRules"
+    >
+      <el-form-item label="密码" prop="password">
+        <el-input type="password" :maxlength="50" v-model="projectParams.password" placeholder="请输入" />
+      </el-form-item>
+    </el-form>
+
+    <div style="display: flex; justify-content: right">
+      <el-button type="success" @click="onSubmit">确认</el-button>
+      <el-button
+        @click="
+          () => {
+            this.$emit('closeDialog');
+          }
+        "
+      >取消</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "pwdForm",
+  components: {},
+  created() {
+
+  },
+  async mounted() {
+
+  },
+  data() {
+    return {
+      projectParams: {
+        password: undefined, // 密码
+      },
+      // 校验规则
+      projectParamsRules: {
+        password: [
+          {
+            required: true,
+            message: "请输入密码",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    /** 确认按钮 */
+    onSubmit() {
+      this.$refs.pwdFormRef.validate(async (valid) => {
+        if (valid) {
+          console.log(this.projectParams)
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+::v-deep .el-select {
+  width: 100%;
+}
+::v-deep .el-form-item__label {
+  font-weight: normal;
+}
+</style>
--- a/src/views/base/mixins/config.js
+++ b/src/views/base/mixins/config.js
@ -0,0 +1,5 @@
+export const dialogConfigPwd = {
+    outerWidth: '40%',
+    outerTitle: '确认密码',
+    outerVisible: false,
+}
--- a/src/views/base/person/index.vue
+++ b/src/views/base/person/index.vue
@ -42,9 +42,10 @@
          :on-exceed="fileExceed"
          accept=".xls, .xlsx"
          :limit="1"
+          style="display: flex"
        >
          <el-button
-            style="margin-top: 10px"
+            style="height: 100%; margin-left: 6px"
            icon="el-icon-download"
            size="mini"
          >导入数据</el-button
@ -69,13 +70,13 @@
        {{ data.sex === 1 ? '男' : '女' }}
      </template>
      <template slot="postCode" slot-scope="{ data }">
-        {{ queryPostcode(data.postCode) }}
+        {{ queryPostcode(data.postCode) || '-' }}
      </template>
      <template slot="idCard" slot-scope="{ data }">
-        {{ idCardCrypto(data.idCard) }}
+        {{ idCardCrypto(data.idCard) || '-' }}
      </template>
      <template slot="relPhone" slot-scope="{ data }">
-        {{ phoneCrypto(data.relPhone) }}
+        {{ phoneCrypto(data.relPhone) || '-' }}
      </template>
    </TableModel>

--- a/src/views/base/proj/components/table-tower.vue
+++ b/src/views/base/proj/components/table-tower.vue
@ -44,9 +44,10 @@
          :on-exceed="fileExceed"
          accept=".xls, .xlsx"
          :limit="1"
+          style="display: flex"
        >
          <el-button
-            style="margin-top: 10px"
+            style="height: 100%; margin-left: 6px"
            icon="el-icon-download"
            size="mini"
          >导入数据</el-button
--- a/src/views/base/projDept/index.vue
+++ b/src/views/base/projDept/index.vue
@ -40,7 +40,7 @@
        >
      </template>
      <template slot="headUserPhone" slot-scope="{ data }">
-        {{ phoneCrypto(data.headUserPhone) }}
+        {{ phoneCrypto(data.headUserPhone) || '-' }}
      </template>
    </TableModel>

--- a/src/views/base/warnAlert/index.vue
+++ b/src/views/base/warnAlert/index.vue
@ -31,7 +31,7 @@
          @click="handleWarnData(data)"
          >处理</el-button
        >
-        <span v-else></span>
+        <span v-else>-</span>
      </template>
      <template slot="warnName" slot-scope="{ data }">
        <span v-if="data.warnName == null || data.warnName === ''">无</span>
@ -39,8 +39,8 @@
      </template>

      <template slot="remarks" slot-scope="{ data }">
-        <span v-if="data.remarks == null || data.remarks === ''"></span>
-        <span v-else>{{ data.remarks }}</span>
+<!--        <span v-if="data.remarks == null || data.remarks === ''">-</span>-->
+        <span>{{ data.remarks || '-' }}</span>
      </template>
    </TableModel>

--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@ -1,9 +1,24 @@
 <template>
  <div class="container">
+    <div class="lef-cont">
+      <div class="circle1"></div>
+      <div class="circle2"></div>
+      <div class="tit">
+        <span style="padding-bottom: 15px">您好，</span>
+        <span>欢迎来到安全施工预警系统</span>
+      </div>
+      <div class="tit-en">
+        <span style="padding-bottom: 15px">Hello!</span>
+        <span>Welcome to the Safety Construction Warning System</span>
+      </div>
+      <div class="img-cont">
+        <img src="@/assets/images/warn-bg.png">
+      </div>
+    </div>
    <div class="login">
      <div class="login-form">
        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-          <h3 class="title">博诺思后台管理系统</h3>
+          <h3 class="title">安全施工预警系统</h3>
          <template v-if="loginMethod === 'password'">
            <el-form-item prop="username">
              <el-input
@ -98,9 +113,9 @@
            </el-form-item>
          </template>
          <div class="login-form-center">
-            <el-link v-if="CONFIG.IS_CODE_LOGIN" @click="toggleLoginMethod">
+<!--            <el-link v-if="CONFIG.IS_CODE_LOGIN" @click="toggleLoginMethod">
              {{ loginMethod === 'password' ? '短信登录' : '密码登录' }}
-            </el-link>
+            </el-link>-->
            <router-link v-if="CONFIG.IS_OPEN_REGISTER" to="/register">
              <el-link>注册账号</el-link>
            </router-link>
@ -128,7 +143,7 @@
              <span v-else>登 录 中...</span>
            </el-button>
          </el-form-item>
-          <el-form-item>
+<!--          <el-form-item>
            <div class="login-divider">第三方登录</div>
            <div class="login-icons">
              <div class="login-icon">
@ -141,7 +156,7 @@
                <img :src="qq" alt="QQ">
              </div>
            </div>
-          </el-form-item>
+          </el-form-item>-->
        </el-form>
      </div>
    </div>
@ -374,17 +389,73 @@ export default {
 </script>

 <style lang="scss">
+
+@font-face {
+  font-family: 'titleFont';
+  src: url("../assets/iconFont/titleFont.ttf");
+}
+
 .container {
  display: flex;
  justify-content: flex-end;
  align-items: center;
  height: 100%;
-  background-image: url("../assets/images/bg.png");
-  background-size: cover;
+}
+
+.lef-cont{
+
+  width: 50%;
+  height: 100%;
+  background-color: #7288FA;
+  box-sizing: border-box;
+  padding: 5%;
+  position: relative;
+  .circle1{
+    position: absolute;
+    top: 8%;
+    left: 8%;
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+    background-color: #8EA0FB;
+  }
+  .circle2{
+    position: absolute;
+    top: calc(8% + 25px);
+    left: calc(8% + 25px);
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    background-color: #fff;
+  }
+  .tit{
+    margin-top: 10%;
+    margin-bottom: 20px;
+    display: flex;
+    flex-direction: column;
+    font-size: 32px;
+    color: #fff;
+  }
+  .tit-en{
+    display: flex;
+    flex-direction: column;
+    font-size: 20px;
+    color: #fff;
+  }
+  .img-cont{
+    width: 300px;
+    height: 300px;
+    margin: 80px auto;
+    img{
+      width: 100%;
+      height: 95%;
+    }
+  }
+
 }

 .login {
-  width: 42%;
+  width: 50%;
  display: flex;
  justify-content: center;
  align-items: center;
@ -392,9 +463,11 @@ export default {
 }

 .title {
-  margin: 0 auto 30px;
+  font-family: 'titleFont', sans-serif;
+  margin: 0 auto 50px;
  text-align: center;
-  color: #707070;
+  font-size: 32px;
+  color: #000;
 }

 .login-form {
--- a/src/views/register1.vue
+++ b/src/views/register1.vue
@ -1,8 +1,23 @@
 <template>
-  <div class="container">
+  <div class="container-rg">
+    <div class="lef-cont">
+      <div class="circle1"></div>
+      <div class="circle2"></div>
+      <div class="tit">
+        <span style="padding-bottom: 15px">您好，</span>
+        <span>欢迎来到安全施工预警系统</span>
+      </div>
+      <div class="tit-en">
+        <span style="padding-bottom: 15px">Hello!</span>
+        <span>Welcome to the Safety Construction Warning System</span>
+      </div>
+      <div class="img-cont">
+        <img src="@/assets/images/warn-bg.png">
+      </div>
+    </div>
    <div class="register">
      <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-        <h3 class="title">博诺思后台管理系统</h3>
+        <h3 class="title">安全施工预警系统</h3>

        <el-form-item prop="nickName">
          <el-input v-model="registerForm.nickName" type="text" auto-complete="off" placeholder="请输入姓名">
@ -256,17 +271,66 @@ export default {
 </script>

 <style rel="stylesheet/scss" lang="scss">
-.container {
+.container-rg {
  display: flex;
-  justify-content: flex-end;
  align-items: center;
  height: 100%;
-  background-image: url("../assets/images/bg.png");
-  background-size: cover;
+}
+
+.lef-cont{
+
+  width: 50%;
+  height: 100%;
+  background-color: #7288FA;
+  box-sizing: border-box;
+  padding: 5%;
+  position: relative;
+  .circle1{
+    position: absolute;
+    top: 8%;
+    left: 8%;
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+    background-color: #8EA0FB;
+  }
+  .circle2{
+    position: absolute;
+    top: calc(8% + 25px);
+    left: calc(8% + 25px);
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    background-color: #fff;
+  }
+  .tit{
+    margin-top: 10%;
+    margin-bottom: 20px;
+    display: flex;
+    flex-direction: column;
+    font-size: 32px;
+    color: #fff;
+  }
+  .tit-en{
+    display: flex;
+    flex-direction: column;
+    font-size: 20px;
+    color: #fff;
+  }
+  .img-cont{
+    width: 300px;
+    height: 300px;
+    margin: 80px auto;
+    img{
+      width: 100%;
+      height: 95%;
+    }
+  }
+
 }

 .register {
-  width: 42%;
+  width: 50%;
  display: flex;
  justify-content: center;
  align-items: center;