1.新增cookie参数 rediskey

loulijun2021

2022-09-27 bbb03ff09f77e4ece3dfcf80df855829399528ae

1.新增cookie参数 rediskey

 src/store/modules/user.js

@@ -44,6 +44,7 @@
        setCookie('navTabId', res.data.usercode)
        setCookie('usertype', res.data.usertype)
        setCookie('userid', res.data.userid)
        setCookie('rediskey', res.data.rediskey)
        // }
        // console.log(res.code === '302', 8989)
        // if (res.code === '302') {
@@ -121,6 +122,7 @@
          removeCookie('navTabId')
          removeCookie('usertype')
          removeCookie('userid')
          removeCookie('rediskey')
          removeCookie('code')

          // reset visited views and cached views

 src/utils/request.js

@@ -65,6 +65,7 @@
        removeCookie('navTabId')
        removeCookie('usertype')
        removeCookie('userid')
        removeCookie('rediskey')
        removeCookie('code')
        setTimeout(() => {
          sessionStorage.removeItem('tabViews')

 src/views/bbgl/rygz.vue

@@ -118,6 +118,7 @@
          <el-table-column
            prop="partspec"
            label="产品规格"
            width="160"
            show-tooltip-when-overflow
            sortable="custom"
          >
@@ -178,8 +179,8 @@
          </el-table-column>
          <el-table-column
            prop="usermoney"
            label="记件工资"
            width="110"
            label="班组记件工资"
            width="130"
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -198,6 +199,7 @@
            label="报工时间"
            width="160"
            sortable="custom"
            fixed="right"
          />

        </el-table>

 src/views/gantt_back/gantt_back.vue

@@ -83,8 +83,11 @@
      </el-row>
      <el-row />
    </el-tabs>
    <!--    {{ time_data }}-->
    <!--    {{ bm_data }}-->
    <div class="container" style="margin: 30px;">
      <v-gantt-chart

        :start-time="time_data[0]"
        :end-time="time_data[1]"
        :cell-width="cellWidth"
@@ -273,54 +276,6 @@
        },
        'rows': [
          {
            'YearDate': '2022-09-24',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '78',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
                'ThreeStartDate': '',
                'FourStartDate': '',
                'FiveStartDate': ''
              }
            ]
          },
          {
            'YearDate': '2022-09-25',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '78',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
                'ThreeStartDate': '',
                'FourStartDate': '',
                'FiveStartDate': ''
              }
            ]
          },
          {
            'YearDate': '2022-09-26',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '78',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
                'ThreeStartDate': '',
                'FourStartDate': '',
                'FiveStartDate': ''
              }
            ]
          },
          {
            'YearDate': '2022-09-27',
            'children': [
              {
@@ -359,6 +314,54 @@
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '78',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
                'ThreeStartDate': '',
                'FourStartDate': '',
                'FiveStartDate': ''
              }
            ]
          },
          {
            'YearDate': '2022-09-30',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '78',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
                'ThreeStartDate': '',
                'FourStartDate': '',
                'FiveStartDate': ''
              }
            ]
          },
          {
            'YearDate': '2022-10-01',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '78',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
                'ThreeStartDate': '',
                'FourStartDate': '',
                'FiveStartDate': ''
              }
            ]
          },
          {
            'YearDate': '2022-10-02',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
                'AdvaDevicName': '金鼎数控车床029',
                'AdvaDevicCropMob': '30',
                'AdvaDevicRhythm': '10',
                'OneStartDate': '08:00~11:30',
                'TwoStartDate': '12:30~17:00',
@@ -745,6 +748,7 @@
          }
        }
      }
      console.log(newList, 321)
      for (const i in list) {
        this.pushTiem(newList, list[i].id, list[i].gtArray)
      }
@@ -977,7 +981,7 @@
      for (const i in this.bm_data) {
        const newArr = []
        for (const j in this.bm_data[i].gtArray) {
          if (this.bm_data[i].gtArray[j].type != 'schedule') {
          if (this.bm_data[i].gtArray[j].type !== 'schedule') {
            newArr.push(this.bm_data[i].gtArray[j])
          }
        }

 src/views/jcsz/jsqd.vue

@@ -511,6 +511,7 @@
          <input
            class="myCheckboxInput"
            type="checkbox"
            :disabled="rightFrom.usercode==='S001'"
            :value="item.code"
            :name="item.name"
            :style="{color:item.isSelected2?'#42b983':'#fff'}"
@@ -794,6 +795,10 @@
    },
    // ä¿®æ”¹æŒ‰é’®
    edit(operation, row) {
      if (row.role_code === 'S001') {
        return this.$message.info('此角色无法操作！')
      }

      this.operation = operation
      this.dialogVisible = true

@@ -808,6 +813,9 @@
    },
    // åˆ é™¤æŒ‰é’®
    del(row) {
      if (row.role_code === 'S001') {
        return this.$message.info('此角色无法操作！')
      }
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -953,6 +961,9 @@

    /* å…³è”用户模块*/
    userClick(row) {
      if (row.role_code === 'S001') {
        return this.$message.info('此角色无法操作！')
      }
      this.userDialogVisible = true
      this.userForm.roleName = row.role_name
      this.dialogFormUser.rolecode = row.role_code
@@ -1072,6 +1083,19 @@
        this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
          item.children = item.children.filter(it => it.is_delete === '0')

          if (this.rightFrom.usercode === 'S001') { // Admin系统管理员菜单做到只增不减
            if (item.flag === 'Y') {
              item.disabled = true
            }
            if (item.children && item.children.length > 0) {
              item.children.forEach(it => {
                if (it.flag === 'Y') {
                  it.disabled = true
                }
              })
            }
          }
        })
      }

@@ -1080,6 +1104,19 @@
        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
          item.children = item.children.filter(it => it.is_delete === '0' || it.is_delete === null)
          // item.children = item.children.filter(it => it.is_delete !== '1')

          if (this.rightFrom.usercode === 'S001') { // Admin系统管理员菜单做到只增不减
            if (item.flag === 'Y') {
              item.disabled = true
            }
            if (item.children && item.children.length > 0) {
              item.children.forEach(it => {
                if (it.flag === 'Y') {
                  it.disabled = true
                }
              })
            }
          }
        })
      }
      // console.log(this.dialogFormRight.rightAPPArr[0], 234)
@@ -1233,9 +1270,15 @@
      }
      if (this.PCTrue) {
        this.dialogFormRight.rightPCArr[0].name = '全部'
        if (this.rightFrom.usercode === 'S001') { // Admin系统管理员菜单做到只增不减
          this.dialogFormRight.rightPCArr[0].disabled = true
        }
      }
      if (this.APPTrue) {
        this.dialogFormRight.rightAPPArr[0].name = '全部'
        if (this.rightFrom.usercode === 'S001') { // Admin系统管理员菜单做到只增不减
          this.dialogFormRight.rightAPPArr[0].disabled = true
        }
      }

      // æ ‘形回显部分

 src/views/xtsz/bmgz.vue

@@ -65,6 +65,11 @@
            fixed
          />
          <el-table-column
            prop="right_code"
            label="编码"
            sortable="custom"
          />
          <el-table-column
            prop="right_name"
            label="编码名称"
            sortable="custom"

 src/views/zzmx/gylx_bak.vue

ÎļþÒÑɾ³ý