wang_xy 10 hónapja
szülő
commit
5c5bbdeb63

+ 322 - 20
src/views/zdsz/engineeringGY/index.vue

@@ -9,6 +9,9 @@
   <div class="app-container">
     <el-form :model="searchParams" ref="searchParams" size="small" :inline="true" v-show="showSearch"
              label-width="110px">
+      <el-form-item label="工程名称" prop="enginName">
+        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称" maxlength="20"></el-input>
+      </el-form-item>
       <el-form-item label="工程分类" prop="enginType">
         <el-select v-model="searchParams.enginType" placeholder="请选择工程类型" clearable>
           <el-option
@@ -29,9 +32,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="工程名称" prop="enginName">
-        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称" maxlength="20"></el-input>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -76,6 +76,8 @@
       </el-col>
       <el-col :span="2.5" style="float: right;">
         <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>无数据
+        <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
         <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>通过
@@ -93,6 +95,9 @@
       <el-table-column label="现场负责人" align="center" prop="sceneHead"/>
       <el-table-column label="设计负责人" align="center" prop="designHead"/>
       <el-table-column label="监理负责人" align="center" prop="supervisionHead"/>
+      <el-table-column label="建项时间" align="center" prop="createTime"/>
+      <el-table-column label="开工时间" align="center" prop="startTime"/>
+      <el-table-column label="竣工时间" align="center" prop="beCompletedTime"/>
       <el-table-column label="用料比" align="center" prop="enginClassification" width="300px">
         <template slot-scope="scope">
           <div>
@@ -109,7 +114,9 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+              <span slot="reference" v-if="item.state == '-1' && item.content=='无数据'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>
+              <span slot="reference" v-else-if="item.state == '0' && item.content=='暂未审核'"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
               <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
@@ -198,7 +205,7 @@
     <!-- 顶管工程新增 -->
     <EngineePipe ref="enginPipe"/>
 
-    <!-- 添加或修改工业工程|工业工程对话框 -->
+    <!-- 修改工业工程对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="工程名称" prop="enginName" v-hasPermi="['zdsz:engineeringgy:add']">
@@ -210,32 +217,92 @@
                     :readonly="title == '添加用料' "></el-input>
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectHead">
-          <el-input v-model="form.projectHead" placeholder="请填写项目负责人" maxlength="20"
-                    :readonly="title == '添加用料' "></el-input>
+          <el-select
+            v-model="form.projectHead"
+            placeholder="请选择项目负责人"
+            clearable
+            @change="getSceneHeadList"
+          >
+            <el-option
+              v-for="dict in dict.type.project_head"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value+','+dict.raw.remark"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="现场负责人" prop="sceneHead">
-          <el-input v-model="form.sceneHead" placeholder="请填写现场负责人" maxlength="20"
-                    :readonly="title == '添加用料' "></el-input>
+          <el-select
+            v-model="form.sceneHead"
+            placeholder="请选择现场负责人"
+            clearable
+          >
+            <el-option
+              v-for="dict in sceneHead"
+              :label="dict"
+              :value="dict"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="设计单位" prop="designUnit">
-          <el-input v-model="form.designUnit" placeholder="请填写设计单位" maxlength="50"
-                    :readonly="title == '添加用料' "></el-input>
+          <el-select
+            v-model="form.designUnit"
+            placeholder="请选择设计单位"
+            clearable
+            @change="getDesignUnitList"
+          >
+            <el-option
+              v-for="dict in dict.type.design_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value+','+dict.raw.remark"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="设计负责人" prop="designHead">
-          <el-input v-model="form.designHead" placeholder="请填写现场负责人" maxlength="20"
-                    :readonly="title == '添加用料' "></el-input>
+          <el-select
+            v-model="form.designHead"
+            placeholder="请选择设计负责人"
+            clearable
+          >
+            <el-option
+              v-for="dict in designHead"
+              :label="dict"
+              :value="dict"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="设计联系方式" prop="designPhone">
           <el-input v-model="form.designPhone" placeholder="请填写设计联系方式" maxlength="13"
                     :readonly="title == '添加用料' "></el-input>
         </el-form-item>
         <el-form-item label="监理单位" prop="supervisionUnit">
-          <el-input v-model="form.supervisionUnit" placeholder="请填写监理单位" maxlength="50"
-                    :readonly="title == '添加用料' "/>
+          <el-select
+            v-model="form.supervisionUnit"
+            placeholder="请选择监理单位"
+            clearable
+            @change="getSupervisionUnitList"
+          >
+            <el-option
+              v-for="dict in dict.type.supervision_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value+','+dict.raw.remark"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="监理负责人" prop="supervisionHead">
-          <el-input v-model="form.supervisionHead" placeholder="请填写监理负责人" maxlength="20"
-                    :readonly="title == '添加用料' "></el-input>
+          <el-select
+            v-model="form.supervisionHead"
+            placeholder="请选择监理负责人"
+            clearable
+          >
+            <el-option
+              v-for="dict in supervisionHead"
+              :label="dict"
+              :value="dict"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="监理联系电话" prop="supervisionPhone">
           <el-input v-model="form.supervisionPhone" placeholder="请填写监理联系电话" maxlength="13"
@@ -331,6 +398,176 @@
       </el-form>
     </el-dialog>
 
+    <!-- 添加工业工程对话框 -->
+    <el-dialog :title="title" :visible.sync="openadd" append-to-body customClass="appendElDialog">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="工程名称" prop="enginName">
+          <el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="60"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="建筑单位" prop="constructUnit">
+          <el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="项目负责人" prop="projectHead">
+          <el-select
+            v-model="form.projectHead"
+            placeholder="请选择项目负责人"
+            clearable
+            @change="getSceneHeadList"
+          >
+            <el-option
+              v-for="dict in dict.type.project_head"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value+','+dict.raw.remark"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="现场负责人" prop="sceneHead">
+          <el-select
+            v-model="form.sceneHead"
+            placeholder="请选择现场负责人"
+            clearable
+          >
+            <el-option
+              v-for="dict in sceneHead"
+              :label="dict"
+              :value="dict"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设计单位" prop="designUnit">
+          <el-select
+            v-model="form.designUnit"
+            placeholder="请选择设计单位"
+            clearable
+            @change="getDesignUnitList"
+          >
+            <el-option
+              v-for="dict in dict.type.design_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value+','+dict.raw.remark"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设计负责人" prop="designHead">
+          <el-select
+            v-model="form.designHead"
+            placeholder="请选择设计负责人"
+            clearable
+          >
+            <el-option
+              v-for="dict in designHead"
+              :label="dict"
+              :value="dict"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设计联系方式" prop="designPhone">
+          <el-input v-model="form.designPhone" placeholder="请填写设计联系方式" maxlength="13"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="监理单位" prop="supervisionUnit">
+          <el-select
+            v-model="form.supervisionUnit"
+            placeholder="请选择监理单位"
+            clearable
+            @change="getSupervisionUnitList"
+          >
+            <el-option
+              v-for="dict in dict.type.supervision_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value+','+dict.raw.remark"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="监理负责人" prop="supervisionHead">
+          <el-select
+            v-model="form.supervisionHead"
+            placeholder="请选择监理负责人"
+            clearable
+          >
+            <el-option
+              v-for="dict in supervisionHead"
+              :label="dict"
+              :value="dict"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="监理联系电话" prop="supervisionPhone">
+          <el-input v-model="form.supervisionPhone" placeholder="请填写监理联系电话" maxlength="13"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="庭院PE管材预设" prop="pePreset">
+          <el-input v-model="form.pePresetTy" placeholder="请填写PE管材预设" maxlength="20" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="庭院钢材预设" prop="gcPreset">
+          <el-input v-model="form.gcPresetTy" placeholder="请填写钢材预设" maxlength="13" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="室内PE管材预设" prop="pePreset">
+          <el-input v-model="form.pePresetSn" placeholder="请填写PE管材预设" maxlength="20" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="室内钢材预设" prop="gcPreset">
+          <el-input v-model="form.gcPresetSn" placeholder="请填写钢材预设" maxlength="13" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                    :readonly="title == '添加用料' "></el-input>
+        </el-form-item>
+        <el-form-item label="工程分类" prop="enginType" >
+          <el-select v-model="form.enginType" placeholder="请选择工程分类" style="width: 100%"
+                     :disabled="title == '添加用料' ">
+            <el-option
+              v-for="e in EngineepipeType"
+              :key="e.dictValue"
+              :label="e.dictLabel"
+              :value="e.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工程类型" prop="enginClassification">
+          <el-select v-model="enginClassificationQuery" placeholder="请选择工程类型" style="width: 100%"  multiple @change="clickByType"
+                     :disabled="title == '添加用料' ">
+            <el-option
+              v-for="e in enginClassificationList"
+              :key="e.dictValue"
+              :label="e.dictLabel"
+              :value="e.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="附件" v-if="form.id" style="width: 100%">
+              <ObsFileUpload ref="obsFileUpload" :file-size="100"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
+                             :limit="9999"
+                             :value="form.pics"
+                             :disabled="title == '添加用料' "
+                             @input="filesUpload"
+              ></ObsFileUpload>
+            </el-form-item>
+            <el-form-item label="附件" v-else style="width: 100%">
+              <ObsFileUpload ref="obsFileUpload" :file-size="100"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
+                             :limit="9999"
+                             :disabled="title == '添加用料' "
+                             :value="form.files"
+                             @input="filesUpload"
+              ></ObsFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div style="width: 25%; float: right" >
+          <el-button :loading="buttonLoading" type="primary" @click="submitFormAdd">提交</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+
     <!-- 施工信息dialog -->
     <el-dialog :visible.sync="nodeDetailVisible" title="施工信息" append-to-body customClass="appendElNodeDialog"
                width="70% !important">
@@ -448,7 +685,7 @@ import EnginNodeInfo from "@/components/EnginNodeInfo/indexGY.vue";
 
 export default {
   name: "工业",
-  dicts: [],
+  dicts: ['project_head','design_unit','supervision_unit'],
   components: {
     EnginNodeInfo,
     ConstructionDetails,
@@ -468,6 +705,10 @@ export default {
       })
     }
     return {
+      sceneHead:[],
+      designHead:[],
+      supervisionHead:[],
+
       // 审核时间
       createTime: null,
       // 按钮loading
@@ -477,6 +718,7 @@ export default {
       // 选中数组
       ids: [],
       enginClassificationList: [],
+      enginClassificationQuery: [],
       status: null,
       // 非单个禁用
       single: true,
@@ -498,6 +740,7 @@ export default {
       nodeList: [],
       // 是否显示弹出层
       open: false,
+      openadd:false,
       // 查询参数
       queryParams: {
         enginType: null,
@@ -525,6 +768,10 @@ export default {
         supervisionPhone: '', // 监理联系电话
         pePreset: 0, // PE管材预设量
         gcPreset: 0, // 钢材预设量
+        pePresetTy: 0, // PE管材预设量
+        gcPresetTy: 0, // 钢材预设量
+        pePresetSn: 0, // PE管材预设量
+        gcPresetSn: 0, // 钢材预设量
         zEngineeringNodeBo: { // 工程节点
           type: '', // 节点类型
           zEngineeringInfoBo: { // 施工信息
@@ -567,7 +814,7 @@ export default {
         enginType: [
           {required: true, message: "工程类型不能为空", trigger: 'blur'}
         ],
-        enginClassification: [
+        enginClassificationQuery: [
           {required: true, message: "工程分类不能为空", trigger: 'blur'}
         ],
         constructUnit: [
@@ -608,6 +855,21 @@ export default {
     });
   },
   methods: {
+    getSceneHeadList(param){
+      this.form.projectHead = param.split(',')[0];
+      this.form.sceneHead = "";
+      this.sceneHead = param.split(',')[1].split('、');
+    },
+    getDesignUnitList(param){
+      this.form.designUnit = param.split(',')[0];
+      this.form.designHead = "";
+      this.designHead = param.split(',')[1].split('、');
+    },
+    getSupervisionUnitList(param){
+      this.form.supervisionUnit = param.split(',')[0];
+      this.form.supervisionHead = "";
+      this.supervisionHead = param.split(',')[1].split('、');
+    },
     download(name) {
       this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/${'工业工程'}/${name}`, name);
     },
@@ -942,7 +1204,8 @@ export default {
       this.gc = true
       this.title = "新增工业工程";
       this.currentType = 'add'
-      this.open = true;
+      // this.open = true;
+      this.openadd = true;
     },
     removeFile(val) {
       this.form.files = val
@@ -1035,6 +1298,45 @@ export default {
         }
       });
     },
+    /** 提交按钮 */
+    submitFormAdd() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.files = this.$refs.obsFileUpload.fileList;
+          if (this.form.files.length === 0) {
+            this.$message.warning('必须上传附件!')
+            return
+          }
+
+          this.form.zEngineeringNodeBo = null
+          if (this.zEngineeringNodeBo.type !== '') {
+            this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
+            this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
+          }
+          if (this.enginClassificationQuery && this.enginClassificationQuery != [] && this.enginClassificationQuery.length > 0) {
+            for(let i in this.enginClassificationQuery){
+              this.form.enginClassification = this.enginClassificationQuery[i];
+              if(this.enginClassificationQuery[i] == '室内管线'){
+                this.form.pePreset= this.form.pePresetSn;
+                this.form.gcPreset= this.form.gcPresetSn;
+              }else if (this.enginClassificationQuery[i] == '室外管线'){
+                this.form.pePreset= this.form.pePresetTy;
+                this.form.gcPreset= this.form.gcPresetTy;
+              }else{
+                this.form.pePreset= 0;
+                this.form.gcPreset= 0;
+              }
+              addEngineeEngineeIndustry(this.form).then(res => {
+                this.$modal.msgSuccess("新增成功");
+                this.openadd = false;
+                this.nodeDetailVisible = false
+              })
+              this.getList();
+            }
+          }
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

+ 8 - 4
src/views/zdsz/engineeringIndustry/index.vue

@@ -9,6 +9,9 @@
   <div class="app-container">
     <el-form :model="searchParams" ref="searchParams" size="small" :inline="true" v-show="showSearch"
              label-width="110px">
+      <el-form-item label="工程名称" prop="enginName">
+        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称" maxlength="20"></el-input>
+      </el-form-item>
       <el-form-item label="工程类型" prop="enginType">
         <el-select v-model="searchParams.enginType" placeholder="请选择工程类型" clearable>
           <el-option
@@ -19,9 +22,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="工程名称" prop="enginName">
-        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称" maxlength="20"></el-input>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,6 +65,8 @@
         </el-button>
       </el-col>
       <el-col :span="2.5" style="float: right;">
+         <span
+           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>无数据
         <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
         <span
@@ -105,7 +107,9 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+              <span slot="reference" v-if="item.state == '-1' && item.content=='无数据'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>
+              <span slot="reference" v-else-if="item.state == '0' && item.content=='暂未审核'"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
               <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>

+ 5 - 1
src/views/zdsz/engineeringInfrastructure/index.vue

@@ -54,6 +54,8 @@
       </el-col>
       <el-col :span="2.5" style="float: right;">
         <span
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>无数据
+        <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
         <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>通过
@@ -79,7 +81,9 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+              <span slot="reference" v-if="item.state == '-1' && item.content=='无数据'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>
+              <span slot="reference" v-else-if="item.state == '0' && item.content=='暂未审核'"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
               <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>

+ 5 - 1
src/views/zdsz/engineeringPipeJacking/index.vue

@@ -44,6 +44,8 @@
         </el-button>
       </el-col>
       <el-col :span="2.5" style="float: right;">
+         <span
+           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>无数据
         <span
               style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
         <span
@@ -79,7 +81,9 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-             <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+              <span slot="reference" v-if="item.state == '-1' && item.content=='无数据'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>
+             <span slot="reference" v-else-if="item.state == '0' && item.content=='暂未审核'"
                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
               <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>

+ 5 - 1
src/views/zdsz/touchOperationEngineering/index.vue

@@ -81,6 +81,8 @@
         </el-button>
       </el-col>
       <el-col :span="2.5" style="float: right;">
+         <span
+           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>无数据
         <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>待审核
         <span
@@ -109,7 +111,9 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核'"
+               <span slot="reference" v-if="item.state == '-1' && item.content=='无数据'"
+                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #807e7a;"></span>
+              <span slot="reference" v-else-if="item.state == '0' && item.content=='暂未审核'"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
               <span slot="reference" v-else-if="item.state == '1' "
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>