loulijun2021
2024-03-07 cb5712942fd2637811832d5a11bb05b2cced5856
1.递交
已修改3个文件
70 ■■■■ 文件已修改
src/views/basicSettings/powerDivider.vue 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/encodingRules.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicSettings/powerDivider.vue
@@ -52,7 +52,8 @@
          >保 存
          </el-button>
          <el-tabs v-model="activeName" type="border-card" @tab-click="tabClick">
          <!--          <el-tabs v-model="activeName" type="border-card" @tab-click="tabClick">-->
          <el-tabs v-model="activeName" type="border-card">
            <el-tab-pane label="PC端" name="PC">
              <div style="display: flex;">
                <div
@@ -131,36 +132,36 @@
                <!--                </div>-->
              </div>
            </el-tab-pane>
            <el-tab-pane label="APP端" name="APP">
              <div style="display: flex;">
                <div
                  ref="scrollLeft"
                  style="border-right: 1px solid rgba(0,0,0,0.2);width:100%;
                                overflow-y: auto;overflow-x:hidden;"
                  :style="{height:(tableHeight-40)+'px'}"
                  @scroll="scrollLeftScroll()"
                  @mouseover="isScroll='left'"
                >
                  <div style=" ">
                    <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 菜单权限
                  </div>
            <!--            <el-tab-pane label="APP端" name="APP">-->
            <!--              <div style="display: flex;">-->
            <!--                <div-->
            <!--                  ref="scrollLeft"-->
            <!--                  style="border-right: 1px solid rgba(0,0,0,0.2);width:100%;-->
            <!--                                overflow-y: auto;overflow-x:hidden;"-->
            <!--                  :style="{height:(tableHeight-40)+'px'}"-->
            <!--                  @scroll="scrollLeftScroll()"-->
            <!--                  @mouseover="isScroll='left'"-->
            <!--                >-->
            <!--                  <div style=" ">-->
            <!--                    <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 菜单权限-->
            <!--                  </div>-->
                  <el-tree
                    ref="treeCenterAPPRef"
                    style="padding-top: 10px;"
                    :data="treeCenter"
                    highlight-current
                    :props="defaultPropsCenter"
                    show-checkbox
                    node-key="menucode"
                    :default-expand-all="true"
                    @check-change="handleTreeCenterCheckChange"
                    @check="handleTreeCenterCheck"
                    @node-click="getLeftTreeNode"
                  />
                </div>
              </div>
            </el-tab-pane>
            <!--                  <el-tree-->
            <!--                    ref="treeCenterAPPRef"-->
            <!--                    style="padding-top: 10px;"-->
            <!--                    :data="treeCenter"-->
            <!--                    highlight-current-->
            <!--                    :props="defaultPropsCenter"-->
            <!--                    show-checkbox-->
            <!--                    node-key="menucode"-->
            <!--                    :default-expand-all="true"-->
            <!--                    @check-change="handleTreeCenterCheckChange"-->
            <!--                    @check="handleTreeCenterCheck"-->
            <!--                    @node-click="getLeftTreeNode"-->
            <!--                  />-->
            <!--                </div>-->
            <!--              </div>-->
            <!--            </el-tab-pane>-->
            <!--            <el-tab-pane label="工控端" name="工控端">工控端</el-tab-pane>-->
          </el-tabs>
src/views/systemSetting/encodingRules.vue
@@ -173,7 +173,7 @@
        <el-form-item label="菜单类型" required>
          <el-radio-group v-model="dialogForm.type" @change="radioChange">
            <el-radio label="PC" name="PC" />
            <el-radio label="APP" name="APP" />
            <!--            <el-radio label="APP" name="APP" />-->
          </el-radio-group>
        </el-form-item>
        <el-form-item label="菜单名称" required>
@@ -336,7 +336,6 @@
        childrenProperty: 'children'
      })
      // this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
    },
    radioChange() {
      this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
@@ -375,7 +374,6 @@
      this.operation = operation
      this.dialogVisible = true
      this.$nextTick(() => {
        this.dialogForm.type = row.Type
        this.radioChange()
@@ -390,7 +388,7 @@
            })
          }
        })
        console.log(parentCode,row.menucode)
        console.log(parentCode, row.menucode)
        this.$refs.cascader.checkedValue = [parentCode, row.menucode]
        this.dialogForm.rightcode = row.menucode
        this.dialogForm.incbit = row.incbit
vue.config.js
@@ -34,7 +34,7 @@
  //     css: {},
  //     postcss: {
  //       plugins: [
  //         require('postcss-px2rem')({
  //         requirae('postcss-px2rem')({
  //           remUnit: 192// /设计图宽度/10
  //         })
  //       ]
@@ -52,7 +52,6 @@
    },
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        // target: 'http://192.168.1.190:8000', // 请求的第三⽅接⼝地址       本地开发服务器
        target: 'http://121.196.36.24:8031', // 请求的第三⽅接⼝地址       本地开发服务器
        // target: 'http://122.227.18.22:8000', // 请求的第三⽅接⼝地址       本地开发服务器
        changeOrigin: true, // 请求跨域时,需 配置此项