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

ZhangXianQiang

2024-03-13 ee0757659bd736da10eb796d607ce2d2e3d5d040

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

 src/views/system/contract/index.vue

@@ -31,7 +31,6 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:contract:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -42,7 +41,6 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:contract:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -53,7 +51,6 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:contract:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -63,7 +60,6 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:contract:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

 src/views/system/region/index.vue

@@ -45,7 +45,6 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:region:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -56,7 +55,6 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:region:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -67,7 +65,6 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:region:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -77,7 +74,6 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:region:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -107,14 +103,12 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:region:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:region:remove']"
          >删除</el-button>
        </template>
      </el-table-column>

 src/views/system/unit/people/index.vue

@@ -82,7 +82,7 @@
      <el-table-column label="运维人员编号" align="center" prop="ywPersonCode" />
      <el-table-column label="运维人员姓名" align="center" prop="ywPersonName" />
      <el-table-column label="运维人员账号" align="center" prop="ywPersonAccount" />
      <el-table-column label="所属运维单位" align="center" prop="belongUnit" />
      <el-table-column label="所属运维单位" align="center" prop="belongUnitName" />
      <el-table-column label="联系电话" align="center" prop="phone" />
      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">

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

@@ -82,10 +82,11 @@
      <el-table-column label="运维单位" align="center" prop="unitName" width="150"/>
      <el-table-column label="运维人员" align="center" prop="ywPeopleName" />
      <el-table-column label="运维处理时间" align="center" prop="ywHandleTime" width="180"/>
      <el-table-column label="处理结束时间" align="center" prop="ywHandleTime" width="180"/>
      <el-table-column label="运维结果" align="center" prop="ywResult" />
      <el-table-column label="运维情况" align="center" prop="ywCondition" width="150"/>
      <el-table-column label="运维检测结果" align="center" prop="ywCheckResult" width="230"/>

      <el-table-column label="运维检测结果" align="center" prop="ywCheckResult" width="200"/>
      <el-table-column label="审核通过时间" align="center" prop="ywHandleTime" width="200"/>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>

      <el-table-column label="操作" fixed="right" width="150"  align="center" class-name="small-padding fixed-width">
@@ -280,9 +281,9 @@


    <!-- 过程图 -->
    <el-dialog title="过程图" :visible.sync="flowOpen" width="900px" append-to-body>
    <el-dialog title="过程图" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
      <div>
        <el-steps :active="1">
        <el-steps :active="2" :space="500">
          <el-step title="产生工单">
            <template slot="description">
              <div>
@@ -296,6 +297,9 @@
                  运维单位：{{flowForm.unitName}}
                </div>
                <div class="flow-item-x">
                  创建时间：{{flowForm.createTime}}
                </div>
                <div class="flow-item-x">
                  处理期限：<el-tag type="danger" size="small">12小时</el-tag>
                </div>
              </div>
@@ -303,21 +307,8 @@
          </el-step>
          <el-step title="运维处理">
            <template slot="description">
              <div style="margin-bottom: 8px;padding: 0 3px; background-color: #d9d9d9;display: flex;flex-direction: row;align-items: center">
                <div style="flex: 2">
                  <div class="flow-item-x">
                    运维状态：<el-tag type="danger" size="small">处理中</el-tag>
                  </div>
                  <div class="flow-item-x">
                    运维人员：<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                  </div>
                </div>
                <div style="flex: 1">
                  {{flowForm.ywHandleTime}}
                </div>
              </div>
              <div style="margin-bottom: 8px;padding: 0 3px;background-color: #d9d9d9;display: flex;flex-direction: row;align-items: center">
                <div style="flex: 2">
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    运维状态：<el-tag type="danger" size="small">结果上报</el-tag>
                  </div>
@@ -325,8 +316,31 @@
                    运维人员：<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                  </div>
                </div>
                <div style="flex: 1">
                  {{flowForm.ywHandleTime}}
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：1
                  </div>
                </div>
              </div>
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    运维状态：<el-tag type="danger" size="small">结果上报</el-tag>
                  </div>
                  <div class="flow-item-x">
                    运维人员：<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：2
                  </div>
                </div>
              </div>

@@ -334,7 +348,42 @@
          </el-step>
          <el-step title="结果审核">
            <template slot="description">
              暂时不能审核
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    审核结果：<el-tag type="danger" size="small">驳回</el-tag>
                  </div>
                  <div class="flow-item-x">
                    审核说明：<el-tag type="danger" size="small">未成功处理</el-tag>
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：1
                  </div>
                </div>
              </div>
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    审核状态：<el-tag type="info" size="small">审核中</el-tag>
                  </div>
                  <div class="flow-item-x">
                    审核说明：
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：2
                  </div>
                </div>
              </div>
            </template>
          </el-step>
        </el-steps>
@@ -347,6 +396,20 @@
.flow-item-x {
  margin: 5px 0;
}
.y-item {
  margin-bottom: 8px;
  padding: 0 3px;
  background-color: #d9d9d9;
  display: flex;
  flex-direction: row;
  align-items: center
}
.y-item-2 {
  flex: 1;
}
.y-item-1 {
  flex: 2;
}
</style>
<script>
import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } from "@/api/platform/work-order";