licp
2024-07-30 798610ea27080fbc416997ad573cb1f1f1ab1ae2
修改温度循环bug
已修改11个文件
已添加7个文件
793 ■■■■ 文件已修改
src/App.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/api/controller.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/borrow.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/calibration.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/check-and-accept.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/check.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/fault.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/files.vue 262 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/maintenance.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/operation-overview.vue 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/record.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-device/state.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/Inspection.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-sample/detail.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/tool/echart.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-device.vue 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/util/echarts.js 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/App.vue
@@ -318,4 +318,9 @@
    font-size: 12px;
    line-height: 32px;
  }
  .single-line-ellipsis {
    white-space: nowrap;
    overflow: hidden;
    text-overflow: ellipsis;
  }
</style>
src/assets/api/controller.js
@@ -154,6 +154,7 @@
  deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // åˆ é™¤æ•°é‡‡é…ç½®
  determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // åˆ¤æ–­è¯¥è®¾å¤‡æ˜¯å¦å¯ä»¥æ•°é‡‡
  dataCollection: "/deviceScope/dataCollection", // æ•°é‡‡-数据采集
  treeDevice: "/deviceScope/treeDevice", // è®¾å¤‡æ ‘å½¢
}
const insOrder = {
src/components/do/a6-device/borrow.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备借用</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/calibration.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备校准</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/check-and-accept.vue
@@ -1,8 +1,13 @@
<!--
 * @Author: licp lichunping@guanfang.com.cn
 * @Date: 2024-07-29 15:44:19
 * @LastEditors: licp lichunping@guanfang.com.cn
 * @LastEditTime: 2024-07-29 16:11:59
 * @FilePath: \center-lims-before\src\components\do\a6-device\check-and-accept.vue
 * @Description: è¿™æ˜¯é»˜è®¤è®¾ç½®,请设置`customMade`, æ‰“å¼€koroFileHeader查看配置 è¿›è¡Œè®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
  <div>设备验收</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/check.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备核查</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/fault.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备故障</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/files.vue
@@ -1,8 +1,254 @@
<!--
 * @Author: licp lichunping@guanfang.com.cn
 * @Date: 2024-07-29 15:43:42
 * @LastEditors: licp lichunping@guanfang.com.cn
 * @LastEditTime: 2024-07-29 15:43:48
 * @FilePath: \center-lims-before\src\components\do\a6-device\files.vue
 * @Description: è¿™æ˜¯é»˜è®¤è®¾ç½®,请设置`customMade`, æ‰“å¼€koroFileHeader查看配置 è¿›è¡Œè®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
  <div class="page">
    <div class="page-header">
      <h4><span class="line"></span><span>设备档案</span></h4>
      <div class="btns">
        <el-button type="primary" size="small">修订档案</el-button>
        <el-button type="primary" size="small">添加附件</el-button>
      </div>
    </div>
    <el-divider></el-divider>
    <el-row :gutter="20">
      <el-col :span="6">
        <el-image src="" fit="fill" style="width: 200px;height: 300px;border: 1px solid #000;border-radius: 10px;margin-left: 30px;margin-top: 20px;">
          <div slot="error" class="image-slot">
            <i class="el-icon-picture-outline" style="font-size: 40px;"></i>
          </div>
        </el-image>
      </el-col>
      <el-col :span="9">
        <div class="form-item">
          <label>设备名称</label>
          <p>扫描电镜(带能谱)</p>
        </div>
        <div class="form-item">
          <label>大类</label>
          <p>分析仪器</p>
        </div>
        <div class="form-item">
          <label>内部编号</label>
          <p>扫描电镜(带能谱)</p>
        </div>
        <div class="form-item">
          <label>生产厂家</label>
          <p>-</p>
        </div>
        <div class="form-item">
          <label>资产编码</label>
          <p>-</p>
        </div>
        <div class="form-item">
          <label>出厂日期</label>
          <p>2024-7-20</p>
        </div>
        <div class="form-item">
          <label>启用日期</label>
          <p>2024-7-20</p>
        </div>
        <div class="form-item">
          <label>核准周期(月)</label>
          <p>12</p>
        </div>
        <div class="form-item">
          <label>检测类型</label>
          <p>12</p>
        </div>
        <div class="form-item">
          <label>报废时间</label>
          <p>2024-7-20</p>
        </div>
        <div class="form-item">
          <label>准确度量值</label>
          <p>-</p>
        </div>
        <div class="form-item">
          <label>被授权人</label>
          <p>-</p>
        </div>
        <div class="form-item">
          <label>维修记录</label>
          <p>-</p>
        </div>
      </el-col>
      <el-col :span="9">
        <div class="form-item">
          <label>规格型号</label>
          <p>JSM-6010LA</p>
        </div>
        <div class="form-item">
          <label>细类</label>
          <p>分析仪器</p>
        </div>
        <div class="form-item">
          <label>设备状态</label>
          <el-radio-group v-model="form.value1" disabled>
            <el-radio :label="0">合格</el-radio>
            <el-radio :label="1">ç»´ä¿®</el-radio>
          </el-radio-group>
        </div>
      </el-col>
    </el-row>
    <h4 style="margin-bottom: 10px;margin-top: 10px;"><span class="line"></span><span>附件和相关文档</span></h4>
    <div class="tables">
      <ValueTable ref="ValueTable"
                :url="$api.auxiliaryWorkingHoursDay.selectAuxiliaryWorkingHoursDay"
                :delUrl="$api.auxiliaryWorkingHoursDay.deleteAuxiliaryWorkingHoursDay" :componentData="componentData" :key="upIndex" style="min-height: 400px;"/>
    </div>
  </div>
</template>
<script>
import ValueTable from '../../tool/value-table.vue'
export default {
  components: {
    ValueTable
  },
  data(){
    return{
      componentData: {
        entity: {
          week: null,
          weekDay: null,
          dateTime: null,
          name:null,
          orderBy: {
            field: 'id',
            order: 'desc'
          }
        },
        isIndex: true,
        showSelect: false,
        select: false,
        isPage:false,
        do: [{
          id: 'getFile',
          font: '附件',
          type: 'text',
          method: 'getFile'
        }, {
          id: 'handleLook',
          font: '查看',
          type: 'text',
          method: 'handleLook'
        },{
          id: 'delete',
          font: '删除',
          type: 'text',
          method: 'doDiy',
          disabFun: (row, index) => {
            return row.state === '已审核' || row.state === '已批准'
          }
        }],
        tagField: {
          shift:{
            select:[]
          },
          state:{
            select:[
              {
                label:'已提交',
                value:'已提交',
                type:'primary'
              },
              {
                label:'已审核',
                value:'已审核',
                type:'warning'
              },
              {
                label:'已批准',
                value:'已批准',
                type:'success'
              },
            ]
          },
          weekDay:{
            select:[]
          }
        },
        linkEvent: {},
        selectField: {
          shift:{
            select:[]
          },
          state:{
            select:[
              {
                label:'已提交',
                value:'已提交',
                type:'primary'
              },
              {
                label:'已审核',
                value:'已审核',
                type:'warning'
              },
              {
                label:'已批准',
                value:'已批准',
                type:'success'
              },
            ]
          },
          weekDay:{
            select:[]
          }
        },
        requiredAdd: [],
        requiredUp: []
            },
      upIndex:0
    }
  }
}
</script>
<style scoped>
.page{
  width: 100%;
  height: 100%;
  overflow-y: auto;
  overflow-x: hidden;
}
.page-header{
  display: flex;
  justify-content: space-between;
}
h4{
  display: flex;
  align-items: center;
}
h4 .line{
  display: inline-block;
  width: 3px;
  height: 16px;
  background: #3A7BFA;
  margin-right: 4px;
}
.tables{
  width: calc(100vw - 390px);
}
.el-image {
  position: relative;
}
.el-icon-picture-outline{
  position: absolute;
  left: 50%;
  top: 50%;
  transform: translate(-50%,-50%);
}
.form-item{
  line-height: 34px;
  display: flex;
  align-items: center;
  font-size: 14px;
}
.form-item label{
  width: 110px;
  display: inline-block;
  text-align: right;
  margin-right: 20px;
  color: #999;
}
</style>
src/components/do/a6-device/maintenance.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备维护</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/operation-overview.vue
@@ -1,13 +1,161 @@
<template>
  <div>运行总览</div>
  <div class="page">
    <echart-module :id="'page-left'" :config="chartConfig" :datas="chartData" class="page-left"></echart-module>
    <div class="page-right">
      <div class="form-item">
        <label>故障次数</label>
        <span>0</span>
      </div>
      <div class="form-item">
        <label>最近故障日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>最近校准日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>下次校准日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>校准总结论</label>
        <el-radio-group v-model="form.value1" disabled>
          <el-radio :label="0">合格</el-radio>
          <el-radio :label="1">不合格</el-radio>
          <el-radio :label="2">其他</el-radio>
        </el-radio-group>
      </div>
      <div class="form-item">
        <label>最近核查日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>下次核查日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>核查总结论</label>
        <el-radio-group v-model="form.value1" disabled>
          <el-radio :label="0">合格</el-radio>
          <el-radio :label="1">不合格</el-radio>
          <el-radio :label="2">其他</el-radio>
        </el-radio-group>
      </div>
      <div class="form-item">
        <label>最近维护日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>下次维护日期</label>
        <el-date-picker
          v-model="form.value1"
          type="date"
          size="small"
          placeholder="选择日期" style="width: calc(100% - 200px);" readonly>
        </el-date-picker>
      </div>
      <div class="form-item">
        <label>维护类型</label>
        <el-radio-group v-model="form.value1" disabled>
          <el-radio :label="0">使用前后维护</el-radio>
          <el-radio :label="1">计划中维护</el-radio>
        </el-radio-group>
      </div>
      <div class="form-item">
        <label>测量项目</label>
        <span>1111111</span>
      </div>
    </div>
  </div>
</template>
<script>
import EchartModule from '../../tool/echart.vue'
export default {
  components: {EchartModule},
  data(){
    return {
      chartConfig:{
        height: '',
        isLoading:true,
        type:'gauge'
      },
      chartData:{
        xData:[],
        yData:[
          {
            title:'任务接收量',
            data:[]
          }
        ]
      },
      form:{
        value1:''
      }
    }
  }
}
</script>
<style scoped>
.page{
  width: 100%;
  height: 100%;
  display: flex;
}
.page-left{
  width: 420px;
  height: 420px;
  margin-top: 40px;
  margin-right: 40px;
}
.page-right{
  flex: 1;
  /* background: red; */
}
.form-item{
  line-height: 42px;
  font-size: 14px;
}
.page-right label{
  color: #999;
  width: 110px;
  display: inline-block;
  text-align: right;
  margin-right: 20px;
}
>>>.el-radio__input.is-disabled+span.el-radio__label{
  color: #606266 !important;
}
</style>
src/components/do/a6-device/record.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备记录</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/a6-device/state.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <div>设备停用/启用</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -531,7 +531,7 @@
              prop="value0"
              label="外端"
              align="center"
              width="80" :key="(new Date())+'1'">
              width="80" :key="(new Date().getTime())+'1234567'">
              <template slot="header">
                {{ '外端'+(index+1) }}
              </template>
@@ -543,7 +543,7 @@
              prop="value1"
              label="内端"
              align="center"
              width="80" :key="(new Date())+'2'">
              width="80" :key="(new Date().getTime())+'23333333'">
              <template slot="header">
                {{ '内端'+(index+1) }}
              </template>
@@ -554,7 +554,7 @@
            <el-table-column
              prop="comValue"
              align="center"
              min-width="150" :key="(new Date())+'3'">
              min-width="150" :key="(new Date().getTime())+'364654654'">
              <template slot="header">
                {{ '衰减系数'+item }}
              </template>
@@ -567,7 +567,7 @@
              label="衰减差"
              align="center"
              v-if="wareForm.inspectionItemSubclass!='20(常温)'"
              min-width="90" :key="(new Date())+'4'">
              min-width="90" :key="(new Date().getTime())+'434634634634'">
              <template slot="header">
                {{ '衰减差'+(index+1) }}
              </template>
@@ -579,7 +579,7 @@
              prop="insResult"
              label="结论"
              align="center"
              min-width="70" v-if="wareForm.inspectionItemSubclass!='20(常温)'" :key="(new Date())+'5'">
              min-width="70" v-if="wareForm.inspectionItemSubclass!='20(常温)'" :key="(new Date().getTime())+'53457689809808-'">
              <template slot="header">
                {{ '结论'+(index+1) }}
              </template>
@@ -1391,9 +1391,11 @@
          let arr1 = []
          this.wareLength = [];
          for(let i=0;i<arr.length;i++){
            arr1.push([])
            this.wareLength.push(arr[i][0].inspectionItemClass)
          }
          for(let i=0;i<arr[0].length;i++){
            arr1.push([])
          }
          arr.forEach((item,index)=>{
            item.forEach((m,i)=>{
              try {
src/components/do/b1-sample/detail.vue
@@ -66,12 +66,12 @@
                </el-table-column>
                <el-table-column prop="inspectionItem" label="检验项" min-width="100"
                    show-overflow-tooltip></el-table-column>
                <el-table-column prop="inspectionItemSubclass" label="检验项分类" min-width="100" show-overflow-tooltip></el-table-column>
                <el-table-column prop="inspectionItemSubclass" label="检验项分类" min-width="100" show-overflow-tooltip v-if="PROJECT=='装备电缆'"></el-table-column>
                <el-table-column prop="laboratory" label="实验室" min-min-width="100" show-overflow-tooltip></el-table-column>
                <el-table-column prop="unit" label="单位" min-width="100" show-overflow-tooltip></el-table-column>
                <el-table-column prop="equipName" label="设备" min-width="100" show-overflow-tooltip>
                <el-table-column prop="equipValue" label="设备" min-width="100" show-overflow-tooltip>
          <template slot-scope="scope">
            {{handleData(scope.row.equipName)}}
            {{handleData(scope.row.equipValue)}}
          </template>
        </el-table-column>
                <el-table-column prop="entrustCode" label="委托编号" min-width="100" show-overflow-tooltip></el-table-column>
@@ -135,9 +135,12 @@
      })
    },
    handleData(e){
      let info = JSON.parse(e).map(item => {
      let info = ''
      if(e){
        info = JSON.parse(e).map(item => {
        return item.v;
      }).join(',')
      }
      return info
    }
  }
src/components/tool/echart.vue
@@ -79,6 +79,9 @@
            case 'pie':
            iuCharts.drawPie(this.chart,this.datas)
              break;
            case 'gauge':
            iuCharts.drawGauge(this.chart,this.datas)
              break;
            default:
              break;
          }
src/components/view/a6-device.vue
@@ -1,12 +1,24 @@
<template>
  <div class="device-page">
    <div class="device-left">
      <el-input placeholder="输入设备名称" suffix-icon="el-icon-search" v-model="search" size="small"
      @keyup.enter="handleSearch"
      style="margin-bottom: 5px;" clearable @change="handleSearch"></el-input>
      <ul v-loading="loading">
        <li v-for="(item,index) in 28" :title="item" :class="{active:index==current}" @click="getCurrentDevice(item,index)">设备列表设备列表设备列表设备列表</li>
      </ul>
      <el-input placeholder="输入设备名称" suffix-icon="el-icon-search" v-model="deviceName" size="small"
      @keyup.enter="geList"
      style="margin-bottom: 5px;" clearable @change="geList"></el-input>
      <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="id" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
        @node-collapse="nodeClose" v-loading="loading" :expand-on-click-node="false"
        :default-expanded-keys="expandedKeys"
        style="height:calc(100% - 46px);overflow-y: scroll;scrollbar-width: none;">
        <div class="custom-tree-node" slot-scope="{ node, data }">
          <el-row style="width: 100%;">
            <el-col :span="21" :title="data.label">
              <span class="single-line-ellipsis" style="width: 100%;display: inline-block;">
                <i :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
                {{ data.label }}
              </span>
            </el-col>
          </el-row>
        </div>
      </el-tree>
    </div>
    <div class="device-right">
      <el-radio-group v-model="currentPage" size="small">
@@ -22,14 +34,31 @@
<script>
import operationOverview from '../do/a6-device/operation-overview.vue';
import files from '../do/a6-device/files.vue';
import checkAndAccept from '../do/a6-device/check-and-accept.vue';
import calibration from '../do/a6-device/calibration.vue';
import check from '../do/a6-device/check.vue';
import maintenance from '../do/a6-device/maintenance.vue';
import borrow from "../do/a6-device/borrow.vue";
import fault from "../do/a6-device/fault.vue";
import record from '../do/a6-device/record.vue';
import state from '../do/a6-device/state.vue';
export default {
  components:{
    operationOverview,
    files,
    checkAndAccept,
    calibration,
    check,
    maintenance,
    borrow,
    fault,
    record,
    state,
  },
  data(){
    return {
      search:'',
      current:0,
      deviceName:'',
      loading:false,
      tabList:[
        {
@@ -37,53 +66,96 @@
          title:'设备运行总览',
        },
        {
          id:1,
          id:'files',
          title:'设备档案',
        },
        {
          id:2,
          id:'checkAndAccept',
          title:'设备验收',
        },
        {
          id:3,
          id:'calibration',
          title:'设备校准',
        },
        {
          id:4,
          id:'check',
          title:'设备核查',
        },
        {
          id:5,
          id:'maintenance',
          title:'设备维护',
        },
        {
          id:6,
          id:'borrow',
          title:'设备借用',
        },
        {
          id:7,
          id:'fault',
          title:'设备故障',
        },
        {
          id:8,
          id:'record',
          title:'使用记录',
        },
        {
          id:9,
          id:'state',
          title:'设备停用/启用',
        },
      ],
      currentPage:'operationOverview'
      currentPage:'operationOverview',
      expandedKeys:[],
      selectTree:'',
      list:[]
    }
  },
  mounted(){
    this.geList()
  },
  methods:{
    handleSearch(m){
      // this.loading = true;
    geList(){
      this.loading = true;
      this.$axios.get(this.$api.deviceScope.treeDevice+'?deviceName='+this.deviceName).then(res => {
        this.loading = false;
          let data = res.data
          data.forEach((item,index) => {
            item.id = index +1
            item.label = item.largeCategory
            item.children.forEach((m,i)=>{
              m.label = m.deviceName
            })
          })
          this.list = data
        })
    },
    getCurrentDevice(item,index){
      this.current = index;
    handleNodeClick(val, node, el) { //树的值
      this.selectTree = ''
      this.getNodeParent(node)
      this.selectTree = this.selectTree.replace(' - ', '')
      let data = this.selectTree.split(' - ')
      let data2 = ''
      for (let index = data.length - 1; index >= 0; index--) {
        data2 += " - " + data[index]
      }
      this.selectTree = data2.replace(' - ', '')
      this.currentPage = 'operationOverview';
    }
    },
    getNodeParent(val) {
      if (val.parent != null) {
        if(val.data.children === null){
          this.selectTree += ' - ' + val.label + ' - ' + 'null'
        }else{
          this.selectTree += ' - ' + val.label
        }
        this.getNodeParent(val.parent)
      }
    },
    nodeOpen(data, node, el) {
      $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
    },
    nodeClose(data, node, el) {
      $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
    },
  }
}
</script>
@@ -94,6 +166,7 @@
  padding-top: 10px;
  padding-bottom: 10px;
  box-sizing: border-box;
  width: 100%;
}
.device-left{
  width: 200px;
@@ -103,30 +176,6 @@
  border-radius: 16px;
  box-sizing: border-box;
  padding: 10px 16px;
}
.device-left ul{
  list-style-type: none;
  padding: 0;
  margin: 0;
  font-size: 14px;
  color: #999999;
  cursor: pointer;
  margin-top: 10px;
  height: calc(100% - 46px);
  overflow-y: scroll;
}
.device-left ul li{
  white-space: nowrap;         /* ç¦æ­¢æ¢è¡Œ */
  overflow: hidden;            /* éšè—æº¢å‡ºçš„æ–‡æœ¬ */
  text-overflow: ellipsis;     /* ç”¨çœç•¥å·è¡¨ç¤ºæº¢å‡ºçš„æ–‡æœ¬ */
  padding: 3px 0;
}
.device-left ul li:hover{
  color: #3A7BFA;
}
.device-left ul li.active{
  color: #3A7BFA;
}
.device-right{
  background: #fff;
@@ -138,5 +187,16 @@
.device-right-content{
  margin-top: 10px;
  height: calc(100% - 42px);
  width: 100%;
}
.custom-tree-node {
  width: 100%;
  /* line-height: 32px; */
  font-size: 14px;
}
.node_i {
  color: orange;
  font-size: 18px;
}
</style>
src/main.js
@@ -15,12 +15,12 @@
Vue.prototype.$Big = Big;
// é¡¹ç›®åˆ‡æ¢
// Vue.prototype.PROJECT = '检测中心'
Vue.prototype.PROJECT = '装备电缆'
Vue.prototype.PROJECT = '检测中心'
// Vue.prototype.PROJECT = '装备电缆'
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// const javaApi = 'http://192.168.92.249:8001';
const javaApi = 'http://192.168.92.249:8001';
//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -32,7 +32,7 @@
//装备电缆测试库
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://192.168.92.249:8001';
Vue.prototype.HaveJson = (val) => {
src/util/echarts.js
@@ -265,6 +265,75 @@
      ]
    };
    chart.setOption(option);
  },
  drawGauge:function(chart,params){
    let option = {
      tooltip: {
          formatter: "{a} <br/>{b} : {c}%"
      },
      toolbox: {
          feature: {
              restore: {},
              saveAsImage: {}
          }
      },
      series: [
        {
          type: 'gauge',
          axisLine: {
            lineStyle: {
              width: 28,
              color: [
                [0.3, '#67e0e3'],
                [0.7, '#37a2da'],
                [1, '#fd666d']
              ]
            }
          },
          pointer: {
            itemStyle: {
              color: 'auto'
            }
          },
          axisTick: {
            distance: -28,
            length: 8,
            lineStyle: {
              color: '#fff',
              width: 2
            }
          },
          splitLine: {
            distance: -28,
            length: 28,
            lineStyle: {
              color: '#fff',
              width: 4
            }
          },
          axisLabel: {
            color: 'inherit',
            distance: 40,
            fontSize: 14
          },
          detail: {
            valueAnimation: true,
            formatter: '{value} %',
            color: 'inherit',
            textStyle: {
              fontSize: 30,
              align: 'center',
            },
          },
          data: [
            {
              value: 70
            }
          ]
        }
      ]
    };
    chart.setOption(option,true);
  }
}