Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-26 f4cf3f1acf2582b87bb7e7ca87ebc29341c9ea8b

Merge remote-tracking branch 'origin/master'

 src/assets/map/dujiangyan.json

File was deleted

 src/assets/map/zigong1.json

New file
Diff too large

 src/views/screen/components/screen-map/index.vue

@@ -11,7 +11,7 @@
<script>
import * as echarts from 'echarts';
import 'echarts-gl';
import mapData from '@/assets/map/zigong.json';
import mapData from '@/assets/map/zigong1.json';
import WrapperTitle from '../wrapper-title/index';

echarts.registerMap('zigong', mapData);
@@ -45,7 +45,7 @@
    viewControl: {
      beta: -30,
      alpha: 50,
      distance: 85,
      distance: 78,
      maxBeta: 180,
      panSensitivity: 0,
      zoomSensitivity: 1,
@@ -93,7 +93,7 @@
      viewControl: {
        beta: -30,
        alpha: 50,
        distance: 85,
        distance: 78,
        maxBeta: 180,
        panSensitivity: 0,
        zoomSensitivity: 1,

 src/views/screen/components/screen-table/index.vue

@@ -4,11 +4,23 @@
      <el-table :data="tableData" border :height="tableHeight" :max-height="tableHeight" class="rank-table">
        <el-table-column prop="name" label="地区" align="center" width="100">
        </el-table-column>
        <el-table-column prop="data1" label="人脸设备总数" align="center">
        <el-table-column label="人脸设备" align="center">
          <el-table-column prop="data1" label="设备正常数" align="center">
          </el-table-column>
          <el-table-column prop="data1" label="设备异常数" align="center">
          </el-table-column>
        </el-table-column>
        <el-table-column prop="data2" label="车辆设备总数" align="center">
        <el-table-column label="车辆设备" align="center">
          <el-table-column prop="data1" label="设备正常数" align="center">
          </el-table-column>
          <el-table-column prop="data1" label="设备异常数" align="center">
          </el-table-column>
        </el-table-column>
        <el-table-column prop="data3" label="视频设备总数" align="center">
        <el-table-column label="视频设备" align="center">
          <el-table-column prop="data1" label="设备正常数" align="center">
          </el-table-column>
          <el-table-column prop="data1" label="设备异常数" align="center">
          </el-table-column>
        </el-table-column>
      </el-table>
    </div>
@@ -87,7 +99,7 @@
.table-container {
  width: 100%;
  // flex: 1;
  height: 355px;
  height: 380px;
  position: relative;
  background: rgba(67, 102, 155, 0.3);
  border: 1px solid rgba(47, 91, 157, 0.8);

 src/views/screen/components/screen-title/index.vue

@@ -5,7 +5,7 @@
        <img src="@/assets/images/screen/header_bg.png" class="width-img" alt="">
      </div>
      <div class="header-text">
        大屏
        自贡市运维考核大屏
      </div>
    </div>
  </div>

 src/views/screen/components/screen-wrapper/index.vue

@@ -78,7 +78,7 @@
}

.wrapper {
  width: 27%;
  width: 25%;
  height: 100%;
  box-sizing: border-box;
  padding: 0 10px;
@@ -95,7 +95,7 @@
  }
}
.center-wrapper {
  width: 46%;
  width: 50%;
  height: 100%;
  box-sizing: border-box;
  padding: 0 10px;

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

@@ -29,108 +29,55 @@
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="primary"-->
<!--          plain-->
<!--          icon="el-icon-plus"-->
<!--          size="mini"-->
<!--          @click="handleAdd"-->
<!--          v-hasPermi="['x:work-order:add']"-->
<!--        >新增</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="success"-->
<!--          plain-->
<!--          icon="el-icon-edit"-->
<!--          size="mini"-->
<!--          :disabled="single"-->
<!--          @click="handleUpdate"-->
<!--          v-hasPermi="['x:work-order:edit']"-->
<!--        >修改</el-button>-->
<!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
        >删除</el-button>
    <el-row>
      <el-col :span="8" v-for="item in workOrderList" :key="item" style="margin: 10px;width: 20%;">
        <el-card :body-style="{ padding: '0px' }">
          <img src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image">
          <div style="padding: 14px;">
            <span>{{ item.unitName }}</span>
            <span class="time">{{ item.ywPeopleName }}</span>
            <div class="bottom clearfix">
              <span style="font-size: 13px;">处理时间</span>
              <time class="time">{{ item.ywHandleTime }}</time>
            </div>
            <div class="bottom clearfix">
              <el-button
                size="mini"
                type="text"
                @click="handleAuditing(item)"
                v-hasPermi="['work:order:audit']"
              >审核</el-button>
              <el-button
                size="mini"
                type="text"
                @click="handleYwCondition(item)"
              >运维情况</el-button>
              <!--          <el-button-->
              <!--            size="mini"-->
              <!--            type="text"-->
              <!--            @click="handleYwResult(scope.row)"-->
              <!--          >运维结果</el-button>-->
              <el-button
                size="mini"
                type="text"
                @click="handleCheckResult(item)"
                v-hasPermi="['work:order:result']"
              >检测结果</el-button>
              <el-button
                size="mini"
                type="text"
                @click="handleFlow(item)"
              >过程图</el-button>
              <el-button
                size="mini"
                type="text"
                @click="handleReport(item)"
              >事后报备</el-button>
            </div>
          </div>
        </el-card>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['x:work-order:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单号" align="center" prop="workOrderNo" width="170"/>
      <el-table-column label="工单来源" align="center" prop="source" width="170"/>
      <el-table-column label="是否报备" align="center" width="170">
        <template slot-scope="scope">
          <el-tag>已报备(事前)</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="故障类型" align="center" prop="errorType" width="170"/>
      <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="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">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            @click="handleAuditing(scope.row)"
            v-hasPermi="['work:order:audit']"
          >审核</el-button>
          <el-button
            size="mini"
            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="handleCheckResult(scope.row)"
            v-hasPermi="['work:order:result']"
          >检测结果</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleFlow(scope.row)"
          >过程图</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleReport(scope.row)"
          >事后报备</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
@@ -265,7 +212,7 @@
      </div>
    </el-dialog>

    <el-dialog title="运维检测结果" :visible.sync="checkResultOpen" width="500px" append-to-body>
    <el-dialog title="运维检测结果" :visible.sync="checkResultOpen" width="550px" append-to-body>
      <el-form ref="ywResultForm" :model="checkResultForm" :rules="checkResultRules" label-width="120px">
        <el-form-item label="工单号" prop="workOrderNo">
          <el-input v-model="checkResultForm.workOrderNo" disabled  />
@@ -277,7 +224,7 @@
          <el-input v-model="checkResultForm.ywPeopleName" disabled />
        </el-form-item>
        <el-form-item label="运维检测结果" prop="ywCheckResult">
          <el-input v-model="checkResultForm.ywCheckResult" type="textarea" maxlength="150" show-word-limit/>
          <file-upload v-model="checkResultForm.ywCheckResult"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -287,7 +234,7 @@
    </el-dialog>

    <!-- 添加或修改运维工单对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="工单号" prop="workOrderNo">
          <el-input v-model="form.workOrderNo" placeholder="请输入工单号" />
@@ -790,3 +737,33 @@
  }
};
</script>

<style scoped>

.time {
  font-size: 13px;
  color: #999;
  margin-left: 10px;
}

.bottom {
  margin-top: 13px;
  line-height: 12px;
}


.image {
  width: 100%;
  display: block;
}

.clearfix:before,
.clearfix:after {
  display: table;
  content: "";
}

.clearfix:after {
  clear: both
}
</style>