lyfO_o
2022-05-18 cf4b2706232effed8cdb04abfe35ab31412b03ec
隐患:V2
已修改9个文件
120 ■■■■ 文件已修改
src/views/contractor/troubleStatistics/components/troubleDetail/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contractor/troubleStatistics/components/troubleDetail/index.vue
@@ -16,7 +16,7 @@
                    <el-table-column label="作业编号" prop="taskcode" align="center" />
                    <el-table-column label="隐患等级" prop="level" align="center" >
                        <template slot-scope="scope">
                            <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
                            <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
                        </template>
                    </el-table-column>
                    <el-table-column label="上报人" prop="requestor" align="center" />
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
@@ -151,8 +151,8 @@
                isReject:false,
                submiting:false,
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                dataForm: {
                    id:'',
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
@@ -14,6 +14,16 @@
            </el-select>
            <span class="span-filter-label">整改人</span>
            <el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
            <span class="span-filter-label">隐患来源</span>
            <el-select v-model="filter.filter.source" clearable   placeholder="请选择">
                <el-option
                    v-for="item in sources"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            </el-select>
            <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
                       @click="queryHandle"/>
        </div>
@@ -37,7 +47,12 @@
                </el-table-column>
                <el-table-column label="隐患等级" prop="level" align="center" >
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
                        <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column label="隐患来源" prop="source" align="center" >
                    <template slot-scope="scope">
                        <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
                    </template>
                </el-table-column>
                <el-table-column label="上报人" prop="requestor" align="center" />
@@ -101,8 +116,12 @@
                tableData:[],
                listLoading: true,
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                sources:[
                    {"key":1,"value":"隐患上报"},
                    {"key":2,"value":"巡检上报"},
                ],
                dataForm: {
                    id:'',
@@ -117,6 +136,7 @@
                        code:'',
                        level:null,
                        rectifierName:'',
                        source:'',
                    }
                }
            }
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue
@@ -111,8 +111,8 @@
        dialogFormVisible:false,
        listLoading: true,
        levels:[
          {"key":"URGENT","value":"紧急"},
          {"key":"COMMON","value":"普通"},
            {"key":"URGENT","value":"重大隐患"},
            {"key":"COMMON","value":"一般隐患"},
        ],
        dataForm: {
        },
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
@@ -174,8 +174,8 @@
                submiting:false,
                dataFormRules:{},
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                dataForm: {
                    id:'',
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
@@ -32,6 +32,16 @@
            <span class="span-filter-label">上报人</span>
            <el-input style="width: 160px" v-model="filter.filter.requestorName"></el-input>
            <span class="span-filter-label">隐患来源</span>
            <el-select v-model="filter.filter.source" clearable   placeholder="请选择">
                <el-option
                    v-for="item in sources"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            </el-select>
            <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
                       @click="queryHandle"/>
        </div>
@@ -55,7 +65,12 @@
                </el-table-column>
                <el-table-column label="隐患等级" prop="level" align="center" >
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
                        <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column label="隐患来源" prop="source" align="center" >
                    <template slot-scope="scope">
                        <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
                    </template>
                </el-table-column>
                <el-table-column label="上报人" prop="requestor" align="center" />
@@ -115,8 +130,12 @@
                tableData:[],
                listLoading: false,
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                sources:[
                    {"key":1,"value":"隐患上报"},
                    {"key":2,"value":"巡检上报"},
                ],
                reportStatus:[
                    {"key":"TORECTIFY","value":"待整改"},
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
@@ -111,8 +111,8 @@
                },
                submiting:false,
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                pickerOptions:{
                    disabledDate(now){
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
@@ -33,6 +33,16 @@
            <span class="span-filter-label">整改人</span>
            <el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
            <span class="span-filter-label">隐患来源</span>
            <el-select v-model="filter.filter.source" clearable   placeholder="请选择">
                <el-option
                    v-for="item in sources"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            </el-select>
            <el-button class="filter-item" style="margin-left: 10px;" type="primary"
                       icon="el-icon-plus" @click="showCreateHandle">新增
@@ -60,7 +70,12 @@
                </el-table-column>
                <el-table-column label="隐患等级" prop="level" align="center" >
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
                        <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column label="隐患来源" prop="source" align="center" >
                    <template slot-scope="scope">
                        <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
                    </template>
                </el-table-column>
                <el-table-column label="上报人" prop="requestor" align="center" />
@@ -123,8 +138,12 @@
                tableData:[],
                listLoading: true,
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                sources:[
                    {"key":1,"value":"隐患上报"},
                    {"key":2,"value":"巡检上报"},
                ],
                reportStatus:[
                    {"key":"TORECTIFY","value":"待整改"},
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue
@@ -34,6 +34,16 @@
            <el-input style="width: 140px" v-model="filter.filter.requestorName" ></el-input>
            <span class="span-filter-label">整改人</span>
            <el-input style="width: 140px" v-model="filter.filter.rectifierName"></el-input>
            <span class="span-filter-label">隐患来源</span>
            <el-select v-model="filter.filter.source" clearable   placeholder="请选择">
                <el-option
                    v-for="item in sources"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            </el-select>
            <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
                       @click="queryHandle"/>
        </div>
@@ -69,7 +79,12 @@
                </el-table-column>
                <el-table-column label="隐患等级" prop="level" align="center" >
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
                        <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column label="隐患来源" prop="source" align="center" >
                    <template slot-scope="scope">
                        <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
                    </template>
                </el-table-column>
                <el-table-column label="上报人" prop="requestor" align="center" />
@@ -130,8 +145,12 @@
                tableData:[],
                showData:[],
                levels:[
                    {"key":"URGENT","value":"紧急"},
                    {"key":"COMMON","value":"一般"},
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                ],
                sources:[
                    {"key":1,"value":"隐患上报"},
                    {"key":2,"value":"巡检上报"},
                ],
                reportStatus:[
                    {"key":"TORECTIFY","value":"待整改"},
@@ -149,6 +168,7 @@
                        level:null,
                        requestorName:'',
                        rectifierName:'',
                        source:''
                    }
                }