Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

ZhangXianQiang

2024-03-20 60609230f220fccdf0768b2d2255291f30940a4f

Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

 src/api/system/role.js

@@ -56,7 +56,13 @@
    data: data
  })
}

// 切换角色
export function exchangeRole(roleId) {
  return request({
    url: '/system/role/exchange/'+ roleId,
    method: 'get',
  })
}
// 删除角色
export function delRole(roleId) {
  return request({

 src/layout/components/Navbar.vue

@@ -6,6 +6,11 @@
    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>

    <div class="right-menu">
      <el-button-group style="vertical-align: text-bottom;">
        <el-button @click="exchange(100)">省厅角色</el-button>
        <el-button @click="exchange(103)">区县角色</el-button>
        <el-button @click="exchange(2)">运维角色</el-button>
      </el-button-group>
      <template v-if="device!=='mobile'">
        <screenfull id="screenfull" class="right-menu-item hover-effect" />
        <el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -31,6 +36,7 @@
          </el-dropdown-item>
        </el-dropdown-menu>
      </el-dropdown>

    </div>
  </div>
</template>
@@ -45,7 +51,7 @@
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'

import { exchangeRole} from "@/api/system/role";
export default {
  components: {
    Breadcrumb,
@@ -81,6 +87,11 @@
    }
  },
  methods: {
    exchange(roleId){
        exchangeRole(roleId).then(response => {
              this.$modal.msgSuccess("修改成功");
            }).catch(()=>{});
          },
    toggleSideBar() {
      this.$store.dispatch('app/toggleSideBar')
    },

 src/views/system/check-result/city/index.vue

@@ -94,8 +94,8 @@
      <div class="text item">考核频率<span class="time">{{ "季度" }}</span></div>
      <div class="text item">考核时间
        <span class="time">{{ item.checkTime }}</span>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1">确认发布</el-button>
        <el-button size="small" round style="float: right;" v-show="item.publish == 1" disabled="true">已发布</el-button>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1"  v-hasPermi="['result:city:publish']">确认发布</el-button>
        <el-button size="small" round style="float: right;" v-show="item.publish == 1" disabled="true"  v-hasPermi="['result:city:publish']">已发布</el-button>
      </div>
    </el-card>


 src/views/system/check-result/index.vue

@@ -94,8 +94,8 @@
      <div class="text item">考核分数<span class="time">{{ item.checkScore }}</span></div>
      <div class="text item">考核时间
        <span class="time">{{ item.checkTime }}</span>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1">确认发布</el-button>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1">已发布</el-button>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1"  v-hasPermi="['result:contract:publish']">确认发布</el-button>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1"  v-hasPermi="['result:contract:publish']">已发布</el-button>
      </div>
    </el-card>


 src/views/system/check-template/index.vue

@@ -116,14 +116,15 @@
          <el-input v-model="form.templateName" placeholder="请输入模板名称" />
        </el-form-item>
        <el-form-item label="考核对象" prop="unitName">
          <el-select v-model="form.unitName" placeholder="请选择">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
          <div class="block">
            <span class="demonstration"></span>
            <el-cascader
              v-model="value"
              :options="options"
              :props = "props"
              @change="handleChange"></el-cascader>
          </div>

        </el-form-item>
        <el-form-item label="考核规则" prop="tempRuleFormList">
          <div class="row-warp">
@@ -193,6 +194,46 @@
  name: "CheckTemplate",
  data() {
    return {
      props: { multiple: true },
      value: [],
      options: [{
        value: 'city',
        label: '区县',
        children: [{
          value: 'fushun',
          label: '富顺县',
        }, {
          value: 'rong',
          label: '荣县',
        },{
          value: 'gaoxin',
          label: '高新区',
        },{
          value: 'ziliujing',
          label: '自流井区',
        },{
          value: 'gongjing',
          label: '贡井区',
        },{
          value: 'daan',
          label: '大安区',
        },{
          value: 'yantan',
          label: '沿滩区',
        },
        ]
      }, {
        value: 'company',
        label: '公司',
        children: [{
          value: 'yunwei',
          label: '成都x运维',
        }, {
          value: 'yunwei2',
          label: '自贡x运维',
        }, ]
      },
      ],
      ruleList: [],
      unitList: [],
      // 临时规则表单
@@ -250,6 +291,9 @@
    this.selectUnit();
  },
  methods: {
    handleChange(value) {
      console.log(value);
    },
    removeRule(form) {
      console.log(form)
      this.ruleFormList = this.ruleFormList.filter(item => item !== form);

 src/views/system/report/index.vue

@@ -104,7 +104,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleAuditing(scope.row)"
            v-hasPermi="['system:report:auditing']"
            v-hasPermi="['system:report:audit']"
          >审核</el-button>
          <el-button
            size="mini"

 src/views/system/work-order/index.vue

@@ -107,15 +107,16 @@
            type="text"
            @click="handleYwCondition(scope.row)"
          >运维情况</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleYwResult(scope.row)"
          >运维结果</el-button>
<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            @click="handleYwResult(scope.row)"-->
<!--          >运维结果</el-button>-->
          <el-button
            size="mini"
            type="text"
            @click="handleCheckResult(scope.row)"
            v-hasPermi="['work:order:result']"
          >检测结果</el-button>
          <el-button
            size="mini"
@@ -281,7 +282,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitYwResult">确 定</el-button>
        <el-button @click="cancelYwResult">取 消</el-button>
        <el-button @click="cancelCheckResult">取 消</el-button>
      </div>
    </el-dialog>