MrShi
2024-03-01 6d1c8813f14f75a09571731639859766516ffddc
mrshi
已修改6个文件
41 ■■■■ 文件已修改
admin/src/components/system/user/OperaUserWindow.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/visitorSources.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/system/user.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/main.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/redirect.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/system/user/OperaUserWindow.vue
@@ -19,12 +19,12 @@
          <el-radio label="0">女</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="头像" prop="avatar" required>
        <el-radio-group v-model="form.avatar" class="form-item-avatar">
          <el-radio label="/avatar/man.png" border><img src="/avatar/man.png" alt=""></el-radio>
          <el-radio label="/avatar/woman.png" border><img src="/avatar/woman.png" alt=""></el-radio>
        </el-radio-group>
      </el-form-item>
<!--      <el-form-item label="头像" prop="avatar" required>-->
<!--        <el-radio-group v-model="form.avatar" class="form-item-avatar">-->
<!--          <el-radio label="/avatar/man.png" border><img src="/avatar/man.png" alt=""></el-radio>-->
<!--          <el-radio label="/avatar/woman.png" border><img src="/avatar/woman.png" alt=""></el-radio>-->
<!--        </el-radio-group>-->
<!--      </el-form-item>-->
      <el-form-item v-if="form.id == null" label="初始密码" prop="password" required>
        <el-input v-model="form.password" type="password" placeholder="请输入初始密码" maxlength="30" show-password/>
      </el-form-item>
admin/src/views/business/visitorSources.vue
@@ -34,8 +34,8 @@
            <el-form-item label="访客答题说明:" prop="description">
                <el-input style="width: 50%;" type="textarea" v-model="form.description" placeholder="请输入" v-trim/>
            </el-form-item>
            <el-form-item label="入厂须知:" prop="description">
                <el-tiptap style="width: 50%;" v-model="form.description" :extensions="extensions" />
            <el-form-item label="入厂须知:" prop="visitNotice">
                <el-tiptap style="width: 50%;" v-model="form.visitNotice" :extensions="extensions" />
            </el-form-item>
            <el-form-item>
                <el-button type="primary" @click="submit">保存配置项</el-button>
@@ -83,7 +83,8 @@
        healthCard: 0,
        isAnswer: 0,
        theme: '',
        description: ''
        description: '',
        visitNotice: ''
      },
      extensions: [
        new Doc(),
@@ -134,6 +135,7 @@
          this.form.isAnswer = res.isAnswer
          this.form.reservationWay = res.reservationWay
          this.form.theme = res.theme
          this.form.visitNotice = res.visitNotice
        })
    },
    submit () {
@@ -143,7 +145,8 @@
        checkVisit: this.form.checkVisit,
        reservationWay: this.form.reservationWay,
        description: this.form.description,
        theme: this.form.theme
        theme: this.form.theme,
        visitNotice: this.form.visitNotice
      }).then(res => {
        this.$message.success('保存成功')
        this.getData()
@@ -156,7 +159,6 @@
<style lang="scss" scoped>
    .box {
        width: 100%;
        height: 100%;
        padding: 30px;
        box-sizing: border-box;
        background: #ffffff;
admin/src/views/system/user.vue
@@ -37,11 +37,11 @@
        @sort-change="handleSortChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="avatar" label="头像" width="80px" class-name="table-column-avatar" fixed="left">
          <template slot-scope="{row}">
            <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">
          </template>
        </el-table-column>
<!--        <el-table-column prop="avatar" label="头像" width="80px" class-name="table-column-avatar" fixed="left">-->
<!--          <template slot-scope="{row}">-->
<!--            <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">-->
<!--          </template>-->
<!--        </el-table-column>-->
        <el-table-column prop="realname" label="姓名" min-width="100px" fixed="left"></el-table-column>
        <el-table-column prop="username" label="用户名" min-width="120px"></el-table-column>
        <el-table-column prop="empNo" label="工号" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
admin/vue.config.js
@@ -17,7 +17,7 @@
        // http://192.168.0.129:10028   任康
        // https://dmtest.ahapp.net/admin_api   测试服
        // http://10.10.99.63/admin_interface/  最新测试服
        target: 'http://192.168.0.129:10028',
        target: 'http://10.10.99.63/admin_interface',
        changeOrigin: true,
        pathRewrite: {
          [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
h5/main.js
@@ -9,7 +9,7 @@
Vue.prototype.$baseUrl = 'http://192.168.0.129:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
// Vue.prototype.$baseUrl = 'http://10.10.99.63/web_interface/';
// Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/';
Vue.prototype.$store = store;
App.mpType = 'app'
h5/redirect.html
@@ -5,7 +5,8 @@
  <title>重定向</title>
  <script>
    var p = location.href.split("?")
    window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
    // window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
    window.location.href = 'http://218.23.218.228:8018/h5/#/pages/notice/notice?' + p[1]
  </script>
</head>
<body>